X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2FPceSendingPceRPCs.java;h=7f3ce50a06968ad7bad26f95c326979d7eb101d3;hb=2a29f9ab006d8806f77b1a1e073b478e5351cc5f;hp=e8f0f9aaca300146f0baf8b2b4773e3284c8d218;hpb=442088b23f7f20667badfa66759c15d48ee28605;p=transportpce.git diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java old mode 100755 new mode 100644 index e8f0f9aac..7f3ce50a0 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java @@ -9,21 +9,22 @@ package org.opendaylight.transportpce.pce; import org.opendaylight.transportpce.common.ResponseCodes; +import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.transportpce.pce.constraints.PceConstraintsCalc; -import org.opendaylight.transportpce.pce.gnpy.ConnectToGnpyServer; import org.opendaylight.transportpce.pce.gnpy.GnpyException; import org.opendaylight.transportpce.pce.gnpy.GnpyResult; import org.opendaylight.transportpce.pce.gnpy.GnpyUtilitiesImpl; +import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumer; import org.opendaylight.transportpce.pce.graph.PceGraph; import org.opendaylight.transportpce.pce.networkanalyzer.PceCalculation; import org.opendaylight.transportpce.pce.networkanalyzer.PceResult; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.service.path.rpc.result.PathDescriptionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.AToZDirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ZToADirection; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.service.path.rpc.result.PathDescriptionBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.AToZDirection; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.ZToADirection; 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.routing.constraints.sp.HardConstraints; import org.slf4j.Logger; @@ -58,20 +59,25 @@ public class PceSendingPceRPCs { private Boolean success; private String message; private String responseCode; + private final GnpyConsumer gnpyConsumer; + private PortMapping portMapping; - public PceSendingPceRPCs() { + public PceSendingPceRPCs(GnpyConsumer gnpyConsumer) { setPathDescription(null); this.input = null; this.networkTransaction = null; + this.gnpyConsumer = gnpyConsumer; } public PceSendingPceRPCs(PathComputationRequestInput input, - NetworkTransactionService networkTransaction) { + NetworkTransactionService networkTransaction, GnpyConsumer gnpyConsumer, PortMapping portMapping) { + this.gnpyConsumer = gnpyConsumer; setPathDescription(null); // TODO compliance check to check that input is not empty this.input = input; this.networkTransaction = networkTransaction; + this.portMapping = portMapping; } public void cancelResourceReserve() { @@ -81,7 +87,7 @@ public class PceSendingPceRPCs { // sleep for 10s Thread.sleep(10000); } catch (InterruptedException e) { - LOG.error(e.toString()); + LOG.error("in PCESendingPceRPC: ",e); } success = true; LOG.info("cancelResourceReserve ..."); @@ -90,17 +96,17 @@ public class PceSendingPceRPCs { public void pathComputationWithConstraints(PceConstraints hardConstraints, PceConstraints softConstraints) { PceCalculation nwAnalizer = - new PceCalculation(input, networkTransaction, hardConstraints, softConstraints, rc); + new PceCalculation(input, networkTransaction, hardConstraints, softConstraints, rc, portMapping); nwAnalizer.retrievePceNetwork(); rc = nwAnalizer.getReturnStructure(); + String serviceType = nwAnalizer.getServiceType(); if (!rc.getStatus()) { - LOG.error("In pathComputationWithConstraints, nwAnalizer: result = {}", rc.toString()); + LOG.error("In pathComputationWithConstraints, nwAnalizer: result = {}", rc); return; } LOG.info("PceGraph ..."); - PceGraph graph = new PceGraph(nwAnalizer.getaendPceNode(), - nwAnalizer.getzendPceNode(), nwAnalizer.getAllPceNodes(), - hardConstraints, softConstraints, rc); + PceGraph graph = new PceGraph(nwAnalizer.getaendPceNode(), nwAnalizer.getzendPceNode(), + nwAnalizer.getAllPceNodes(), hardConstraints, softConstraints, rc, serviceType); graph.calcPath(); rc = graph.getReturnStructure(); if (!rc.getStatus()) { @@ -119,7 +125,7 @@ public class PceSendingPceRPCs { } if (!rc.getStatus()) { - LOG.error("In pathComputationWithConstraints, graph.calcPath: result = {}", rc.toString()); + LOG.error("In pathComputationWithConstraints, graph.calcPath: result = {}", rc); return; } } @@ -128,8 +134,7 @@ public class PceSendingPceRPCs { description.buildDescriptions(); rc = description.getReturnStructure(); if (!rc.getStatus()) { - LOG.error("In pathComputationWithConstraints, description: result = {}", rc.toString()); - return; + LOG.error("In pathComputationWithConstraints, description: result = {}", rc); } } @@ -152,9 +157,9 @@ public class PceSendingPceRPCs { //Connect to Gnpy to check path feasibility and recompute another path in case of path non-feasibility try { - ConnectToGnpyServer connectToGnpy = new ConnectToGnpyServer(); - if (connectToGnpy.isGnpyURLExist()) { - GnpyUtilitiesImpl gnpy = new GnpyUtilitiesImpl(networkTransaction, input); + if (gnpyConsumer.isAvailable()) { + GnpyUtilitiesImpl gnpy = new GnpyUtilitiesImpl(networkTransaction, input, + gnpyConsumer); if (rc.getStatus() && gnpyToCheckFeasiblity(atoz,ztoa,gnpy)) { setPathDescription(new PathDescriptionBuilder().setAToZDirection(atoz).setZToADirection(ztoa)); return; @@ -162,19 +167,16 @@ public class PceSendingPceRPCs { callGnpyToComputeNewPath(gnpy); } else { setPathDescription(new PathDescriptionBuilder().setAToZDirection(atoz).setZToADirection(ztoa)); - return; } } catch (GnpyException e) { LOG.error("Exception raised by GNPy {}",e.getMessage()); setPathDescription(new PathDescriptionBuilder().setAToZDirection(atoz).setZToADirection(ztoa)); - return; } - return; } private boolean gnpyToCheckFeasiblity(AToZDirection atoz, ZToADirection ztoa, GnpyUtilitiesImpl gnpy) - throws GnpyException, Exception { + throws GnpyException { //Call GNPy for path verification if (gnpy.verifyComputationByGnpy(atoz, ztoa, pceHardConstraints)) { @@ -186,12 +188,12 @@ public class PceSendingPceRPCs { return false; } - private void callGnpyToComputeNewPath(GnpyUtilitiesImpl gnpy) throws GnpyException, Exception { + private void callGnpyToComputeNewPath(GnpyUtilitiesImpl gnpy) throws GnpyException { //Call GNPy in the case of non feasibility LOG.info("In pceSendingPceRPC: the path is not feasible according to Gnpy"); HardConstraints gnpyPathAsHC = null; - gnpyPathAsHC = gnpy.askNewPathFromGnpy(gnpyPathAsHC, pceHardConstraints); + gnpyPathAsHC = gnpy.askNewPathFromGnpy(pceHardConstraints); if (gnpyPathAsHC == null) { LOG.info("In pceSendingPceRPC: GNPy failed to find another path"); this.success = false;