X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FOpenRoadmFactory.java;h=da4cb0c26f6a2136a0009824184754e6aa885ee6;hb=34cbca4ad81fbd29e833197f0e4b09128daa8b95;hp=c33ff0cafbea8d3f3866f26241ef8a061bbbbeb5;hpb=6ba82b354cf8bea7792102fb738580fc65225841;p=transportpce.git

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 c33ff0caf..da4cb0c26 100644
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
@@ -10,42 +10,38 @@ package org.opendaylight.transportpce.networkmodel.util;
 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.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.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) {
-        LOG.info("Create topology called for {} - version", mappingNode.getNodeId(),
-            mappingNode.getOpenroadmVersion().getName());
-        switch (mappingNode.getOpenroadmVersion().getName()) {
-            case "1.2.1":
-                return openRoadmTopology121.createTopologyShard(mappingNode.getNodeId());
-            case "2.2.1":
-                LOG.info("Creating openroadm topology v2.2 node for {}",mappingNode.getNodeId());
-                return openRoadmTopology22.createTopologyShard(mappingNode);
-            default:
-                return null;
-
-        }
+        return openRoadmTopology22.createTopologyShard(mappingNode);
+    }
+
+    public TopologyShard createOtnTopologyShardVersionControl(Nodes mappingNode) {
+        return openRoadmOtnTopology22.createTopologyShard(mappingNode);
     }
 
     public boolean deleteLink(String srcNode, String dstNode, String srcTp, String destTp,