Initial code for OTN topology and portmapping

[transportpce.git] / networkmodel / src / main / java / org / opendaylight / transportpce / networkmodel / util / OpenRoadmFactory.java

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
index be6b89728877bc273586c6cf336d68596119fdd6..addef27749586e2418cd95bf70fa3967a439dca8 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
@@ -7,44 +7,41 @@
  */
 package org.opendaylight.transportpce.networkmodel.util;
 
-import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.mapping.MappingUtils;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.LinkBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class OpenRoadmFactory {
     private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmFactory.class);
-    OpenRoadmTopology121 openRoadmTopology121;
     OpenRoadmTopology22 openRoadmTopology22;
+    OpenRoadmOtnTopology22 openRoadmOtnTopology22;
     private final MappingUtils mappingUtils;
 
-    public OpenRoadmFactory(MappingUtils mappingUtils, OpenRoadmTopology121 openRoadmTopology121,
-                            OpenRoadmTopology22 openRoadmTopology22) {
+    public OpenRoadmFactory(MappingUtils mappingUtils, OpenRoadmTopology22 openRoadmTopology22,
+        OpenRoadmOtnTopology22 openRoadmOtnTopology22) {
         this.mappingUtils = mappingUtils;
         this.openRoadmTopology22 = openRoadmTopology22;
-        this.openRoadmTopology121 = openRoadmTopology121;
+        this.openRoadmOtnTopology22 = openRoadmOtnTopology22;
     }
 
     public void createTopoLayerVersionControl(NetworkTransactionService networkTransactionService) {
         openRoadmTopology22.createTopoLayer();
+    }
+
+    public void createOtnTopoLayerVersionControl(NetworkTransactionService networkTransactionService) {
+        openRoadmOtnTopology22.createTopoLayer();
+    }
 
+    public TopologyShard createTopologyShardVersionControl(Nodes mappingNode) {
+        return openRoadmTopology22.createTopologyShard(mappingNode);
     }
 
-    public TopologyShard createTopologyShardVersionControl(String nodeId) {
-        LOG.info("Create topology called for {}",nodeId);
-        switch (mappingUtils.getOpenRoadmVersion(nodeId)) {
-            case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1:
-                return openRoadmTopology121.createTopologyShard(nodeId);
-            case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1:
-                LOG.info("Creating openroadm topology v2.2 node for {}",nodeId);
-                return openRoadmTopology22.createTopologyShard(nodeId);
-            default:
-                return null;
-
-        }
+    public TopologyShard createOtnTopologyShardVersionControl(Nodes mappingNode) {
+        return openRoadmOtnTopology22.createTopologyShard(mappingNode);
     }
 
     public boolean deleteLink(String srcNode, String dstNode, String srcTp, String destTp,