X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fcore%2Fsal%2Fconvertor%2Fmatch%2FMatchConvertorImplV13Test.java;h=99cb2ebd7f591968960b898fe1fb7c9027aceaf4;hb=6e60186c45758ebad30ba962fdb3f41d332f6db3;hp=98211f49b3b3c5ac9073dfdbbb1c261145839e97;hpb=aebb4d74dd46d8d65c2905f2fc1ca4c0dfd52fac;p=openflowplugin.git diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java index 98211f49b3..99cb2ebd7f 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java @@ -448,7 +448,7 @@ public class MatchConvertorImplV13Test { macAddressBuilder.setMacAddress(new MacAddress("00:00:00:00:00:01")); entriesBuilder.addAugmentation(MacAddressMatchEntry.class, macAddressBuilder.build()); maskBuilder = new MaskMatchEntryBuilder(); - maskBuilder.setMask(new byte[]{0, 0, 0, 0, 0, 2}); + maskBuilder.setMask(new byte[]{0, 0, 0, 0, 1, 1}); entriesBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build()); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntriesBuilder(); @@ -459,7 +459,7 @@ public class MatchConvertorImplV13Test { macAddressBuilder.setMacAddress(new MacAddress("00:00:00:00:00:02")); entriesBuilder.addAugmentation(MacAddressMatchEntry.class, macAddressBuilder.build()); maskBuilder = new MaskMatchEntryBuilder(); - maskBuilder.setMask(new byte[]{0, 0, 0, 0, 0, 3}); + maskBuilder.setMask(new byte[]{0, 0, 0, 0, 2, 2}); entriesBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build()); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntriesBuilder(); @@ -529,9 +529,9 @@ public class MatchConvertorImplV13Test { Assert.assertEquals("Wrong metadata mask", new BigInteger(1, new byte[]{0, 0, 0, 0, 0, 0, 0, 1}), builtMatch.getMetadata().getMetadataMask()); Assert.assertEquals("Wrong eth dst", new MacAddress("00:00:00:00:00:01"), builtMatch.getEthernetMatch().getEthernetDestination().getAddress()); -// Assert.assertEquals("Wrong eth dst mask", new MacAddress("00:00:00:00:00:01"), builtMatch.getEthernetMatch().getEthernetDestination().getMask()); + Assert.assertEquals("Wrong eth dst mask", new MacAddress("00:00:00:00:01:01"), builtMatch.getEthernetMatch().getEthernetDestination().getMask()); Assert.assertEquals("Wrong eth src", new MacAddress("00:00:00:00:00:02"), builtMatch.getEthernetMatch().getEthernetSource().getAddress()); -// Assert.assertEquals("Wrong eth src mask", new MacAddress("00:00:00:00:00:03"), builtMatch.getEthernetMatch().getEthernetSource().getMask()); + Assert.assertEquals("Wrong eth src mask", new MacAddress("00:00:00:00:02:02"), builtMatch.getEthernetMatch().getEthernetSource().getMask()); Assert.assertEquals("Wrong vlan id", 4, builtMatch.getVlanMatch().getVlanId().getVlanId().getValue().intValue()); Assert.assertEquals("Wrong vlan id entries", true, builtMatch.getVlanMatch().getVlanId().isVlanIdPresent()); Ipv4Match ipv4Match = (Ipv4Match) builtMatch.getLayer3Match();