X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2FNetworkModelWaveLengthServiceFreeTest.java;h=22b6db6227af91dc461479d4e4590c025acfa79d;hb=e3438cad213946cd76a73219876487c30024dfae;hp=ce1759d6d137d17b0763520ed63aaddabb598452;hpb=0779ad5796bb645690874959c9a891c42e2f7175;p=transportpce.git diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java index ce1759d6d..22b6db622 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java @@ -7,62 +7,81 @@ */ package org.opendaylight.transportpce.renderer; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutionException; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.opendaylight.controller.md.sal.binding.api.MountPointService; +import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; +import org.opendaylight.transportpce.common.fixedflex.FixedFlexImpl; import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub; import org.opendaylight.transportpce.renderer.stub.MountPointStub; import org.opendaylight.transportpce.renderer.utils.ServiceDeleteDataUtils; import org.opendaylight.transportpce.renderer.utils.WaveLengthServiceUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev170929.degree.used.wavelengths.UsedWavelengthsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.DegreeAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.SrgAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.CpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.CtpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.PpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.RxTtpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.TxTtpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrClientAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrNetworkAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrPortAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.pp.attributes.UsedWavelengthBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmTpType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev170929.xpdr.port.connection.attributes.WavelengthBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.PathDescription; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev181130.FrequencyGHz; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev181130.FrequencyTHz; +import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node.attributes.AvailableWavelengths; +import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.used.wavelengths.UsedWavelengths; +import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.used.wavelengths.UsedWavelengthsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.used.wavelengths.UsedWavelengthsKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.DegreeAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.SrgAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.CpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.CtpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.PpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.RxTtpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.TxTtpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.XpdrClientAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.XpdrNetworkAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.XpdrPortAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.pp.attributes.UsedWavelength; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.pp.attributes.UsedWavelengthBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev181130.xpdr.port.connection.attributes.WavelengthBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.PathDescription; +import org.opendaylight.yangtools.yang.common.Uint32; +@Ignore @RunWith(Parameterized.class) public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { - - private static final Long WAVE_LENGTH = 20L; + private static final Uint32 UI32_WAVE_LENGTH = Uint32.valueOf(20); + private static final long WAVE_LENGTH = 20L; private NetworkModelWavelengthService networkModelWavelengthService; private DeviceTransactionManager deviceTransactionManager; private TerminationPoint1 terminationPoint1; + private org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1 terminationPoint2; private PathDescription pathDescription; private Node1 node1; + private org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2; public NetworkModelWaveLengthServiceFreeTest(PathDescription pathDescription, TerminationPoint1 terminationPoint1, - Node1 node1) { + Node1 node1, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 terminationPoint2, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2) { + this.pathDescription = pathDescription; this.terminationPoint1 = terminationPoint1; + this.terminationPoint2 = terminationPoint2; this.node1 = node1; + this.node2 = node2; + } @Parameterized.Parameters @@ -70,82 +89,139 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { List parameters = new ArrayList<>(); PathDescription pathDescription = - ServiceDeleteDataUtils.createTransactionPathDescription(OpenRoadmInterfacesImpl.TTP_TOKEN); + ServiceDeleteDataUtils.createTransactionPathDescription(StringConstants.TTP_TOKEN); + + FixedFlexImpl fixedFlex = new FixedFlexImpl(); + fixedFlex = fixedFlex.getFixedFlexWaveMapping(WAVE_LENGTH); + FrequencyGHz frequencyGHz = new FrequencyGHz(new BigDecimal(fixedFlex.getWavelength())); + FrequencyTHz frequencyTHz = new FrequencyTHz(new BigDecimal(fixedFlex.getCenterFrequency())); + + UsedWavelength usedWaveLength = (new UsedWavelengthBuilder()).setIndex(UI32_WAVE_LENGTH).build(); + UsedWavelengths usedWaveLengthDegree = (new UsedWavelengthsBuilder()).setIndex(UI32_WAVE_LENGTH).build(); + Map usedWaveLengthDegreeMap = + Map.of(usedWaveLengthDegree.key(),usedWaveLengthDegree); + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130 + .networks.network.node.termination.point.cp.attributes.UsedWavelengths usedWaveLentgthCp = + (new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks + .network.node.termination.point.cp.attributes.UsedWavelengthsBuilder()) + .setIndex(UI32_WAVE_LENGTH) + .build(); + TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder() + .setCtpAttributes((new CtpAttributesBuilder()) + .setUsedWavelengths( + usedWaveLengthDegreeMap) + .build()) + .setCpAttributes((new CpAttributesBuilder()) + .setUsedWavelengths( + Map.of(usedWaveLentgthCp.key(), + usedWaveLentgthCp)) + .build()) + .setTxTtpAttributes((new TxTtpAttributesBuilder()) + .setUsedWavelengths( + usedWaveLengthDegreeMap) + .build()) + .setRxTtpAttributes((new RxTtpAttributesBuilder()) + .setUsedWavelengths( + usedWaveLengthDegreeMap) + .build()) + .setPpAttributes((new PpAttributesBuilder()) + .setUsedWavelength(Map.of(usedWaveLength.key(),usedWaveLength)) + .build()) + .setXpdrClientAttributes((new XpdrClientAttributesBuilder()) + .setWavelength((new WavelengthBuilder()) + .setFrequency(frequencyTHz) + .setWidth(frequencyGHz) + .build()) + .build()) + .setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()) + .setWavelength((new WavelengthBuilder()) + .setFrequency(frequencyTHz) + .setWidth(frequencyGHz) + .build()) + .build()) + .setXpdrPortAttributes((new XpdrPortAttributesBuilder()) + .setWavelength((new WavelengthBuilder()) + .setFrequency(frequencyTHz) + .setWidth(frequencyGHz) + .build()) + .build()); - TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder(); - terminationPoint1Builder.setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(Collections - .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(Collections - .singletonList((new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network - .node.termination.point.cp.attributes.UsedWavelengthsBuilder()) - .setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(Collections - .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(Collections - .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(Collections - .singletonList((new UsedWavelengthBuilder()).setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setXpdrClientAttributes((new XpdrClientAttributesBuilder()) - .setWavelength((new WavelengthBuilder()).setIndex(WAVE_LENGTH).build()).build()); - terminationPoint1Builder.setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()) - .setWavelength((new WavelengthBuilder()).setIndex(WAVE_LENGTH).build()).build()); - terminationPoint1Builder.setXpdrPortAttributes((new XpdrPortAttributesBuilder()) - .setWavelength((new WavelengthBuilder()).setIndex(WAVE_LENGTH).build()).build()); + Node1Builder node1Builder = new Node1Builder() + .setDegreeAttributes((new DegreeAttributesBuilder()).setAvailableWavelengths(Map.of()).build()) + .setSrgAttributes((new SrgAttributesBuilder()).setAvailableWavelengths(Map.of()).build()); - Node1Builder node1Builder = new Node1Builder(); - node1Builder.setDegreeAttributes((new DegreeAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()) - .build()); - node1Builder.setSrgAttributes((new SrgAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder + terminationPoint2Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder(); + + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder node2Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder(); for (OpenroadmNodeType nodeType : Arrays.asList(OpenroadmNodeType.XPONDER, OpenroadmNodeType.DEGREE, OpenroadmNodeType.SRG)) { - node1Builder.setNodeType(nodeType); - terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); + node2Builder.setNodeType(nodeType); + terminationPoint2Builder.setTpType(OpenroadmTpType.DEGREETXTTP); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); } for (OpenroadmTpType tpType : OpenroadmTpType.values()) { - node1Builder.setNodeType(OpenroadmNodeType.DEGREE); + node2Builder.setNodeType(OpenroadmNodeType.DEGREE); node1Builder.setDegreeAttributes(null); - terminationPoint1Builder.setTpType(tpType); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); + terminationPoint2Builder.setTpType(tpType); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); } - node1Builder.setNodeType(OpenroadmNodeType.SRG); - node1Builder.setDegreeAttributes((new DegreeAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()) - .build()); - node1Builder.setSrgAttributes(null); - terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); - + node2Builder.setNodeType(OpenroadmNodeType.SRG); + node1Builder + .setDegreeAttributes((new DegreeAttributesBuilder()) + .setAvailableWavelengths(Map.of()) + .build()) + .setSrgAttributes(null); + terminationPoint2Builder.setTpType(OpenroadmTpType.DEGREETXTTP); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); return parameters; } @Before public void setMountPoint() { - MountPointService mountPointService = new MountPointServiceStub(new MountPointStub(this.getDataBroker())); + MountPointServiceStub mountPointService = new MountPointServiceStub(new MountPointStub(this.getDataBroker())); this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000); networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(this.getDataBroker()); } @Test public void freeWavelengthsTest() throws ExecutionException, InterruptedException { - WaveLengthServiceUtils.putTerminationPoint1ToDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN, - OpenRoadmInterfacesImpl.TTP_TOKEN, - this.terminationPoint1, this.deviceTransactionManager); - WaveLengthServiceUtils.putNode1ToDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN, this.node1, + WaveLengthServiceUtils.putTerminationPoint1ToDatastore("node1" + StringConstants.TTP_TOKEN, + StringConstants.TTP_TOKEN, this.terminationPoint1, this.deviceTransactionManager); + WaveLengthServiceUtils.putTerminationPoint2ToDatastore("node1" + StringConstants.TTP_TOKEN, + StringConstants.TTP_TOKEN, this.terminationPoint2, this.deviceTransactionManager); + WaveLengthServiceUtils.putNode1ToDatastore("node1" + StringConstants.TTP_TOKEN, this.node1, + this.deviceTransactionManager); + WaveLengthServiceUtils.putNode2ToDatastore("node1" + StringConstants.TTP_TOKEN, this.node2, this.deviceTransactionManager); this.networkModelWavelengthService.freeWavelengths(this.pathDescription); - Node1 updatedNode1 = WaveLengthServiceUtils.getNode1FromDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN, + Node1 updatedNode1 = WaveLengthServiceUtils.getNode1FromDatastore("node1" + StringConstants.TTP_TOKEN, + this.deviceTransactionManager); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 updatedNode2 = + WaveLengthServiceUtils.getNode2FromDatastore("node1" + StringConstants.TTP_TOKEN, this.deviceTransactionManager); TerminationPoint1 updatedTerminationPoint1 = - WaveLengthServiceUtils.getTerminationPoint1FromDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN, - OpenRoadmInterfacesImpl.TTP_TOKEN, this.deviceTransactionManager); - switch (updatedTerminationPoint1.getTpType()) { + WaveLengthServiceUtils.getTerminationPoint1FromDatastore("node1" + StringConstants.TTP_TOKEN, + StringConstants.TTP_TOKEN, this.deviceTransactionManager); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1 updatedTerminationPoint2 = WaveLengthServiceUtils + .getTerminationPoint2FromDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, + this.deviceTransactionManager); + switch (updatedTerminationPoint2.getTpType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1) + // updatedTerminationPoint1).getTpType()) { case DEGREETXRXCTP: case DEGREETXCTP: case DEGREERXCTP: - Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty()); + Assert.assertNull(updatedTerminationPoint1.getCtpAttributes()); Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty()); @@ -158,7 +234,7 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { case SRGRXCP: case SRGTXRXCP: Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty()); - Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty()); + Assert.assertNull(updatedTerminationPoint1.getCpAttributes()); Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty()); @@ -170,7 +246,7 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { case DEGREETXTTP: Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty()); - Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty()); + Assert.assertNull(updatedTerminationPoint1.getTxTtpAttributes()); Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty()); Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength()); @@ -181,7 +257,7 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty()); - Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty()); + Assert.assertNull(updatedTerminationPoint1.getRxTtpAttributes()); Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty()); Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength()); Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength()); @@ -194,7 +270,7 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty()); Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty()); - Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty()); + Assert.assertNull(updatedTerminationPoint1.getPpAttributes()); Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength()); Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength()); Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength()); @@ -240,22 +316,29 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength()); break; } - switch (updatedNode1.getNodeType()) { + List availableWavelengths = new ArrayList<>(updatedNode1 + .getDegreeAttributes().nonnullAvailableWavelengths().values()); + List + availableWavelengths4srg = + new ArrayList<>(updatedNode1.getSrgAttributes().getAvailableWavelengths().values()); + switch (updatedNode2.getNodeType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) updatedNode1) + // .getNodeType()) { case DEGREE: - Assert.assertEquals(1, updatedNode1.getDegreeAttributes().getAvailableWavelengths().size()); - Assert.assertEquals(WAVE_LENGTH, - updatedNode1.getDegreeAttributes().getAvailableWavelengths().get(0).getIndex()); - Assert.assertTrue(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty()); + Assert.assertEquals(1, availableWavelengths.size()); + Assert.assertEquals(UI32_WAVE_LENGTH, + availableWavelengths.get(0).getIndex()); + Assert.assertTrue(availableWavelengths4srg.isEmpty()); break; case SRG: - Assert.assertEquals(1, updatedNode1.getSrgAttributes().getAvailableWavelengths().size()); - Assert.assertEquals(WAVE_LENGTH, - updatedNode1.getSrgAttributes().getAvailableWavelengths().get(0).getIndex()); - Assert.assertTrue(updatedNode1.getDegreeAttributes().getAvailableWavelengths().isEmpty()); + Assert.assertEquals(1, availableWavelengths4srg.size()); + Assert.assertEquals(UI32_WAVE_LENGTH, + availableWavelengths4srg.get(0).getIndex()); + Assert.assertTrue(availableWavelengths.isEmpty()); break; default: - Assert.assertTrue(updatedNode1.getDegreeAttributes().getAvailableWavelengths().isEmpty()); - Assert.assertTrue(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty()); + Assert.assertTrue(availableWavelengths.isEmpty()); + Assert.assertTrue(availableWavelengths4srg.isEmpty()); break; } }