X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fgnpy%2FGnpyUtilitiesImpl.java;h=4aad49b75f4f6c62d80694b44ee72942fa4f074e;hb=bc9a08be9d7cdeb30ecffd3c82ddd656a3a23043;hp=42541b749028b46a3729aef89948fdb7ec7b225e;hpb=e6f1b3acce76396e50731b0c97b07c36dca7224d;p=transportpce.git diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java index 42541b749..4aad49b75 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImpl.java @@ -8,8 +8,10 @@ package org.opendaylight.transportpce.pce.gnpy; +import java.util.ArrayList; import java.util.List; - +import java.util.stream.Collectors; +import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.GnpyApi; @@ -18,13 +20,13 @@ import org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.gnpy.api.ServiceFile import org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.gnpy.api.TopologyFileBuilder; import org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.topo.Connections; import org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.topo.Elements; -import org.opendaylight.yang.gen.v1.gnpy.path.rev200202.generic.path.properties.path.properties.PathRouteObjects; -import org.opendaylight.yang.gen.v1.gnpy.path.rev200202.service.PathRequest; -import org.opendaylight.yang.gen.v1.gnpy.path.rev200202.synchronization.info.Synchronization; +import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.generic.path.properties.path.properties.PathRouteObjects; +import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.service.PathRequest; +import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.synchronization.info.Synchronization; 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.path.description.AToZDirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.AToZDirectionBuilder; -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.transportpce.b.c._interface.pathdescription.rev200629.path.description.AToZDirection; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.AToZDirectionBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.ZToADirection; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.routing.constraints.sp.HardConstraints; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint32; @@ -41,26 +43,27 @@ import org.slf4j.LoggerFactory; public class GnpyUtilitiesImpl { private static final Logger LOG = LoggerFactory.getLogger(GnpyUtilitiesImpl.class); - private NetworkTransactionService networkTransaction; private PathComputationRequestInput input; private GnpyTopoImpl gnpyTopo = null; private GnpyResult gnpyAtoZ; private GnpyResult gnpyZtoA; private Uint32 requestId; + private BindingDOMCodecServices bindingDOMCodecServices; - public GnpyUtilitiesImpl(NetworkTransactionService networkTransaction, PathComputationRequestInput input) - throws GnpyException { - this.networkTransaction = networkTransaction; + public GnpyUtilitiesImpl(NetworkTransactionService networkTransaction, PathComputationRequestInput input, + BindingDOMCodecServices bindingDOMCodecServices) + throws GnpyException { this.gnpyTopo = new GnpyTopoImpl(networkTransaction); this.input = input; this.gnpyAtoZ = null; this.gnpyZtoA = null; this.requestId = Uint32.valueOf(0); + this.bindingDOMCodecServices = bindingDOMCodecServices; } public boolean verifyComputationByGnpy(AToZDirection atoz, ZToADirection ztoa, PceConstraints pceHardConstraints) - throws GnpyException, Exception { + throws GnpyException { if (atoz == null || atoz.getAToZ() == null || ztoa == null || ztoa.getZToA() == null) { throw new GnpyException("In GnpyUtilities: the path transmitted to Gnpy is null"); @@ -76,30 +79,35 @@ public class GnpyUtilitiesImpl { return isPcePathFeasible; } - public GnpyResult gnpyResponseOneDirection(GnpyServiceImpl gnpySvc) throws GnpyException, Exception { + @SuppressWarnings("checkstyle:illegalcatch") + public GnpyResult gnpyResponseOneDirection(GnpyServiceImpl gnpySvc) throws GnpyException { requestId = Uint32.valueOf((requestId.toJava()) + 1); - List pathRequestList = gnpySvc.getPathRequest(); + List pathRequestList = new ArrayList<>(gnpySvc.getPathRequest().values()); List synchronizationList = gnpySvc.getSynchronization(); // Send the computed path to GNPY tool - List elementsList = gnpyTopo.getElements(); + List elementsList = new ArrayList<>(gnpyTopo.getElements().values()); List connectionsList = gnpyTopo.getConnections(); - String gnpyResponse = getGnpyResponse(elementsList, connectionsList, pathRequestList, - synchronizationList); + String gnpyResponse; + try { + gnpyResponse = getGnpyResponse(elementsList, connectionsList, pathRequestList, + synchronizationList); + } catch (Exception e) { + throw new GnpyException("Something went wrong", e); + } // Analyze the response if (gnpyResponse == null) { throw new GnpyException("In GnpyUtilities: no response from GNPy server"); } - GnpyResult result = new GnpyResult(gnpyResponse, gnpyTopo); + GnpyResult result = new GnpyResult(gnpyResponse, gnpyTopo, bindingDOMCodecServices); result.analyzeResult(); return result; } public HardConstraints askNewPathFromGnpy(PceConstraints pceHardConstraints) - throws GnpyException, Exception { + throws GnpyException { AToZDirection atoztmp = new AToZDirectionBuilder() .setRate(input.getServiceAEnd().getServiceRate()) - .setAToZ(null) .build(); GnpyServiceImpl gnpySvc = new GnpyServiceImpl(input, atoztmp, requestId, gnpyTopo, pceHardConstraints); GnpyResult result = gnpyResponseOneDirection(gnpySvc); @@ -116,16 +124,22 @@ public class GnpyUtilitiesImpl { } public String getGnpyResponse(List elementsList, List connectionsList, - List pathRequestList, List synchronizationList) throws GnpyException, Exception { + List pathRequestList, List synchronizationList) + throws GnpyException { GnpyApi gnpyApi = new GnpyApiBuilder() .setTopologyFile( - new TopologyFileBuilder().setElements(elementsList).setConnections(connectionsList).build()) + new TopologyFileBuilder() + .setElements(elementsList.stream().collect(Collectors.toMap(Elements::key, element -> element))) + .setConnections(connectionsList).build()) .setServiceFile( - new ServiceFileBuilder().setPathRequest(pathRequestList).build()) + new ServiceFileBuilder() + .setPathRequest(pathRequestList.stream() + .collect(Collectors.toMap(PathRequest::key, pathRequest -> pathRequest))) + .build()) .build(); InstanceIdentifier idGnpyApi = InstanceIdentifier.builder(GnpyApi.class).build(); String gnpyJson; - ServiceDataStoreOperationsImpl sd = new ServiceDataStoreOperationsImpl(networkTransaction); + ServiceDataStoreOperationsImpl sd = new ServiceDataStoreOperationsImpl(bindingDOMCodecServices); gnpyJson = sd.createJsonStringFromDataObject(idGnpyApi, gnpyApi); LOG.debug("GNPy Id: {} / json created : {}", idGnpyApi, gnpyJson); ConnectToGnpyServer connect = new ConnectToGnpyServer();