Refactor transportpce-routing-constraint model

[transportpce.git] / renderer / src / test / java / org / opendaylight / transportpce / renderer / utils / ServiceDataUtils.java

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 23026431bdbf2e72470c9d081f456fbb42a3bd51..51dd2205e0414eb760b4780ddb864aa40bb7e42c 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java
@@ -38,15 +38,11 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToABuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToAKey;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.ResourceBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.Link;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.LinkBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.Node;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.NodeBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPoint;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPointBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.handler.header.ServiceHandlerHeaderBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.RxDirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.TxDirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.handler.header.ServiceHandlerHeaderBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.optical.renderer.nodes.Nodes;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.optical.renderer.nodes.NodesBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.optical.renderer.nodes.NodesKey;
@@ -56,7 +52,6 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 public final class ServiceDataUtils {
 
     private ServiceDataUtils() {
-
     }
 
     public static Nodes createNode(String nodeId, String srcTp, String dstTp) {
@@ -97,50 +92,6 @@ public final class ServiceDataUtils {
         return builder.build();
     }
 
-    /*public static ServiceImplementationRequestInput buildServiceImplementationRequestInputInvalidResource() {
-        ServiceImplementationRequestInputBuilder builder = new ServiceImplementationRequestInputBuilder()
-            .setServiceName("service 1").setPathDescription(createPathDescriptionInvalidResource())
-            .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder().setRequestId("Request 1").build())
-            .setServiceAEnd(getServiceAEndBuild().build())
-            .setServiceZEnd(getServiceZEndBuild().build());
-        return builder.build();
-    }
-
-    public static ServiceImplementationRequestInput buildServiceImplementationRequestInputLinkResource() {
-        ServiceImplementationRequestInputBuilder builder = new ServiceImplementationRequestInputBuilder()
-            .setServiceName("service 1").setPathDescription(createPathDescriptionLinkResource())
-            .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder().setRequestId("Request 1").build())
-            .setServiceAEnd(getServiceAEndBuild().build())
-            .setServiceZEnd(getServiceZEndBuild().build());
-        return builder.build();
-    }*/
-
-    private static PathDescription createPathDescriptionInvalidResource() {
-        Map<AToZKey,AToZ> atoZMap = new HashMap<>();
-        Node node = new NodeBuilder().setNodeId("XPONDER-1-2").build();
-        AToZ atoZ = new AToZBuilder().setId("1").withKey(new AToZKey("1")).setResource(new ResourceBuilder()
-            .setResource(node).build()).build();
-        atoZMap.put(atoZ.key(),atoZ);
-        AToZDirection atozDirection = new AToZDirectionBuilder()
-            .setRate(Uint32.valueOf(20))
-            .setAToZWavelengthNumber(Uint32.valueOf(32))
-            .setAToZ(atoZMap)
-            .build();
-        Map<ZToAKey,ZToA> ztoAMap = new HashMap<>();
-        ZToA ztoA = new ZToABuilder().setId("1").withKey(new ZToAKey("1")).setResource(new ResourceBuilder()
-            .setResource(node).build()).build();
-        ztoAMap.put(ztoA.key(),ztoA);
-        ZToADirection ztoaDirection = new ZToADirectionBuilder()
-            .setRate(Uint32.valueOf(20))
-            .setZToAWavelengthNumber(Uint32.valueOf(20))
-            .setZToA(ztoAMap)
-            .build();
-        PathDescriptionBuilder builder = new PathDescriptionBuilder()
-            .setAToZDirection(atozDirection)
-            .setZToADirection(ztoaDirection);
-        return builder.build();
-    }
-
     public static PathDescription createPathDescriptionTerminationPointResource(String tpId) {
         Map<AToZKey,AToZ> atoZMap = new HashMap<>();
         TerminationPointBuilder terminationPointBuilder = new TerminationPointBuilder();
@@ -159,7 +110,6 @@ public final class ServiceDataUtils {
                 atoZMap.put(atoZ.key(),atoZ);
             }
         }
-        FrequencyTHz value;
         AToZDirection atozDirection = new AToZDirectionBuilder()
             .setRate(Uint32.valueOf(20))
             .setAToZWavelengthNumber(Uint32.valueOf(20))
@@ -197,39 +147,6 @@ public final class ServiceDataUtils {
         return builder.build();
     }
 
-    private static PathDescription createPathDescriptionLinkResource() {
-        Map<AToZKey,AToZ> atoZMap = new HashMap<>();
-        Link link1 = new LinkBuilder().setLinkId("link 1").build();
-        Link link2 = new LinkBuilder().setLinkId("link 2").build();
-        AToZ atoZ = new AToZBuilder().setId("1").withKey(new AToZKey("1")).setResource(new ResourceBuilder()
-            .setResource(link1).build()).build();
-        AToZ atoZ2 = new AToZBuilder().setId("1").withKey(new AToZKey("1")).setResource(new ResourceBuilder()
-            .setResource(link2).build()).build();
-        atoZMap.put(atoZ.key(),atoZ);
-        atoZMap.put(atoZ2.key(),atoZ2);
-        AToZDirection atozDirection = new AToZDirectionBuilder()
-            .setRate(Uint32.valueOf(20))
-            .setAToZWavelengthNumber(Uint32.valueOf(20))
-            .setAToZ(atoZMap)
-            .build();
-        Map<ZToAKey,ZToA> ztoAMap = new HashMap<>();
-        ZToA ztoA = new ZToABuilder().setId("1").withKey(new ZToAKey("1")).setResource(new ResourceBuilder()
-            .setResource(link1).build()).build();
-        ZToA ztoA2 = new ZToABuilder().setId("1").withKey(new ZToAKey("1")).setResource(new ResourceBuilder()
-            .setResource(link2).build()).build();
-        ztoAMap.put(ztoA.key(),ztoA);
-        ztoAMap.put(ztoA2.key(),ztoA2);
-        ZToADirection ztoaDirection = new ZToADirectionBuilder()
-            .setRate(Uint32.valueOf(20))
-            .setZToAWavelengthNumber(Uint32.valueOf(20))
-            .setZToA(ztoAMap)
-            .build();
-        PathDescriptionBuilder builder = new PathDescriptionBuilder()
-            .setAToZDirection(atozDirection)
-            .setZToADirection(ztoaDirection);
-        return builder.build();
-    }
-
     public static ServiceAEndBuilder getServiceAEndBuild(String tpId) {
         return new ServiceAEndBuilder()
             .setClli("clli").setServiceFormat(ServiceFormat.OC)
@@ -269,5 +186,4 @@ public final class ServiceDataUtils {
                         .setPortSubSlot("port subslot").setPortType("port type").build())
                     .build());
     }
-
 }