X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Futils%2FPceTestData.java;h=8aa64753e520a14bcb0e4064ebdd8edf8ccafa75;hb=43a4ee16c3edd94339947da89a1a7c7c730a0185;hp=3c78abc58d1276a98f1827dc11872593adfce77f;hpb=93e2068ee8a54727284d2f19004c6a4a23899275;p=transportpce.git 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 3c78abc58..8aa64753e 100644 --- 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)