X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=extension%2Fopenflowplugin-extension-nicira%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fextension%2Fvendor%2Fnicira%2Fconvertor%2Fmatch%2FTunIPv4SrcConvertorTest.java;fp=extension%2Fopenflowplugin-extension-nicira%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fextension%2Fvendor%2Fnicira%2Fconvertor%2Fmatch%2FTunIPv4SrcConvertorTest.java;h=bcbbf228d263df97807789c2e2274d9f39fcd4da;hb=a0543340afd14d8ab4aac0f6c13ddcbf8ec1c761;hp=1d662ab3f385ce569f85b08dd857b6086c398910;hpb=eebc297b4bf1a400b8f752257fcd99a3dc8476b3;p=openflowplugin.git diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java index 1d662ab3f3..bcbbf228d2 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java @@ -45,7 +45,7 @@ public class TunIPv4SrcConvertorTest { @Mock private MatchEntry matchEntry; - private static final Ipv4Address IPV4_ADDRESS = Ipv4Address.getDefaultInstance("1.2.3.4"); + private static final Ipv4Address IPV4_ADDRESS = new Ipv4Address("1.2.3.4"); private TunIPv4SrcConvertor tunIPv4DstConvertor; @@ -86,24 +86,24 @@ public class TunIPv4SrcConvertorTest { .convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getNxmNxTunIpv4Src().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class); + Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxTunIpv4Src().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class); + Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxTunIpv4Src().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class); + Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmNxTunIpv4Src().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class); + Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey()); } }