Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Upgrade openroadm service models to 10.1
[transportpce.git] / servicehandler / src / test / java / org / opendaylight / transportpce / servicehandler / utils / ConstraintsUtils.java
diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ConstraintsUtils.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ConstraintsUtils.java
index 62078948f35c1df950133c38101af4f4fb585898..93d622cd82e755019fb5997e52ed9d8982d1940d 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ConstraintsUtils.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ConstraintsUtils.java
@@ -9,19 +9,16 @@ package org.opendaylight.transportpce.servicehandler.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.node.types.rev181130.NodeIdType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.CoRoutingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.GeneralBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.general.DiversityBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.general.ExcludeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.general.IncludeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.constraints.co.routing.or.general.general.LatencyBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.diversity.existing.service.constraints.ExistingServiceApplicabilityBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.HardConstraints;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.HardConstraintsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.SoftConstraints;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.SoftConstraintsBuilder;
-import org.opendaylight.yangtools.yang.common.Uint32;
+import java.util.Map;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.CoRoutingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co.routing.ServiceIdentifierList;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co.routing.ServiceIdentifierListBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.equipment.EquipmentBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.HardConstraints;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.HardConstraintsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.SoftConstraints;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.SoftConstraintsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.service.applicability.g.ServiceApplicabilityBuilder;
 
 /**
  * Utility Class to Build Hard Constraints and Soft Constraints.
@@ -36,96 +33,36 @@ public final class ConstraintsUtils {
     }
 
     public static SoftConstraints buildSoftConstraintWithCoRouting() {
-        return new SoftConstraintsBuilder()
-                .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                    .setCoRouting(new org.opendaylight.yang.gen.v1.http.org.openroadm.routing
-                        .constrains.rev190329.constraints.co.routing.or.general.co.routing
-                        .CoRoutingBuilder().setExistingService(
-                            new ArrayList<>(Collections.singletonList("existing-service 1"))).build())
+        ServiceIdentifierList sil = new ServiceIdentifierListBuilder()
+            .setServiceIdentifier("service-id-soft")
+            .setServiceApplicability(new ServiceApplicabilityBuilder()
+                .setEquipment(new EquipmentBuilder()
+                    .setRoadmSrg(true)
                     .build())
-                .setCustomerCode(new ArrayList<>(Collections.singletonList("customer-code 1")))
-                .build();
+                .build())
+            .build();
+        return new SoftConstraintsBuilder()
+            .setCustomerCode(new ArrayList<>(Collections.singletonList("customer-code 1")))
+            .setCoRouting(new CoRoutingBuilder()
+                .setServiceIdentifierList(Map.of(sil.key(), sil))
+                .build())
+            .build();
     }
 
     public static HardConstraints buildHardConstraintWithCoRouting() {
-        return new HardConstraintsBuilder()
-                .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                    .setCoRouting(new org.opendaylight.yang.gen.v1.http.org.openroadm.routing
-                        .constrains.rev190329.constraints.co.routing.or.general.co.routing
-                        .CoRoutingBuilder().setExistingService(
-                            new ArrayList<>(Collections.singletonList("existing-service 1"))).build())
-                    .build())
-                .setCustomerCode(new ArrayList<>(Collections.singletonList("customer-code 1")))
-                .build();
-    }
-
-    public static HardConstraints buildHardConstraintWithGeneral() {
-        return new HardConstraintsBuilder()
-                .setCoRoutingOrGeneral(new GeneralBuilder()
-                    .setExclude(new ExcludeBuilder()
-                        .setNodeId(
-                            new ArrayList<>(Collections.singletonList(new NodeIdType("Ex-Node-Id-1"))))
-                        .setFiberBundle(
-                            new ArrayList<>(Collections.singletonList("Ex-Fiber-Bundle 1")))
-                        .setSite(
-                            new ArrayList<>(Collections.singletonList("Ex-site 1")))
-                        .setSupportingServiceName(
-                            new ArrayList<>(Collections.singletonList("Ex-supporting-Service 1")))
-                                .build())
-                    .setInclude(new IncludeBuilder()
-                        .setNodeId(
-                            new ArrayList<>(Collections.singletonList(new NodeIdType("Inc-Node-Id-1"))))
-                        .setFiberBundle(
-                            new ArrayList<>(Collections.singletonList("Inc-Fiber-Bundle 1")))
-                        .setSite(new ArrayList<>(Collections.singletonList("Inc-site 1")))
-                        .setSupportingServiceName(
-                            new ArrayList<>(Collections.singletonList("Inc-supporting-Service-name 1")))
-                        .build())
-                    .setDiversity(new DiversityBuilder()
-                        .setExistingService(
-                            new ArrayList<>(Collections.singletonList("div-existing-service 1")))
-                        .setExistingServiceApplicability(new ExistingServiceApplicabilityBuilder()
-                            .setNode(Boolean.TRUE)
-                            .setSite(Boolean.TRUE)
-                            .setSrlg(Boolean.TRUE)
-                            .build())
-                        .build())
-                    .setLatency(new LatencyBuilder().setMaxLatency(Uint32.valueOf(1)).build())
+        ServiceIdentifierList sil = new ServiceIdentifierListBuilder()
+            .setServiceIdentifier("service-id-hard")
+            .setServiceApplicability(new ServiceApplicabilityBuilder()
+                .setEquipment(new EquipmentBuilder()
+                    .setRoadmSrg(true)
                     .build())
-                .setCustomerCode(new ArrayList<>(Collections.singletonList("customer-code 1")))
-                .build();
-    }
-
-    public static HardConstraints buildHardConstraintWithNullGeneral() {
+                .build())
+            .build();
         return new HardConstraintsBuilder()
-                .setCoRoutingOrGeneral(null)
-                .setCustomerCode(new ArrayList<>(Collections.singletonList("customer-code 1")))
-                .build();
-    }
-
-    public static SoftConstraints buildSoftConstraintWithGeneral() {
-        return new SoftConstraintsBuilder()
-                .setCoRoutingOrGeneral(new GeneralBuilder()
-                    .setExclude(new ExcludeBuilder()
-                        .setNodeId(new ArrayList<>())
-                        .setFiberBundle(new ArrayList<>())
-                        .setSite(new ArrayList<>())
-                        .setSupportingServiceName(new ArrayList<>())
-                        .build())
-                    .setInclude(new IncludeBuilder()
-                        .setNodeId(new ArrayList<>())
-                        .setFiberBundle(new ArrayList<>())
-                        .setSite(new ArrayList<>())
-                        .setSupportingServiceName(new ArrayList<>())
-                        .build())
-                    .setDiversity(new DiversityBuilder()
-                        .setExistingService(new ArrayList<>())
-                        .setExistingServiceApplicability(new ExistingServiceApplicabilityBuilder()
-                            .build())
-                        .build())
-                    .build())
-                .setCustomerCode(new ArrayList<>(Collections.singletonList("customer-code 1")))
-                .build();
-
+            .setCustomerCode(new ArrayList<>(Collections.singletonList("customer-code 1")))
+            .setCoRouting(new CoRoutingBuilder()
+                .setServiceIdentifierList(Map.of(sil.key(), sil))
+                .build())
+            .build();
     }
 }
Repository for Transport PCE project.