improve test cases in PCE contraints

[transportpce.git] / pce / src / test / java / org / opendaylight / transportpce / pce / utils / PceTestData.java

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java
index 3c78abc58d1276a98f1827dc11872593adfce77f..8aa64753e520a14bcb0e4064ebdd8edf8ccafa75 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java
@@ -40,6 +40,7 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.co.routing.or.general.general.include_.OrderedHopsBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.diversity.existing.service.contraints.sp.ExistingServiceApplicability;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.diversity.existing.service.contraints.sp.ExistingServiceApplicabilityBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.ordered.constraints.sp.HopTypeBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.HardConstraints;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.HardConstraintsBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.SoftConstraints;
@@ -54,7 +55,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.handler.header.ServiceHandlerHeaderBuilder;
 
 
-
 public final class PceTestData {
 
     private PceTestData() {
@@ -409,20 +409,18 @@ public final class PceTestData {
                 .setServiceZEnd(serviceZEnd)
                 .setHardConstraints(new HardConstraintsBuilder()
                         .setCoRoutingOrGeneral(new GeneralBuilder()
-                                .setExclude(new ExcludeBuilder()
-                                        .setNodeId(Arrays.asList("OpenROADM-2-2"))
-                                        .build())
-                                .setLatency(new LatencyBuilder()
-                                        .setMaxLatency(3223L).build())
-                                .setInclude(new IncludeBuilder()
-                                        .setOrderedHops(
-                                                Arrays.asList(new OrderedHopsBuilder()
-                                                        .setHopNumber(22)
-                                                        // .setHopType(new HopTypeBuilder()
-                                                        // .setHopType(new ClliBuilder().getClli())
-                                                        .build()))
-                                        .build())
-                                .build())
+                                  .setExclude(new ExcludeBuilder()
+                                          .setNodeId(Arrays.asList("OpenROADM-2-2"))
+                                          .build())
+                                  .setLatency(new LatencyBuilder().setMaxLatency(3223L).build())
+                                  .setInclude(new IncludeBuilder()
+                                          .setOrderedHops(Arrays.asList(new OrderedHopsBuilder()
+                                                  .setHopNumber(22)
+                                                  .setHopType(new HopTypeBuilder()
+                                                          .setHopType(new HopTypeBuilder().getHopType()).build())
+                                                  .build()))
+                                          .build())
+                                  .build())
                         .build())
                 .build();
         return input;
@@ -656,6 +654,8 @@ public final class PceTestData {
                 .setServiceZEnd(serviceZEnd)
                 .setHardConstraints(new HardConstraintsBuilder()
                         .setCoRoutingOrGeneral(new GeneralBuilder()
+                                .setLatency(new LatencyBuilder()
+                                        .setMaxLatency(3223L).build())
                                 .setDiversity(new DiversityBuilder()
                                         .setExistingService(Arrays.asList(base.getServiceName()))
                                         .setExistingServiceApplicability(nodeTrue)