1 files changed, 14 insertions, 29 deletions
diff --git a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/OtnNetwork.java b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/OtnNetwork.java
index b6d1fb0..184f613 100644
--- a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/OtnNetwork.java
+++ b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/OtnNetwork.java
@@ -19,12 +19,10 @@
  */
 package org.onap.integration.actninterfacetools.sampleapp.mpiconverter.model;
 
-import org.onap.integration.actninterfacetools.actnclient.api.CustomerOtnTopology;
-import org.onap.integration.actninterfacetools.sampleapp.mpiconverter.converter.PncConverter;
+import org.onap.integration.actninterfacetools.globalapi.CustomerOtnTopology;
 
 import java.util.List;
 import java.util.Map;
-import java.util.function.Supplier;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -38,32 +36,6 @@ public class OtnNetwork extends CustomerOtnTopology implements Network {
     private final Map<TeNodeKey,List<TsLink>> edgeLinks;
     private final PncOtnBandwidthProfile bandwidthProfileSupplier;
 
-//    public OtnNetwork(org.onosproject.yang.gen.v11.ietfnetwork.rev20180226.ietfnetwork.networks.Network yangNetwork){
-//
-//        this(yangNetwork,
-//                ()-> PncConverter.getOtnNodes(yangNetwork),
-//                ()-> PncConverter.getTsNodeInfo(yangNetwork),
-//                ()-> PncConverter.getOtnInnerLinks(yangNetwork),
-//                ()-> PncConverter.getOtnEdgeLinks(yangNetwork),
-//                ()-> PncConverter.getBandWidthProfile(yangNetwork));
-//    }
-
-
-//     OtnNetwork(org.onosproject.yang.gen.v11.ietfnetwork.rev20180226.ietfnetwork.networks.Network yangNetwork,
-//                      Supplier<List<TeNodeKey>> nodes,
-//                      Supplier<Map<TeNodeKey, TsNodeInfo>> tsNodeInfos,
-//                      Supplier<List<TsLink>> innerLinks,
-//                      Supplier<Map<TeNodeKey, List<TsLink>>> edgeLinks,
-//                      Supplier<PncOtnBandwidthProfile> bandwidthProfile){
-//        checkNotNull(yangNetwork, "OtnNetwork: yangNetwork passed in is null");
-//        this.networkId = yangNetwork.networkId().toString();
-//        this.nodes = nodes;
-//        this.innerLinks = innerLinks;
-//        this.edgeLinks = edgeLinks;
-//        this.tsNodeInfos = tsNodeInfos;
-//        this.bandwidthProfileSupplier = bandwidthProfile;
-//    }
-
     public OtnNetwork(String networkId, List<TeNodeKey> otnNodes, Map<TeNodeKey, TsNodeInfo> tsNodeInfo, List<TsLink> otnInnerLinks, Map<TeNodeKey, List<TsLink>> otnEdgeLinks, PncOtnBandwidthProfile bandWidthProfile) {
         this.networkId = networkId;
         this.nodes = otnNodes;
@@ -103,4 +75,17 @@ public class OtnNetwork extends CustomerOtnTopology implements Network {
     public String networkId(){
         return this.networkId;
     }
+
+    @Override
+    public String toString() {
+        return "OtnNetwork{" +
+                "networkType=" + networkType +
+                ", networkId='" + networkId + '\'' +
+                ", nodes=" + nodes +
+                ", tsNodeInfos=" + tsNodeInfos +
+                ", innerLinks=" + innerLinks +
+                ", edgeLinks=" + edgeLinks +
+                ", bandwidthProfileSupplier=" + bandwidthProfileSupplier +
+                '}';
+    }
 }