Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fix bug when creating SRG termination points
[transportpce.git] / networkmodel / src / test / java / org / opendaylight / transportpce / networkmodel / util / test / NetworkmodelTestUtil.java
diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java
index dca31a41b6ac1c0456d38763f6c7b10e144c6d84..9ba08663da5309fadfdf6963544c084855de479c 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java
@@ -13,35 +13,32 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.XpdrNodeTypes;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.xpdr.tp.supported.interfaces.SupportedInterfaceCapability;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODTU4TsAllocated;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.ODU4;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.TerminationPoint1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.TerminationPoint1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.TpSupportedInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.TpSupportedInterfacesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.networks.network.node.termination.point.XpdrTpPortConnectionAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.If100GE;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.IfOCH;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.SupportedIfCapability;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181130.IfOCHOTU4ODU4;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev181130.xpdr.otn.tp.attributes.OdtuTpnPool;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev181130.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder;
-import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.OtnLinkType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes;
+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.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.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.ODTU4TsAllocated;
+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.TerminationPoint1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.termination.point.TpSupportedInterfaces;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.termination.point.TpSupportedInterfacesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.networks.network.node.termination.point.XpdrTpPortConnectionAttributesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev200529.xpdr.otn.tp.attributes.OdtuTpnPool;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev200529.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder;
+import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
@@ -64,16 +61,17 @@ public final class NetworkmodelTestUtil {
 
     private static final Logger LOG = LoggerFactory.getLogger(NetworkmodelTestUtil.class);
 
-    public static Nodes createMappingForRdm(String nodeId, String clli, int degNb, int srgNb) {
+    public static Nodes createMappingForRdm(String nodeId, String clli, int degNb, List<Integer> srgNbs) {
         Map<MappingKey,Mapping> mappingList = new HashMap<>();
         createDegreeMappings(mappingList, 1, degNb);
-        createSrgMappings(mappingList, 1, srgNb);
-        Nodes mappingNode = new NodesBuilder()
+        for (Integer integer : srgNbs) {
+            createSrgMappings(mappingList, integer.intValue());
+        }
+        return new NodesBuilder()
             .setNodeId(nodeId)
             .setNodeInfo(new NodeInfoBuilder().setNodeType(NodeTypes.Rdm).setNodeClli(clli).build())
             .setMapping(mappingList)
             .build();
-        return mappingNode;
     }
 
     public static Nodes createMappingForXpdr(String nodeId, String clli, int networkPortNb, int clientPortNb,
@@ -89,56 +87,52 @@ public final class NetworkmodelTestUtil {
         return mappingNode;
     }
 
-    public static List<Link> createSuppOTNLinks(OtnLinkType type, int availBW) {
-        String prefix = null;
-        if (OtnLinkType.OTU4.equals(type)) {
-            prefix = "OTU4-";
-        } else if (OtnLinkType.ODTU4.equals(type)) {
-            prefix = "ODU4-";
-        }
+    public static List<Link> createSuppOTNLinks(OtnLinkType type, Uint32 availBW) {
         Link linkAZ = new LinkBuilder()
-            .setLinkId(new LinkId(prefix + "SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
+            .setLinkId(new LinkId(type.getName() + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
             .setSource(new SourceBuilder()
                     .setSourceNode(new NodeId("SPDRA-XPDR1"))
-                    .setSourceTp("XPDR1-NETWORK1").build())
+                    .setSourceTp(new TpId("XPDR1-NETWORK1")).build())
             .setDestination(new DestinationBuilder()
                     .setDestNode(new NodeId("SPDRZ-XPDR1"))
-                    .setDestTp("XPDR1-NETWORK1").build())
+                    .setDestTp(new TpId("XPDR1-NETWORK1")).build())
             .addAugmentation(
                 new Link1Builder()
                     .setLinkType(OpenroadmLinkType.OTNLINK)
-                    .setOppositeLink(new LinkId(prefix + "SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
+                    .setOppositeLink(new LinkId(type.getName()
+                        + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
                     .build())
             .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1Builder()
-                    .setAvailableBandwidth(Uint32.valueOf(availBW))
-                    .setUsedBandwidth(Uint32.valueOf(100000 - availBW))
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder()
+                    .setAvailableBandwidth(availBW)
+                    .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue()))
                     .build())
             .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1Builder()
+                new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1Builder()
                     .setOtnLinkType(type)
                     .build())
             .build();
         Link linkZA = new LinkBuilder()
-            .setLinkId(new LinkId(prefix + "SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
+            .setLinkId(new LinkId(type.getName() + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
             .setSource(new SourceBuilder()
                     .setSourceNode(new NodeId("SPDRZ-XPDR1"))
-                    .setSourceTp("XPDR1-NETWORK1").build())
+                    .setSourceTp(new TpId("XPDR1-NETWORK1")).build())
             .setDestination(new DestinationBuilder()
                     .setDestNode(new NodeId("SPDRA-XPDR1"))
-                    .setDestTp("XPDR1-NETWORK1").build())
+                    .setDestTp(new TpId("XPDR1-NETWORK1")).build())
             .addAugmentation(
                 new Link1Builder()
                     .setLinkType(OpenroadmLinkType.OTNLINK)
-                    .setOppositeLink(new LinkId(prefix + "SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
+                    .setOppositeLink(new LinkId(type.getName()
+                        + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
                     .build())
             .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1Builder()
-                    .setAvailableBandwidth(Uint32.valueOf(availBW))
-                    .setUsedBandwidth(Uint32.valueOf(100000 - availBW))
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder()
+                    .setAvailableBandwidth(availBW)
+                    .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue()))
                     .build())
             .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.Link1Builder()
+                new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1Builder()
                     .setOtnLinkType(type)
                     .build())
             .build();
@@ -182,7 +176,7 @@ public final class NetworkmodelTestUtil {
         SupportingTerminationPoint supTermPointA = new SupportingTerminationPointBuilder()
             .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
             .setNodeRef(new NodeId("SPDRA-XPDR1"))
-            .setTpRef("XPDR1-NETWORK1")
+            .setTpRef(new TpId("XPDR1-NETWORK1"))
             .build();
         Map<SupportingTerminationPointKey,SupportingTerminationPoint> supTermPointMapA =
                 Map.of(supTermPointA.key(), supTermPointA);
@@ -191,14 +185,14 @@ public final class NetworkmodelTestUtil {
             .setSupportingTerminationPoint(supTermPointMapA)
             .addAugmentation(otnTp1)
             .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder()
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder()
                 .setTpType(OpenroadmTpType.XPONDERNETWORK)
                 .build())
             .build();
         SupportingTerminationPoint supTermPointZ = new SupportingTerminationPointBuilder()
             .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
             .setNodeRef(new NodeId("SPDRZ-XPDR1"))
-            .setTpRef("XPDR1-NETWORK1")
+            .setTpRef(new TpId("XPDR1-NETWORK1"))
             .build();
         Map<SupportingTerminationPointKey,SupportingTerminationPoint> supTermPointMapZ =
                 Map.of(supTermPointZ.key(), supTermPointZ);
@@ -207,7 +201,7 @@ public final class NetworkmodelTestUtil {
             .setSupportingTerminationPoint(supTermPointMapZ)
             .addAugmentation(otnTp1)
             .addAugmentation(
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder()
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder()
                 .setTpType(OpenroadmTpType.XPONDERNETWORK)
                 .build())
             .build();
@@ -233,18 +227,15 @@ public final class NetworkmodelTestUtil {
         return mappingMap;
     }
 
-    private static Map<MappingKey,Mapping> createSrgMappings(Map<MappingKey,Mapping> mappingMap,
-            int srgNbStart, int srgNbStop) {
-        for (int i = srgNbStart; i <= srgNbStop; i++) {
-            for (int j = 1; j <= 4; j++) {
-                Mapping mapping = new MappingBuilder()
-                    .setLogicalConnectionPoint("SRG" + i + "-PP" + j + "-TXRX")
-                    .setPortDirection("bidirectional")
-                    .setSupportingPort("C" + j)
-                    .setSupportingCircuitPackName(3 + i + "/0")
-                    .build();
-                mappingMap.put(mapping.key(),mapping);
-            }
+    private static Map<MappingKey,Mapping> createSrgMappings(Map<MappingKey,Mapping> mappingMap, int srgNb) {
+        for (int j = 1; j <= 4; j++) {
+            Mapping mapping = new MappingBuilder()
+                .setLogicalConnectionPoint("SRG" + srgNb + "-PP" + j + "-TXRX")
+                .setPortDirection("bidirectional")
+                .setSupportingPort("C" + j)
+                .setSupportingCircuitPackName(3 + srgNb + "/0")
+                .build();
+            mappingMap.put(mapping.key(),mapping);
         }
         return mappingMap;
     }
@@ -253,8 +244,9 @@ public final class NetworkmodelTestUtil {
             int networkPortNb, int clientPortNb,
         XpdrNodeTypes xpdrNodeType) {
         for (int i = 1; i <= networkPortNb; i++) {
-            List<Class<? extends SupportedIfCapability>> supportedIntf = new ArrayList<>();
-            supportedIntf.add(IfOCH.class);
+            List<Class<? extends org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327
+                .SupportedIfCapability>> supportedIntf = new ArrayList<>();
+            supportedIntf.add(org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH.class);
             MappingBuilder mappingBldr = new MappingBuilder()
                 .setLogicalConnectionPoint("XPDR1-NETWORK" + i)
                 .setPortDirection("bidirectional")
@@ -270,8 +262,9 @@ public final class NetworkmodelTestUtil {
             mappingMap.put(mapping.key(),mapping);
         }
         for (int i = 1; i <= clientPortNb; i++) {
-            List<Class<? extends SupportedIfCapability>> supportedIntf = new ArrayList<>();
-            supportedIntf.add(If100GE.class);
+            List<Class<? extends org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327
+                .SupportedIfCapability>> supportedIntf = new ArrayList<>();
+            supportedIntf.add(org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GE.class);
             Mapping mapping = new MappingBuilder()
                 .setLogicalConnectionPoint("XPDR1-CLIENT" + i)
                 .setPortDirection("bidirectional")
Repository for Transport PCE project.