X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Futils%2FServiceDataUtils.java;h=b2980baeac62d9e5918582ec0cc9fac3578a069f;hb=d609ca3b1012e9d52ff6cd1ed9376425d22e6246;hp=99c65da5ddddeb2027e138c33c6850a3c94b103a;hpb=810038f95e82b0564c11ad5ba0f3f2813bc04a48;p=transportpce.git

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java
index 99c65da5d..b2980baea 100644
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java
@@ -8,6 +8,8 @@
 package org.opendaylight.transportpce.renderer.utils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.ServiceFormat;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.port.PortBuilder;
@@ -50,6 +52,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer
 
 public final class ServiceDataUtils {
 
+    private ServiceDataUtils() {
+
+    }
+
     public static Nodes createNode(String nodeId, String srcTp, String dstTp) {
         return new NodesBuilder().setNodeId(nodeId).withKey(new NodesKey(nodeId)).setSrcTp(srcTp)
                 .setDestTp(dstTp).build();
@@ -147,30 +153,43 @@ public final class ServiceDataUtils {
     public static PathDescription createPathDescriptionTerminationPointResource(String tpId) {
         List<AToZ> atoZList = new ArrayList<AToZ>();
         TerminationPointBuilder terminationPointBuilder = new TerminationPointBuilder();
-        TerminationPoint terminationPoint = terminationPointBuilder
-            .setTerminationPointIdentifier(new TerminationPointIdentifierBuilder().setNodeId("XPONDER-1-2")
-                .setTpId("XPONDER-1-2-" + tpId).build()).build();
-        TerminationPoint terminationPoint2 = terminationPointBuilder
-            .setTerminationPointIdentifier(new TerminationPointIdentifierBuilder().setNodeId("XPONDER-1-2")
-                .setTpId("XPONDER-1-2-" + tpId).build()).build();
-        AToZ atoZ = new AToZBuilder().setId("1").withKey(new AToZKey("1")).setResource(new ResourceBuilder()
-            .setResource(terminationPoint).build()).build();
-        AToZ atoZ2 = new AToZBuilder().setId("2").withKey(new AToZKey("2")).setResource(new ResourceBuilder()
-            .setResource(terminationPoint2).build()).build();
-        atoZList.add(atoZ);
-        atoZList.add(atoZ2);
+        List<String> nodeIds = Arrays.asList("XPONDER-1-2", "XPONDER-2-3");
+        Integer atozId = 1;
+        for (String nodeId : nodeIds) {
+            for (String otherNodeId : nodeIds) {
+                TerminationPoint terminationPoint = terminationPointBuilder
+                    .setTerminationPointIdentifier(new TerminationPointIdentifierBuilder().setNodeId(nodeId)
+                        .setTpId((nodeId.equals(otherNodeId) ? "" : nodeId + "-") + otherNodeId + "-" + tpId).build())
+                    .build();
+                AToZ atoZ = new AToZBuilder().setId(atozId.toString())
+                    .withKey(new AToZKey(atozId.toString())).setResource(new ResourceBuilder()
+                        .setResource(terminationPoint).build()).build();
+                atozId++;
+                atoZList.add(atoZ);
+            }
+        }
         AToZDirection atozDirection = new AToZDirectionBuilder()
             .setRate(20L)
             .setAToZWavelengthNumber(20L)
             .setAToZ(atoZList)
             .build();
+
+        Collections.reverse(nodeIds);
         List<ZToA> ztoAList = new ArrayList<ZToA>();
-        ZToA ztoA = new ZToABuilder().setId("1").withKey(new ZToAKey("1")).setResource(new ResourceBuilder()
-            .setResource(terminationPoint).build()).build();
-        ZToA ztoA2 = new ZToABuilder().setId("2").withKey(new ZToAKey("2")).setResource(new ResourceBuilder()
-            .setResource(terminationPoint).build()).build();
-        ztoAList.add(ztoA);
-        ztoAList.add(ztoA2);
+        Integer ztoaId = 1;
+        for (String nodeId : nodeIds) {
+            for (String otherNodeId : nodeIds) {
+                TerminationPoint terminationPoint = terminationPointBuilder
+                    .setTerminationPointIdentifier(new TerminationPointIdentifierBuilder().setNodeId(nodeId)
+                        .setTpId((nodeId.equals(otherNodeId) ? "" : nodeId + "-") + otherNodeId + "-" + tpId).build())
+                    .build();
+                ZToA ztoA = new ZToABuilder().setId(ztoaId.toString())
+                    .withKey(new ZToAKey(ztoaId.toString())).setResource(new ResourceBuilder()
+                        .setResource(terminationPoint).build()).build();
+                ztoaId++;
+                ztoAList.add(ztoA);
+            }
+        }
         ZToADirection ztoaDirection = new ZToADirectionBuilder()
             .setRate(20L)
             .setZToAWavelengthNumber(20L)
@@ -238,7 +257,7 @@ public final class ServiceDataUtils {
 
     public static ServiceZEndBuilder getServiceZEndBuild() {
         return new ServiceZEndBuilder()
-            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1).setNodeId("XPONDER-1-2")
+            .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1).setNodeId("XPONDER-2-3")
             .setTxDirection(
                 new TxDirectionBuilder()
                     .setPort(new PortBuilder().setPortDeviceName("device name").setPortName("port name")
@@ -253,7 +272,4 @@ public final class ServiceDataUtils {
                     .build());
     }
 
-    private ServiceDataUtils() {
-    }
-
 }