package org.opendaylight.transportpce.pce.constraints;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
-
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.transportpce.common.Timeouts;
import org.opendaylight.transportpce.common.network.NetworkTransactionService;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.PathDescription;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.atoz.direction.AToZ;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.Link;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.Node;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestInput;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.PathDescription;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZ;
+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.Node;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.RoutingConstraintsSp.PceMetric;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.CoRoutingOrGeneral;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.constraints.sp.co.routing.or.general.CoRouting;
public class PceConstraintsCalc {
/* Logging. */
private static final Logger LOG = LoggerFactory.getLogger(PceConstraintsCalc.class);
+ private static final Comparator<OrderedHops> ORDERED_HOP_COMPARATOR =
+ Comparator.comparing(OrderedHops::getHopNumber);
private PceConstraints pceHardConstraints = new PceConstraints();
private PceConstraints pceSoftConstraints = new PceConstraints();
Include include = tmpGeneral.getInclude();
if (include != null) {
- List<OrderedHops> listHops = include.getOrderedHops();
+ List<OrderedHops> listHops = new ArrayList<>(include.nonnullOrderedHops().values());
if (listHops != null) {
readIncludeNodes(listHops, constraints);
}
if (temp == null) {
return;
}
- if (Boolean.TRUE.equals(temp.isNode())) {
+ if (Boolean.TRUE.equals(temp.getNode())) {
rt = PceConstraints.ResourceType.NODE;
}
- if (Boolean.TRUE.equals(temp.isSrlg())) {
+ if (Boolean.TRUE.equals(temp.getSrlg())) {
rt = PceConstraints.ResourceType.SRLG;
}
- if (Boolean.TRUE.equals(temp.isClli())) {
+ if (Boolean.TRUE.equals(temp.getClli())) {
rt = PceConstraints.ResourceType.CLLI;
}
LOG.info("in readGeneralContrains {} list is :{}", rt, diversity);
}
private void readIncludeNodes(List<OrderedHops> listHops, PceConstraints constraints) {
+ Collections.sort(listHops, ORDERED_HOP_COMPARATOR);
for (int i = 0; i < listHops.size(); i++) {
HopType hoptype = listHops.get(i).getHopType().getHopType();
}
private List<String> getAToZNodeList(PathDescription pathDescription) {
- List<AToZ> aendToZList = pathDescription.getAToZDirection().getAToZ();
+ List<AToZ> aendToZList = new ArrayList<>(pathDescription.getAToZDirection().nonnullAToZ().values());
return aendToZList.stream().filter(aToZ -> {
if (aToZ.getResource() == null || aToZ.getResource().getResource() == null) {
LOG.warn("Diversity constraint: Resource of AToZ node {} is null! Skipping this node!", aToZ.getId());
}
private List<String> getSRLGList(PathDescription pathDescription) {
- List<AToZ> aendToZList = pathDescription.getAToZDirection().getAToZ();
+ List<AToZ> aendToZList = new ArrayList<>(pathDescription.getAToZDirection().nonnullAToZ().values());
return aendToZList.stream().filter(aToZ -> {
if (aToZ.getResource() == null
|| aToZ.getResource().getResource() == null) {