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%2FNshc1ConvertorTest.java;h=6a18a7976b52969acf3710219acf692a6f4d0bd7;hb=1aee9a9a8d8df9d3207696a98021295ae2e92ad7;hp=9ad530879d8e6ff53ca3b787fe75d305d6b93c56;hpb=c4208e6859bf2e06fa269233fc396fd54d0aa1be;p=openflowplugin.git diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1ConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1ConvertorTest.java index 9ad530879d..6a18a7976b 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1ConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1ConvertorTest.java @@ -14,15 +14,16 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nshc._1.grouping.Nshc1ValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.Nshc1CaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.Nshc1CaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; @@ -30,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifSwitchFlowRemoved; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchRpcGetFlowStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxNshc1Key; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.nshc._1.grouping.NxmNxNshc1; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.nshc._1.grouping.NxmNxNshc1Builder; import org.opendaylight.yangtools.yang.binding.Augmentation; @@ -38,68 +40,74 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; */ @RunWith(MockitoJUnitRunner.class) public class Nshc1ConvertorTest { - @Mock private Extension extension; - @Mock - private MatchEntry matchEntry; private Nshc1Convertor nshc1Convertor; - @Before - public void setUp() throws Exception { - final NxmNxNshc1Builder nxmNxNshc1Builder = new NxmNxNshc1Builder() - .setValue(1L); - final NxAugMatchNodesNodeTableFlowBuilder nxAugMatchNotifUpdateFlowStatsBuilder = - new NxAugMatchNodesNodeTableFlowBuilder(); - nxAugMatchNotifUpdateFlowStatsBuilder.setNxmNxNshc1(nxmNxNshc1Builder.build()); + private static final Long NSHC1_VALUE = 0xFFFFFFFFL; + private static final Long MASK_VALUE = 0xFFFFFFFFL; - final Augmentation extensionAugmentation = nxAugMatchNotifUpdateFlowStatsBuilder.build(); - when(extension.augmentation(Matchers.>>any())) - .thenReturn(extensionAugmentation); + @Before + public void setUp() { + NxmNxNshc1 nxmNxNshc1 = new NxmNxNshc1Builder().setValue(NSHC1_VALUE).setMask(MASK_VALUE).build(); + NxAugMatchNodesNodeTableFlow nxAugMatchNotifUpdateFlowStats = new NxAugMatchNodesNodeTableFlowBuilder() + .setNxmNxNshc1(nxmNxNshc1) + .build(); + when(extension.augmentation(ArgumentMatchers.any())) + .thenReturn(nxAugMatchNotifUpdateFlowStats); nshc1Convertor = new Nshc1Convertor(); } @Test - public void testConvert() throws Exception { + public void testConvertToOFJava() { final MatchEntry converted = nshc1Convertor.convert(extension); - Assert.assertEquals(1, ((Nshc1CaseValue)converted.getMatchEntryValue()).getNshc1Values().getNshc().intValue()); + ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) converted.getMatchEntryValue(); + OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); + NshcCaseValue nshcCaseValue = (NshcCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); + Assert.assertEquals(NiciraConstants.NX_NSH_VENDOR_ID, + experimenterIdCase.getExperimenter().getExperimenter().getValue()); + Assert.assertEquals(NSHC1_VALUE, nshcCaseValue.getNshc()); + Assert.assertEquals(MASK_VALUE, nshcCaseValue.getMask()); } @Test - public void testConvert1() throws Exception { - final Nshc1ValuesBuilder nshc1ValuesBuilder = new Nshc1ValuesBuilder() - .setNshc(Long.valueOf(1)); - final Nshc1CaseValueBuilder nshc1CaseValueBuilder = new Nshc1CaseValueBuilder() - .setNshc1Values(nshc1ValuesBuilder.build()); - - final Nshc1CaseValue nshc1CaseValue = nshc1CaseValueBuilder.build(); - - when(matchEntry.getMatchEntryValue()).thenReturn(nshc1CaseValue); + public void testConvertToOFSal() { + MatchEntry matchEntry = Nshc1Convertor.buildMatchEntry(NSHC1_VALUE, MASK_VALUE); final ExtensionAugment> extensionAugment = nshc1Convertor.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); - Assert.assertEquals(1, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc1() - .getValue().intValue()); + Assert.assertEquals(NSHC1_VALUE, + ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc1().getValue()); + Assert.assertEquals(MASK_VALUE, + ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc1().getMask()); Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class); final ExtensionAugment> extensionAugment1 = nshc1Convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); - Assert.assertEquals(1, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) - .getNxmNxNshc1().getValue().intValue()); + Assert.assertEquals(NSHC1_VALUE, + ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) + .getNxmNxNshc1().getValue()); + Assert.assertEquals(MASK_VALUE, + ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) + .getNxmNxNshc1().getMask()); Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class); final ExtensionAugment> extensionAugment2 = nshc1Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); - Assert.assertEquals(1, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) - .getNxmNxNshc1().getValue().intValue()); + Assert.assertEquals(NSHC1_VALUE, + ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc1().getValue()); + Assert.assertEquals(MASK_VALUE, + ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc1().getMask()); Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class); final ExtensionAugment> extensionAugment3 = nshc1Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); - Assert.assertEquals(1, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc1() - .getValue().intValue()); + Assert.assertEquals(NSHC1_VALUE, + ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc1().getValue()); + Assert.assertEquals(MASK_VALUE, + ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc1().getMask()); Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class); } }