X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FOpenRoadmOtnTopologyTest.java;h=bccb0ff2afe96f32ce0a24dea2fd3fdf060f35b9;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=ae37055a4ed7088cd6b737dbafa74e779f46bff5;hpb=e50901c4b06c82b91f136dac09bacce01258d7b2;p=transportpce.git diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java index ae37055a4..bccb0ff2a 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java @@ -35,35 +35,35 @@ import org.junit.Test; import org.opendaylight.transportpce.networkmodel.dto.TopologyShard; import org.opendaylight.transportpce.networkmodel.util.test.JsonUtil; import org.opendaylight.transportpce.networkmodel.util.test.NetworkmodelTestUtil; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.network.nodes.NodeInfoBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPools; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU2; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU2e; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.SwitchingPools; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GEODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2e; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.OtnLinkType; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.OduSwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.ODU2; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.ODU2e; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.Link1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.networks.network.node.SwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If100GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If100GEODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2e; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCH; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; +import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNode; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; @@ -87,7 +87,7 @@ public class OpenRoadmOtnTopologyTest { try (Reader reader = new FileReader("src/test/resources/portMapping.json", StandardCharsets.UTF_8); JsonReader portMappingReader = new JsonReader(reader)) { Network portMapping = (Network) JsonUtil.getInstance().getDataObjectFromJson(portMappingReader, - QName.create("http://org/opendaylight/transportpce/portmapping", "2021-09-27", "network")); + QName.create("http://org/opendaylight/transportpce/portmapping", "2022-03-16", "network")); for (Nodes nodes : portMapping.nonnullNodes().values()) { if (nodes.getNodeId().equals("XPDR-A1")) { this.portMappingTpdr = nodes; @@ -135,7 +135,7 @@ public class OpenRoadmOtnTopologyTest { assertEquals( Uint16.valueOf(1), node.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.Node1.class) .getXpdrAttributes() .getXpdrNumber()); //tests list of TPs @@ -154,7 +154,7 @@ public class OpenRoadmOtnTopologyTest { "only If100GE interface capabitily expected", 1, tps.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability() @@ -162,7 +162,7 @@ public class OpenRoadmOtnTopologyTest { assertEquals( If100GE.class.getName(), tps.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces().nonnullSupportedInterfaceCapability() .values().stream().findFirst() @@ -171,7 +171,7 @@ public class OpenRoadmOtnTopologyTest { "first TP must be of type client", OpenroadmTpType.XPONDERCLIENT, tps.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 .TerminationPoint1.class) .getTpType()); //tests network tp @@ -183,7 +183,7 @@ public class OpenRoadmOtnTopologyTest { "only IfOCH interface capabitily expected", 1, tps.get(2).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability() @@ -191,7 +191,7 @@ public class OpenRoadmOtnTopologyTest { assertEquals( IfOCH.class.getName(), tps.get(2).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability() @@ -202,7 +202,7 @@ public class OpenRoadmOtnTopologyTest { assertNull( "the rate should be null", tps.get(2).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getRate()); @@ -210,7 +210,7 @@ public class OpenRoadmOtnTopologyTest { "third TP must be of type network", OpenroadmTpType.XPONDERNETWORK, tps.get(2).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1.class) .getTpType()); } @@ -262,20 +262,20 @@ public class OpenRoadmOtnTopologyTest { assertEquals( OpenroadmLinkType.OTNLINK, sortedLinks.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1.class) .getLinkType()); assertEquals( "opposite link must be present", "OTU4-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1", sortedLinks.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1.class) .getOppositeLink() .getValue()); assertEquals( "otn link type should be OTU4", OtnLinkType.OTU4, sortedLinks.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.Link1.class) + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class) .getOtnLinkType()); } @@ -335,14 +335,14 @@ public class OpenRoadmOtnTopologyTest { OpenroadmLinkType.OTNLINK, sortedLinks.get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1.class) .getLinkType()); assertEquals( "opposite link must be present", "ODTU4-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1", sortedLinks.get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1.class) .getOppositeLink() .getValue()); assertEquals( @@ -350,7 +350,7 @@ public class OpenRoadmOtnTopologyTest { OtnLinkType.ODTU4, sortedLinks.get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.Link1.class) + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class) .getOtnLinkType()); assertEquals("list of TPs should contain 2 updated TPs", 2, topoShard.getTps().size()); @@ -358,7 +358,7 @@ public class OpenRoadmOtnTopologyTest { "after ODU4 creation, its termination point should contain a TsPool list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool()); @@ -367,7 +367,7 @@ public class OpenRoadmOtnTopologyTest { 80, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool() @@ -376,7 +376,7 @@ public class OpenRoadmOtnTopologyTest { "after ODU4 creation, its termination point should contain a TpnPool list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -387,7 +387,7 @@ public class OpenRoadmOtnTopologyTest { 80, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -443,7 +443,7 @@ public class OpenRoadmOtnTopologyTest { "after ODU4 deletion, its termination points should not contain any TsPool list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool()); @@ -451,7 +451,7 @@ public class OpenRoadmOtnTopologyTest { "after ODU4 deletion, its termination points should not contain any TpnPool list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool()); @@ -502,7 +502,7 @@ public class OpenRoadmOtnTopologyTest { 72, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool() @@ -511,7 +511,7 @@ public class OpenRoadmOtnTopologyTest { "trib slot 1-8 should no longer be present in Trib slot list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool(), @@ -520,7 +520,7 @@ public class OpenRoadmOtnTopologyTest { "trib slot 9 should always be present in trib slot list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool(), @@ -530,7 +530,7 @@ public class OpenRoadmOtnTopologyTest { 79, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -541,7 +541,7 @@ public class OpenRoadmOtnTopologyTest { "trib port 1 should no longer be present", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -572,7 +572,7 @@ public class OpenRoadmOtnTopologyTest { 80, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool() @@ -581,7 +581,7 @@ public class OpenRoadmOtnTopologyTest { "after 10G deletion, trib slot list should contain items 1-8", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool(), @@ -591,7 +591,7 @@ public class OpenRoadmOtnTopologyTest { 80, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -602,7 +602,7 @@ public class OpenRoadmOtnTopologyTest { "after 10G deletion, trib port list should contain items 1", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -640,7 +640,7 @@ public class OpenRoadmOtnTopologyTest { 79, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool() @@ -649,7 +649,7 @@ public class OpenRoadmOtnTopologyTest { "trib slot 1 should no longer be present in Trib slot list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool(), @@ -658,7 +658,7 @@ public class OpenRoadmOtnTopologyTest { "trib slot 2 should always be present in Trib slot list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes().getTsPool(), hasItem(Uint16.valueOf(2))); @@ -667,7 +667,7 @@ public class OpenRoadmOtnTopologyTest { 79, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -678,7 +678,7 @@ public class OpenRoadmOtnTopologyTest { "trib port 1 should no longer be present in Trib port list", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -712,7 +712,7 @@ public class OpenRoadmOtnTopologyTest { 80, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool() @@ -721,7 +721,7 @@ public class OpenRoadmOtnTopologyTest { "after 1G deletion, trib slot list should contain items 1 and 2", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getTsPool(), @@ -731,7 +731,7 @@ public class OpenRoadmOtnTopologyTest { 80, topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -742,7 +742,7 @@ public class OpenRoadmOtnTopologyTest { "after 1G deletion, trib port list should contain items 1", topoShard.getTps().get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getOdtuTpnPool().values().stream().findFirst() @@ -786,7 +786,7 @@ public class OpenRoadmOtnTopologyTest { private void checkSpdrNode(Node node) { Uint16 xpdrNb = node - .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1.class) + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.Node1.class) .getXpdrAttributes().getXpdrNumber(); assertEquals("SPDR-SA1-XPDR" + xpdrNb, node.getNodeId().getValue()); if (xpdrNb.equals(Uint16.valueOf(1))) { @@ -808,7 +808,7 @@ public class OpenRoadmOtnTopologyTest { checkSpdrSwitchingPools( xpdrNb, node.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Node1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.Node1.class) .getSwitchingPools()); List tpList = node.augmentation( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class) @@ -890,7 +890,7 @@ public class OpenRoadmOtnTopologyTest { IfOCHOTU4ODU4.class, tpList.get(4) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability().values().stream().findFirst() @@ -901,7 +901,7 @@ public class OpenRoadmOtnTopologyTest { ODU4.class, tpList.get(4) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getRate()); @@ -927,7 +927,7 @@ public class OpenRoadmOtnTopologyTest { 2, tpList.get(1) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability().values().size()); @@ -936,13 +936,13 @@ public class OpenRoadmOtnTopologyTest { 3, tpList.get(2) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability().values().size()); List sicListClient1 = tpList.get(0) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability().values().stream().collect(Collectors.toList()); @@ -954,7 +954,7 @@ public class OpenRoadmOtnTopologyTest { } List sicListClient3 = tpList.get(3) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability().values().stream().collect(Collectors.toList()); @@ -968,7 +968,7 @@ public class OpenRoadmOtnTopologyTest { assertThat("the rate should be ODU2 or ODU2e", String.valueOf(tpList.get(2) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getXpdrTpPortConnectionAttributes() .getRate()), @@ -979,7 +979,7 @@ public class OpenRoadmOtnTopologyTest { OpenroadmTpType.XPONDERCLIENT, tpList.get(2) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 .TerminationPoint1.class) .getTpType()); assertEquals( @@ -987,7 +987,7 @@ public class OpenRoadmOtnTopologyTest { OpenroadmTpType.XPONDERNETWORK, tpList.get(4) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 .TerminationPoint1.class) .getTpType()); } else if (xpdrNb.equals(Uint16.valueOf(2))) { @@ -1001,7 +1001,7 @@ public class OpenRoadmOtnTopologyTest { IfOCHOTU4ODU4.class, tpList.get(5) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability().values().stream().findFirst() @@ -1012,13 +1012,13 @@ public class OpenRoadmOtnTopologyTest { 2, tpList.get(2) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability().values().size()); List sicListClient3 = tpList.get(2) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210 .TerminationPoint1.class) .getTpSupportedInterfaces() .getSupportedInterfaceCapability().values().stream().collect(Collectors.toList()); @@ -1032,14 +1032,14 @@ public class OpenRoadmOtnTopologyTest { "TP should be of type client", OpenroadmTpType.XPONDERCLIENT, tpList.get(2) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 .TerminationPoint1.class) .getTpType()); assertEquals( "TP should be of type network", OpenroadmTpType.XPONDERNETWORK, tpList.get(6) .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529 + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 .TerminationPoint1.class) .getTpType()); }