diff options
Diffstat (limited to 'sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model')
7 files changed, 43 insertions, 42 deletions
diff --git a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/EthSrv.java b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/EthSrv.java index 0af701f..7c5f1b6 100644 --- a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/EthSrv.java +++ b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/EthSrv.java @@ -19,8 +19,6 @@ */ package org.onap.integration.actninterfacetools.sampleapp.mpiconverter.model; -import org.onap.integration.actninterfacetools.actnclient.api.CustomerEthService; - import java.util.List; public interface EthSrv { diff --git a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/LtpId.java b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/LtpId.java index b526198..8d43e5b 100644 --- a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/LtpId.java +++ b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/LtpId.java @@ -37,8 +37,13 @@ public final class LtpId { } private LtpId(long number, String name) { + if(name.equals("MJI=")){ + this.name = "TUpJPQ=="; + }else{ + this.name = name; + } this.number = number; - this.name = name; + this.hasName = true; } @@ -49,6 +54,9 @@ public final class LtpId { public static LtpId ltpId(String string) { return new LtpId(UnsignedLongs.decode(string)); } + public static LtpId ltpId1(long number, String string) { + return new LtpId(number, string); + } public static LtpId ltpId(long number, String name) { return new LtpId(number, name); diff --git a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/OduResource.java b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/OduResource.java index 8557bb2..45a6a26 100644 --- a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/OduResource.java +++ b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/OduResource.java @@ -252,13 +252,13 @@ public class OduResource{ public byte[] getTribPortAvailabilityBitmap() { return tribPortAvailabilityBitmap == null ? null : Arrays.copyOf(tribPortAvailabilityBitmap, - tribPortAvailabilityBitmap.length); + tribPortAvailabilityBitmap.length); } public byte[] getTribSlotAvailabilityBitmap() { return tribSlotAvailabilityBitmap == null ? null : Arrays.copyOf(tribSlotAvailabilityBitmap, - tribSlotAvailabilityBitmap.length); + tribSlotAvailabilityBitmap.length); } @Override @@ -284,9 +284,9 @@ public class OduResource{ (this.odu4s == that.odu4s) && (this.oduFlex == that.oduFlex) && Arrays.equals(this.tribPortAvailabilityBitmap, - that.tribPortAvailabilityBitmap) && + that.tribPortAvailabilityBitmap) && Arrays.equals(this.tribSlotAvailabilityBitmap, - that.tribSlotAvailabilityBitmap); + that.tribSlotAvailabilityBitmap); } return false; } 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 + + '}'; + } } diff --git a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsEthSrv.java b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsEthSrv.java index 74ec498..bebbbb7 100644 --- a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsEthSrv.java +++ b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsEthSrv.java @@ -19,7 +19,7 @@ */ package org.onap.integration.actninterfacetools.sampleapp.mpiconverter.model; -import org.onap.integration.actninterfacetools.actnclient.api.CustomerEthService; +import org.onap.integration.actninterfacetools.globalapi.CustomerEthService; import java.util.List; @@ -31,6 +31,13 @@ public class TsEthSrv extends CustomerEthService implements EthSrv{ } @Override + public String toString() { + return "TsEthSrv{" + + "ethSrvInstances=" + ethSrvInstances + + '}'; + } + + @Override public List<EthSrvInstance> getEthSrvInstances(){ return this.ethSrvInstances; } diff --git a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsLink.java b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsLink.java index 8ae8209..55d166e 100644 --- a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsLink.java +++ b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsLink.java @@ -19,7 +19,7 @@ */ package org.onap.integration.actninterfacetools.sampleapp.mpiconverter.model; -import org.onap.integration.actninterfacetools.actnclient.api.CustomerOtnTunnel; +import org.onap.integration.actninterfacetools.globalapi.CustomerOtnTunnel; import java.util.List; import java.util.Objects; diff --git a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsTunnel.java b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsTunnel.java index f076a17..fe26846 100644 --- a/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsTunnel.java +++ b/sample-apps/src/main/java/org/onap/integration/actninterfacetools/sampleapp/mpiconverter/model/TsTunnel.java @@ -20,6 +20,8 @@ package org.onap.integration.actninterfacetools.sampleapp.mpiconverter.model; import com.google.common.collect.ImmutableList; +//import org.onlab.graph.ScalarWeight; +//import org.onlab.graph.Weight; import java.util.List; @@ -31,7 +33,7 @@ import static com.google.common.base.Preconditions.checkNotNull; public class TsTunnel extends TsLink { private final List<TsLink> links; -// private final Weight cost; + // private final Weight cost; private final String name; private OduResource bw = null; @@ -43,6 +45,7 @@ public class TsTunnel extends TsLink { this.name = name; } + // public TsTunnel(LTPoint srcLtPoint, LTPoint dstLtPoint){ // super(srcLtPoint, dstLtPoint); // this.links = null; @@ -60,7 +63,7 @@ public class TsTunnel extends TsLink { // return 0; // } -// public Weight weight() { + // public Weight weight() { // return cost; // } public String name() { @@ -69,7 +72,7 @@ public class TsTunnel extends TsLink { private static LTPoint source(List<TsLink> links) { checkNotNull(links, "List of path links cannot be null"); checkArgument(!links.isEmpty(), "List of path links cannot be null"); - return links.get(0).dst(); + return links.get(0).src(); } private static LTPoint destination(List<TsLink> links) { @@ -100,7 +103,7 @@ public class TsTunnel extends TsLink { final TsTunnel other = (TsTunnel) obj; return Objects.equals(this.links, other.links); } - return false; + return false; } public OduResource bw() { |