commit 00a406d4ba2abc15baba4e2c60a3babf7e868c4d
author cheng fan <chengfannature@gmail.com> Fri Jun 05 21:42:40 2015 +0800
committer cheng fan <chengfannature@gmail.com> Fri Jun 05 21:43:25 2015 +0800
tree 1bd08232a29c70b16b7d94ee31b4dd2ea8c408b6
parent 690fd1c489a960d1d30ebfdf6524db4ec7fb05de

Optimize the tunnel commands

1. Split port and equipment by "/" instead of "-";
2. Fix the bug of remove-tunnel-by-type command.

Change-Id: I462e8af54f697d04b8433a59126e1c52c4cbf88c

cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java b/cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java
index 1bb8afe..098cd46 100644
--- a/cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/TunnelCreateCommand.java
@@ -90,8 +90,8 @@
             dstPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(dst));
         } else if ("VLAN".equals(type)) {
             trueType = Tunnel.Type.VLAN;
-            String[] srcArray = src.split("-");
-            String[] dstArray = dst.split("-");
+            String[] srcArray = src.split("/");
+            String[] dstArray = dst.split("/");
             srcPoint = new DefaultOpticalTunnelEndPoint(
                                                         producerName,
                                                         Optional.of(DeviceId
@@ -124,8 +124,8 @@
             dstPoint = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(dst));
         } else if ("ODUK".equals(type)) {
             trueType = Tunnel.Type.ODUK;
-            String[] srcArray = src.split("-");
-            String[] dstArray = dst.split("-");
+            String[] srcArray = src.split("/");
+            String[] dstArray = dst.split("/");
             srcPoint = new DefaultOpticalTunnelEndPoint(
                                                         producerName,
                                                         Optional.of(DeviceId
@@ -150,8 +150,8 @@
                                                         true);
         } else if ("OCH".equals(type)) {
             trueType = Tunnel.Type.OCH;
-            String[] srcArray = src.split("-");
-            String[] dstArray = dst.split("-");
+            String[] srcArray = src.split("/");
+            String[] dstArray = dst.split("/");
             srcPoint = new DefaultOpticalTunnelEndPoint(
                                                         producerName,
                                                         Optional.of(DeviceId