Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Manage OTN links at 400G
[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 30457ecdae6c463763b88cae75900fe37bd61995..6bafebb88611d41d696e9b0a8d5267a1f9e2a1c0 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
@@
-87,14
+87,8
@@
public final class NetworkmodelTestUtil {
}
public static List<Link> createSuppOTNLinks(OtnLinkType type, Uint32 availBW) {
}
public static List<Link> createSuppOTNLinks(OtnLinkType type, Uint32 availBW) {
- String prefix = null;
- if (OtnLinkType.OTU4.equals(type)) {
- prefix = "OTU4-";
- } else if (OtnLinkType.ODTU4.equals(type)) {
- prefix = "ODU4-";
- }
Link linkAZ = new LinkBuilder()
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())
.setSource(new SourceBuilder()
.setSourceNode(new NodeId("SPDRA-XPDR1"))
.setSourceTp("XPDR1-NETWORK1").build())
@@
-104,7
+98,8
@@
public final class NetworkmodelTestUtil {
.addAugmentation(
new Link1Builder()
.setLinkType(OpenroadmLinkType.OTNLINK)
.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.rev200529.Link1Builder()
.build())
.addAugmentation(
new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder()
@@
-117,7
+112,7
@@
public final class NetworkmodelTestUtil {
.build())
.build();
Link linkZA = new LinkBuilder()
.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())
.setSource(new SourceBuilder()
.setSourceNode(new NodeId("SPDRZ-XPDR1"))
.setSourceTp("XPDR1-NETWORK1").build())
@@
-127,7
+122,8
@@
public final class NetworkmodelTestUtil {
.addAugmentation(
new Link1Builder()
.setLinkType(OpenroadmLinkType.OTNLINK)
.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.rev200529.Link1Builder()
.build())
.addAugmentation(
new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev200529.Link1Builder()