commit 283a96205e1b0d583ccb81a39d8c6516a452f1e8
author Luca Prete <luca@onlab.us> Tue Mar 29 16:12:20 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 31 15:45:40 2016 +0000
tree 9349c7b04d3074b258d996b4099a1874b3bc597e
parent 0d39bbab7c2eac7db0297ed9562e01b13cde5e0d

Using VlanId String None instead of -1

Change-Id: I2597ac37285cc3f40ad1304d668564a56a5b862f

core/api/src/main/java/org/onosproject/net/HostId.java

diff --git a/core/api/src/main/java/org/onosproject/net/HostId.java b/core/api/src/main/java/org/onosproject/net/HostId.java
index 3e0d2b2..1acab00 100644
--- a/core/api/src/main/java/org/onosproject/net/HostId.java
+++ b/core/api/src/main/java/org/onosproject/net/HostId.java
@@ -79,7 +79,7 @@
         checkArgument(string.length() >= MIN_ID_LENGTH,
                       "Host ID must be at least %s characters", MIN_ID_LENGTH);
         MacAddress mac = MacAddress.valueOf(string.substring(0, MAC_LENGTH));
-        VlanId vlanId = VlanId.vlanId(Short.parseShort(string.substring(MAC_LENGTH + 1)));
+        VlanId vlanId = VlanId.vlanId(string.substring(MAC_LENGTH + 1));
         return new HostId(mac, vlanId);
     }
 

core/api/src/test/java/org/onosproject/net/ConnectPointTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java b/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java
index 2aecabd..7bf3def 100644
--- a/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java
+++ b/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java
@@ -83,7 +83,7 @@
         String cp = "16:3A:BD:6E:31:E4/-1/1";
 
         ConnectPoint connectPoint = ConnectPoint.hostConnectPoint(cp);
-        assertEquals("16:3A:BD:6E:31:E4/-1", connectPoint.hostId().toString());
+        assertEquals("16:3A:BD:6E:31:E4/None", connectPoint.hostId().toString());
         assertEquals("1", connectPoint.port().toString());
 
         expectHostParseException("");

core/net/src/test/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompilerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompilerTest.java
index ec9f3e8..8d8e505 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompilerTest.java
@@ -49,8 +49,8 @@
 public class HostToHostIntentCompilerTest extends AbstractIntentTest {
     private static final String HOST_ONE_MAC = "00:00:00:00:00:01";
     private static final String HOST_TWO_MAC = "00:00:00:00:00:02";
-    private static final String HOST_ONE_VLAN = "-1";
-    private static final String HOST_TWO_VLAN = "-1";
+    private static final String HOST_ONE_VLAN = "None";
+    private static final String HOST_TWO_VLAN = "None";
     private static final String HOST_ONE = HOST_ONE_MAC + "/" + HOST_ONE_VLAN;
     private static final String HOST_TWO = HOST_TWO_MAC + "/" + HOST_TWO_VLAN;