commit 9b26bf30d63d88ca872d0c6e09edc9d23481c231
author Charles Chan <rascov@gmail.com> Tue Apr 12 16:46:36 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Apr 13 17:04:56 2016 +0000
tree 76d756b87af818830295b1876f95cc586259f13f
parent c5d93e64fc63569164035dcd89b0a4b9a705b2b1

Use VlanId.vlanId(short) to validate the value

Also update the unit test
    - VlanId.vlanId("5000") should throw IllegalArgumentException

Change-Id: I374532080dc2a51da8f2c0a46ea92df6f8abbe56

utils/misc/src/main/java/org/onlab/packet/VlanId.java

diff --git a/utils/misc/src/main/java/org/onlab/packet/VlanId.java b/utils/misc/src/main/java/org/onlab/packet/VlanId.java
index 04b87f1..92d8a59 100644
--- a/utils/misc/src/main/java/org/onlab/packet/VlanId.java
+++ b/utils/misc/src/main/java/org/onlab/packet/VlanId.java
@@ -92,7 +92,7 @@
             return new VlanId(ANY_VALUE);
         }
         try {
-            return new VlanId(Short.parseShort(value));
+            return VlanId.vlanId(Short.parseShort(value));
         } catch (NumberFormatException e) {
             throw new IllegalArgumentException(e);
         }

utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java

diff --git a/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java b/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
index 66cec51..952a346 100644
--- a/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
@@ -25,7 +25,6 @@
 
     @Test
     public void testEquality() {
-
         VlanId vlan1 = VlanId.vlanId("None");
         VlanId vlan2 = VlanId.vlanId((short) -1);
         VlanId vlan3 = VlanId.vlanId((short) 100);
@@ -48,11 +47,15 @@
         assertEquals("incorrect VLAN value", 10, vlan1.toShort());
         assertEquals("invalid untagged value", VlanId.UNTAGGED,
                      vlan2.toShort(), vlan3.toShort());
-
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testIllicitVLAN() {
+    public void testIllicitVlan() {
         VlanId.vlanId((short) 5000);
     }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testIllicitVlanString() {
+        VlanId.vlanId("5000");
+    }
 }