X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fmatch%2FMatchTest.java;h=55b5cabf11c30f11a54ba1e10769e864106441a2;hp=f257befd3c3d64ed15f8dcc76cd87b501135f49d;hb=1ae37339c083b30bc564af4e608725c514b2e6b7;hpb=a1f02e35be4dff06e523d3aeb05a7b9e1ca91a07 diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java b/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java index f257befd3c..55b5cabf11 100644 --- a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java +++ b/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java @@ -1,4 +1,3 @@ - /* * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. * @@ -29,8 +28,7 @@ public class MatchTest { @Test public void testMatchCreation() { Node node = NodeCreator.createOFNode(7l); - NodeConnector port = NodeConnectorCreator.createOFNodeConnector( - (short) 6, node); + NodeConnector port = NodeConnectorCreator.createOFNodeConnector((short) 6, node); MatchField field = new MatchField(MatchType.IN_PORT, port); Assert.assertTrue(field != null); @@ -50,10 +48,8 @@ public class MatchTest { field = new MatchField(MatchType.TP_SRC, 120000); Assert.assertFalse(field.isValid()); - byte mac[] = { (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, - (byte) 11, (byte) 22 }; - byte mask[] = { (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff }; + byte mac[] = { (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 11, (byte) 22 }; + byte mask[] = { (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff }; field = null; field = new MatchField(MatchType.DL_SRC, mac, mask); Assert.assertFalse(field.getValue() == null); @@ -67,39 +63,30 @@ public class MatchTest { public void testMatchSetGet() { Match x = new Match(); short val = 2346; - NodeConnector inPort = NodeConnectorCreator.createOFNodeConnector(val, - NodeCreator.createOFNode(1l)); + NodeConnector inPort = NodeConnectorCreator.createOFNodeConnector(val, NodeCreator.createOFNode(1l)); x.setField(MatchType.IN_PORT, inPort); - Assert.assertTrue(((NodeConnector) x.getField(MatchType.IN_PORT) - .getValue()).equals(inPort)); - Assert - .assertTrue((Short) ((NodeConnector) x.getField( - MatchType.IN_PORT).getValue()).getID() == val); + Assert.assertTrue(((NodeConnector) x.getField(MatchType.IN_PORT).getValue()).equals(inPort)); + Assert.assertTrue((Short) ((NodeConnector) x.getField(MatchType.IN_PORT).getValue()).getID() == val); } @Test public void testMatchSetGetMAC() { Match x = new Match(); - byte mac[] = { (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, - (byte) 11, (byte) 22 }; + byte mac[] = { (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 11, (byte) 22 }; byte mac2[] = { (byte) 0xaa, (byte) 0xbb, 0, 0, 0, (byte) 0xbb }; - byte mask1[] = { (byte) 0x11, (byte) 0x22, (byte) 0x33, (byte) 0x44, - (byte) 0x55, (byte) 0x66 }; - byte mask2[] = { (byte) 0xff, (byte) 0xff, (byte) 0, (byte) 0, - (byte) 0, (byte) 0xff }; + byte mask1[] = { (byte) 0x11, (byte) 0x22, (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66 }; + byte mask2[] = { (byte) 0xff, (byte) 0xff, (byte) 0, (byte) 0, (byte) 0, (byte) 0xff }; x.setField(MatchType.DL_SRC, mac.clone(), mask1); x.setField(MatchType.DL_DST, mac2.clone(), mask2); - Assert.assertTrue(Arrays.equals(mac, (byte[]) x.getField( - MatchType.DL_SRC).getValue())); - Assert.assertFalse(Arrays.equals((byte[]) x.getField(MatchType.DL_SRC) - .getValue(), (byte[]) x.getField(MatchType.DL_DST).getValue())); - Assert.assertFalse(x.getField(MatchType.DL_SRC).getBitMask() == x - .getField(MatchType.DL_DST).getBitMask()); + Assert.assertTrue(Arrays.equals(mac, (byte[]) x.getField(MatchType.DL_SRC).getValue())); + Assert.assertFalse(Arrays.equals((byte[]) x.getField(MatchType.DL_SRC).getValue(), + (byte[]) x.getField(MatchType.DL_DST).getValue())); + Assert.assertFalse(x.getField(MatchType.DL_SRC).getBitMask() == x.getField(MatchType.DL_DST).getBitMask()); x.setField(new MatchField(MatchType.DL_DST, mac.clone(), mask1)); - Assert.assertTrue(Arrays.equals((byte[]) x.getField(MatchType.DL_SRC) - .getValue(), (byte[]) x.getField(MatchType.DL_DST).getValue())); + Assert.assertTrue(Arrays.equals((byte[]) x.getField(MatchType.DL_SRC).getValue(), + (byte[]) x.getField(MatchType.DL_DST).getValue())); } @Test @@ -110,8 +97,7 @@ public class MatchTest { InetAddress mask = InetAddress.getByName("255.255.0.0"); x.setField(MatchType.NW_SRC, address, mask); - Assert.assertTrue(ip.equals(((InetAddress) x.getField(MatchType.NW_SRC) - .getValue()).getHostAddress())); + Assert.assertTrue(ip.equals(((InetAddress) x.getField(MatchType.NW_SRC).getValue()).getHostAddress())); Assert.assertTrue(x.getField(MatchType.NW_SRC).getMask().equals(mask)); } @@ -119,21 +105,14 @@ public class MatchTest { public void testMatchSetGetEtherType() throws UnknownHostException { Match x = new Match(); - x.setField(MatchType.DL_TYPE, EtherTypes.QINQ.shortValue(), - (short) 0xffff); - Assert.assertTrue(((Short) x.getField(MatchType.DL_TYPE).getValue()) - .equals(EtherTypes.QINQ.shortValue())); - Assert - .assertFalse(x.getField(MatchType.DL_TYPE).getValue() == EtherTypes.QINQ); - Assert.assertFalse(x.getField(MatchType.DL_TYPE).getValue().equals( - EtherTypes.QINQ)); - - x.setField(MatchType.DL_TYPE, EtherTypes.LLDP.shortValue(), - (short) 0xffff); - Assert.assertTrue(((Short) x.getField(MatchType.DL_TYPE).getValue()) - .equals(EtherTypes.LLDP.shortValue())); - Assert.assertFalse(x.getField(MatchType.DL_TYPE).equals( - EtherTypes.LLDP.intValue())); + x.setField(MatchType.DL_TYPE, EtherTypes.QINQ.shortValue(), (short) 0xffff); + Assert.assertTrue(((Short) x.getField(MatchType.DL_TYPE).getValue()).equals(EtherTypes.QINQ.shortValue())); + Assert.assertFalse(x.getField(MatchType.DL_TYPE).getValue() == EtherTypes.QINQ); + Assert.assertFalse(x.getField(MatchType.DL_TYPE).getValue().equals(EtherTypes.QINQ)); + + x.setField(MatchType.DL_TYPE, EtherTypes.LLDP.shortValue(), (short) 0xffff); + Assert.assertTrue(((Short) x.getField(MatchType.DL_TYPE).getValue()).equals(EtherTypes.LLDP.shortValue())); + Assert.assertFalse(x.getField(MatchType.DL_TYPE).equals(EtherTypes.LLDP.intValue())); } @Test @@ -161,24 +140,18 @@ public class MatchTest { @Test public void testMatchMask() { Match x = new Match(); - NodeConnector inPort = NodeConnectorCreator.createOFNodeConnector( - (short) 6, NodeCreator.createOFNode(3l)); + NodeConnector inPort = NodeConnectorCreator.createOFNodeConnector((short) 6, NodeCreator.createOFNode(3l)); x.setField(MatchType.IN_PORT, inPort); x.setField(MatchType.DL_VLAN, (short) 28, (short) 0xfff); Assert.assertFalse(x.getMatches() == 0); - Assert - .assertTrue(x.getMatches() == (MatchType.IN_PORT.getIndex() | MatchType.DL_VLAN - .getIndex())); + Assert.assertTrue(x.getMatches() == (MatchType.IN_PORT.getIndex() | MatchType.DL_VLAN.getIndex())); } @Test public void testMatchBitMask() { - byte mac[] = { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 22, (byte) 12 }; - byte mask[] = { (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0 }; - NodeConnector inPort = NodeConnectorCreator.createOFNodeConnector( - (short) 4095, NodeCreator.createOFNode(7l)); + byte mac[] = { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 22, (byte) 12 }; + byte mask[] = { (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0 }; + NodeConnector inPort = NodeConnectorCreator.createOFNodeConnector((short) 4095, NodeCreator.createOFNode(7l)); MatchField x = new MatchField(MatchType.IN_PORT, inPort); Assert.assertTrue((x.getMask()) == null); @@ -193,10 +166,8 @@ public class MatchTest { @Test public void testNullMask() { - byte mac[] = { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 22, (byte) 12 }; - NodeConnector inPort = NodeConnectorCreator.createOFNodeConnector( - (short) 2000, NodeCreator.createOFNode(7l)); + byte mac[] = { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 22, (byte) 12 }; + NodeConnector inPort = NodeConnectorCreator.createOFNodeConnector((short) 2000, NodeCreator.createOFNode(7l)); MatchField x = new MatchField(MatchType.IN_PORT, inPort); Assert.assertTrue(x.getBitMask() == 0); @@ -214,41 +185,26 @@ public class MatchTest { @Test public void testEquality() throws Exception { Node node = NodeCreator.createOFNode(7l); - NodeConnector port = NodeConnectorCreator.createOFNodeConnector( - (short) 24, node); - NodeConnector port2 = NodeConnectorCreator.createOFNodeConnector( - (short) 24, node); - byte srcMac[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, - (byte) 0x9a, (byte) 0xbc }; - byte dstMac[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, - (byte) 0x5e, (byte) 0x6f }; - byte srcMac2[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, - (byte) 0x9a, (byte) 0xbc }; - byte dstMac2[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, - (byte) 0x5e, (byte) 0x6f }; - InetAddress srcIP = InetAddress - .getByName("2001:420:281:1004:407a:57f4:4d15:c355"); - InetAddress dstIP = InetAddress - .getByName("2001:420:281:1004:e123:e688:d655:a1b0"); - InetAddress ipMask = InetAddress - .getByName("ffff:ffff:ffff:ffff:0:0:0:0"); - InetAddress ipMaskd = InetAddress - .getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"); - InetAddress srcIP2 = InetAddress - .getByName("2001:420:281:1004:407a:57f4:4d15:c355"); - InetAddress dstIP2 = InetAddress - .getByName("2001:420:281:1004:e123:e688:d655:a1b0"); - InetAddress ipMask2 = InetAddress - .getByName("ffff:ffff:ffff:ffff:0:0:0:0"); - InetAddress ipMaskd2 = InetAddress - .getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"); + NodeConnector port = NodeConnectorCreator.createOFNodeConnector((short) 24, node); + NodeConnector port2 = NodeConnectorCreator.createOFNodeConnector((short) 24, node); + byte srcMac[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9a, (byte) 0xbc }; + byte dstMac[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, (byte) 0x5e, (byte) 0x6f }; + byte srcMac2[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9a, (byte) 0xbc }; + byte dstMac2[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, (byte) 0x5e, (byte) 0x6f }; + InetAddress srcIP = InetAddress.getByName("2001:420:281:1004:407a:57f4:4d15:c355"); + InetAddress dstIP = InetAddress.getByName("2001:420:281:1004:e123:e688:d655:a1b0"); + InetAddress ipMask = InetAddress.getByName("ffff:ffff:ffff:ffff:0:0:0:0"); + InetAddress ipMaskd = InetAddress.getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"); + InetAddress srcIP2 = InetAddress.getByName("2001:420:281:1004:407a:57f4:4d15:c355"); + InetAddress dstIP2 = InetAddress.getByName("2001:420:281:1004:e123:e688:d655:a1b0"); + InetAddress ipMask2 = InetAddress.getByName("ffff:ffff:ffff:ffff:0:0:0:0"); + InetAddress ipMaskd2 = InetAddress.getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"); short ethertype = EtherTypes.IPv6.shortValue(); short ethertype2 = EtherTypes.IPv6.shortValue(); short vlan = (short) 27, vlan2 = (short) 27; byte vlanPr = (byte) 3, vlanPr2 = (byte) 3; Byte tos = 4, tos2 = 4; - byte proto = IPProtocols.UDP.byteValue(), proto2 = IPProtocols.UDP - .byteValue(); + byte proto = IPProtocols.UDP.byteValue(), proto2 = IPProtocols.UDP.byteValue(); short src = (short) 5500, src2 = (short) 5500; short dst = 80, dst2 = 80; @@ -288,8 +244,7 @@ public class MatchTest { // Make sure all values are equals for (MatchType type : MatchType.values()) { if (match1.isPresent(type)) { - Assert.assertTrue(match1.getField(type).equals( - match2.getField(type))); + Assert.assertTrue(match1.getField(type).equals(match2.getField(type))); } } @@ -313,13 +268,13 @@ public class MatchTest { InetAddress ipMask2 = null; short ethertype = EtherTypes.IPv4.shortValue(); short ethertype2 = EtherTypes.IPv4.shortValue(); - + /* * Create a SAL Flow aFlow */ Match match1 = new Match(); Match match2 = new Match(); - + match1.setField(MatchType.DL_TYPE, ethertype); match1.setField(MatchType.NW_SRC, srcIP, ipMask); @@ -327,7 +282,7 @@ public class MatchTest { match2.setField(MatchType.NW_SRC, srcIP2, ipMask2); Assert.assertTrue(match1.equals(match2)); - + ipMask2 = InetAddress.getByName("255.255.255.255"); match2.setField(MatchType.NW_SRC, srcIP2, ipMask2); @@ -337,7 +292,7 @@ public class MatchTest { ipMask2 = InetAddress.getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"); ethertype = EtherTypes.IPv6.shortValue(); ethertype2 = EtherTypes.IPv6.shortValue(); - + match1.setField(MatchType.DL_TYPE, ethertype); match1.setField(MatchType.NW_SRC, srcIP, ipMask); @@ -346,24 +301,67 @@ public class MatchTest { Assert.assertTrue(match1.equals(match2)); } - + + @Test + public void testHashCode() throws Exception { + byte srcMac1[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9a, (byte) 0xbc }; + byte srcMac2[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9a, (byte) 0xbc }; + byte dstMac1[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, (byte) 0x5e, (byte) 0x6f }; + byte dstMac2[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, (byte) 0x5e, (byte) 0x6f }; + short ethertype = EtherTypes.IPv4.shortValue(); + short ethertype2 = EtherTypes.IPv4.shortValue(); + InetAddress srcIP1 = InetAddress.getByName("1.1.1.1"); + InetAddress ipMask1 = InetAddress.getByName("255.255.255.255"); + InetAddress srcIP2 = InetAddress.getByName("1.1.1.1"); + InetAddress ipMask2 = InetAddress.getByName("255.255.255.255"); + + Match match1 = new Match(); + Match match2 = new Match(); + + MatchField field1 = new MatchField(MatchType.DL_SRC, srcMac1); + MatchField field2 = new MatchField(MatchType.DL_SRC, srcMac2); + Assert.assertTrue(field1.hashCode() == field2.hashCode()); + + match1.setField(field1); + match2.setField(field2); + Assert.assertTrue(match1.hashCode() == match2.hashCode()); + + MatchField field3 = new MatchField(MatchType.DL_DST, dstMac1); + MatchField field4 = new MatchField(MatchType.DL_DST, dstMac2); + Assert.assertTrue(field3.hashCode() == field4.hashCode()); + + match1.setField(field3); + match2.setField(field4); + Assert.assertTrue(match1.hashCode() == match2.hashCode()); + + MatchField field5 = new MatchField(MatchType.DL_TYPE, ethertype); + MatchField field6 = new MatchField(MatchType.DL_TYPE, ethertype2); + Assert.assertTrue(field5.hashCode() == field6.hashCode()); + + match1.setField(field5); + match2.setField(field6); + Assert.assertTrue(match1.hashCode() == match2 .hashCode()); + + MatchField field7 = new MatchField(MatchType.NW_SRC, srcIP1, ipMask1); + MatchField field8 = new MatchField(MatchType.NW_SRC, srcIP2, ipMask2); + Assert.assertTrue(field7.hashCode() == field8.hashCode()); + + match1.setField(field7); + match2.setField(field8); + Assert.assertTrue(match1.hashCode() == match2.hashCode()); + + } + @Test public void testCloning() throws Exception { Node node = NodeCreator.createOFNode(7l); - NodeConnector port = NodeConnectorCreator.createOFNodeConnector( - (short) 24, node); - byte srcMac[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, - (byte) 0x9a, (byte) 0xbc }; - byte dstMac[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, - (byte) 0x5e, (byte) 0x6f }; - InetAddress srcIP = InetAddress - .getByName("2001:420:281:1004:407a:57f4:4d15:c355"); - InetAddress dstIP = InetAddress - .getByName("2001:420:281:1004:e123:e688:d655:a1b0"); - InetAddress ipMasks = InetAddress - .getByName("ffff:ffff:ffff:ffff:0:0:0:0"); - InetAddress ipMaskd = InetAddress - .getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"); + NodeConnector port = NodeConnectorCreator.createOFNodeConnector((short) 24, node); + byte srcMac[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9a, (byte) 0xbc }; + byte dstMac[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, (byte) 0x5e, (byte) 0x6f }; + InetAddress srcIP = InetAddress.getByName("2001:420:281:1004:407a:57f4:4d15:c355"); + InetAddress dstIP = InetAddress.getByName("2001:420:281:1004:e123:e688:d655:a1b0"); + InetAddress ipMasks = InetAddress.getByName("ffff:ffff:ffff:ffff:0:0:0:0"); + InetAddress ipMaskd = InetAddress.getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"); short ethertype = EtherTypes.IPv6.shortValue(); short vlan = (short) 27; byte vlanPr = (byte) 3; @@ -395,13 +393,13 @@ public class MatchTest { for (MatchType type : MatchType.values()) { if (match.isPresent(type)) { if (!match.getField(type).equals(cloned.getField(type))) { - Assert.assertTrue(match.getField(type).equals( - cloned.getField(type))); + Assert.assertTrue(match.getField(type).equals(cloned.getField(type))); } } } - // Make sure none of the fields couples are pointing to the same reference + // Make sure none of the fields couples are pointing to the same + // reference MatchField a = null, b = null; for (MatchType type : MatchType.values()) { a = match.getField(type); @@ -413,31 +411,23 @@ public class MatchTest { Assert.assertTrue(match.equals(cloned)); - Assert.assertFalse(match.getField(MatchType.DL_SRC) == cloned - .getField(MatchType.DL_SRC)); - Assert.assertFalse(match.getField(MatchType.NW_DST) == cloned - .getField(MatchType.NW_DST)); - Assert.assertTrue(match.getField(MatchType.NW_DST).getMask().equals( - cloned.getField(MatchType.NW_DST).getMask())); + Assert.assertFalse(match.getField(MatchType.DL_SRC) == cloned.getField(MatchType.DL_SRC)); + Assert.assertFalse(match.getField(MatchType.NW_DST) == cloned.getField(MatchType.NW_DST)); + Assert.assertTrue(match.getField(MatchType.NW_DST).getMask() + .equals(cloned.getField(MatchType.NW_DST).getMask())); + Assert.assertTrue(match.hashCode() == cloned.hashCode()); } @Test public void testFlip() throws Exception { Node node = NodeCreator.createOFNode(7l); - NodeConnector port = NodeConnectorCreator.createOFNodeConnector( - (short) 24, node); - byte srcMac[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, - (byte) 0x9a, (byte) 0xbc }; - byte dstMac[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, - (byte) 0x5e, (byte) 0x6f }; - InetAddress srcIP = InetAddress - .getByName("2001:420:281:1004:407a:57f4:4d15:c355"); - InetAddress dstIP = InetAddress - .getByName("2001:420:281:1004:e123:e688:d655:a1b0"); - InetAddress ipMasks = InetAddress - .getByName("ffff:ffff:ffff:ffff:0:0:0:0"); - InetAddress ipMaskd = InetAddress - .getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"); + NodeConnector port = NodeConnectorCreator.createOFNodeConnector((short) 24, node); + byte srcMac[] = { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9a, (byte) 0xbc }; + byte dstMac[] = { (byte) 0x1a, (byte) 0x2b, (byte) 0x3c, (byte) 0x4d, (byte) 0x5e, (byte) 0x6f }; + InetAddress srcIP = InetAddress.getByName("2001:420:281:1004:407a:57f4:4d15:c355"); + InetAddress dstIP = InetAddress.getByName("2001:420:281:1004:e123:e688:d655:a1b0"); + InetAddress ipMasks = InetAddress.getByName("ffff:ffff:ffff:ffff:0:0:0:0"); + InetAddress ipMaskd = InetAddress.getByName("ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"); short ethertype = EtherTypes.IPv6.shortValue(); short vlan = (short) 27; byte vlanPr = (byte) 3; @@ -465,28 +455,34 @@ public class MatchTest { Match flipped = match.reverse(); - Assert.assertTrue(match.getField(MatchType.DL_TYPE).equals( - flipped.getField(MatchType.DL_TYPE))); - Assert.assertTrue(match.getField(MatchType.DL_VLAN).equals( - flipped.getField(MatchType.DL_VLAN))); + Assert.assertTrue(match.getField(MatchType.DL_TYPE).equals(flipped.getField(MatchType.DL_TYPE))); + Assert.assertTrue(match.getField(MatchType.DL_VLAN).equals(flipped.getField(MatchType.DL_VLAN))); - Assert.assertTrue(match.getField(MatchType.DL_DST).getValue().equals( - flipped.getField(MatchType.DL_SRC).getValue())); - Assert.assertTrue(match.getField(MatchType.DL_DST).getMask() == flipped - .getField(MatchType.DL_SRC).getMask()); + Assert.assertTrue(match.getField(MatchType.DL_DST).getValue() + .equals(flipped.getField(MatchType.DL_SRC).getValue())); + Assert.assertTrue(match.getField(MatchType.DL_DST).getMask() == flipped.getField(MatchType.DL_SRC).getMask()); - Assert.assertTrue(match.getField(MatchType.NW_DST).getValue().equals( - flipped.getField(MatchType.NW_SRC).getValue())); - Assert.assertTrue(match.getField(MatchType.NW_DST).getMask() == flipped - .getField(MatchType.NW_SRC).getMask()); + Assert.assertTrue(match.getField(MatchType.NW_DST).getValue() + .equals(flipped.getField(MatchType.NW_SRC).getValue())); + Assert.assertTrue(match.getField(MatchType.NW_DST).getMask() == flipped.getField(MatchType.NW_SRC).getMask()); - Assert.assertTrue(match.getField(MatchType.TP_DST).getValue().equals( - flipped.getField(MatchType.TP_SRC).getValue())); - Assert.assertTrue(match.getField(MatchType.TP_DST).getMask() == flipped - .getField(MatchType.TP_SRC).getMask()); + Assert.assertTrue(match.getField(MatchType.TP_DST).getValue() + .equals(flipped.getField(MatchType.TP_SRC).getValue())); + Assert.assertTrue(match.getField(MatchType.TP_DST).getMask() == flipped.getField(MatchType.TP_SRC).getMask()); Match flipflip = flipped.reverse().reverse(); Assert.assertTrue(flipflip.equals(flipped)); } + + @Test + public void testVlanNone() throws Exception { + // The value 0 is used to indicate that no VLAN ID is set + short vlan = (short) 0; + MatchField field = new MatchField(MatchType.DL_VLAN, vlan); + + Assert.assertTrue(field != null); + Assert.assertTrue(field.getValue().equals(new Short(vlan))); + Assert.assertTrue(field.isValid()); + } }