import java.util.Map;
import java.util.TreeMap;
-import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommon;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommonBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceDeleteInput;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.PathDescription;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZ;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToA;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.TerminationPoint;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceDeleteOutput;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceDeleteOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceImplementationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceImplementationRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceImplementationRequestOutputBuilder;
+import org.opendaylight.transportpce.common.StringConstants;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceDeleteOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceDeleteOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceImplementationRequestInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceImplementationRequestOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceImplementationRequestOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommon;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommonBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput;
+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.path.description.ztoa.direction.ZToA;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.TerminationPoint;
import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes;
import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.NodesBuilder;
import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.NodesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInputBuilder;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.slf4j.Logger;
public static ServicePowerSetupInput createServicePowerSetupInput(List<Nodes> olmList,
ServiceImplementationRequestInput input) {
- ServicePowerSetupInputBuilder olmSetupBldr = new ServicePowerSetupInputBuilder();
- olmSetupBldr.setNodes(olmList);
- olmSetupBldr.setWaveNumber(input.getPathDescription().getAToZDirection().getAToZWavelengthNumber());
+ ServicePowerSetupInputBuilder olmSetupBldr = new ServicePowerSetupInputBuilder()
+ .setNodes(olmList)
+ .setWaveNumber(input.getPathDescription().getAToZDirection().getAToZWavelengthNumber());
return olmSetupBldr.build();
}
public static ServiceImplementationRequestOutput createServiceImplResponse(String responseCode, String message) {
- ServiceImplementationRequestOutputBuilder outputBldr = new ServiceImplementationRequestOutputBuilder();
- outputBldr.setConfigurationResponseCommon(createCommonResponse(responseCode, message));
+ ServiceImplementationRequestOutputBuilder outputBldr = new ServiceImplementationRequestOutputBuilder()
+ .setConfigurationResponseCommon(createCommonResponse(responseCode, message));
return outputBldr.build();
}
public static ServiceDeleteOutput createServiceDeleteResponse(String responseCode, String message) {
- ServiceDeleteOutputBuilder outputBldr = new ServiceDeleteOutputBuilder();
- outputBldr.setConfigurationResponseCommon(createCommonResponse(responseCode, message));
+ ServiceDeleteOutputBuilder outputBldr = new ServiceDeleteOutputBuilder()
+ .setConfigurationResponseCommon(createCommonResponse(responseCode, message));
return outputBldr.build();
}
public static ConfigurationResponseCommon createCommonResponse(String responseCode, String message) {
- ConfigurationResponseCommonBuilder cmBldr = new ConfigurationResponseCommonBuilder();
- cmBldr.setResponseMessage(message);
- cmBldr.setResponseCode(responseCode);
+ ConfigurationResponseCommonBuilder cmBldr = new ConfigurationResponseCommonBuilder()
+ .setResponseMessage(message)
+ .setResponseCode(responseCode);
return cmBldr.build();
}
public static ListenableFuture<RpcResult<ServiceImplementationRequestOutput>>
- createRpcResponse(ServiceImplementationRequestOutput payload) {
+ createServiceImplementationRpcResponse(ServiceImplementationRequestOutput payload) {
+ return RpcResultBuilder.success(payload).buildFuture();
+ }
+
+ public static ListenableFuture<RpcResult<ServiceDeleteOutput>>
+ createServiceDeleteRpcResponse(ServiceDeleteOutput payload) {
return RpcResultBuilder.success(payload).buildFuture();
}
public static ServicePathInputData rendererCreateServiceInputAToZ(String serviceName,
- PathDescription pathDescription) {
- ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder();
- servicePathInputBuilder.setServiceName(serviceName);
+ PathDescription pathDescription) {
NodeLists nodeLists = getNodesListAToZ(pathDescription.getAToZDirection().getAToZ().iterator());
- servicePathInputBuilder.setServiceName(serviceName);
- servicePathInputBuilder.setOperation(ServicePathInput.Operation.Create);
- servicePathInputBuilder.setWaveNumber(new Long(pathDescription.getAToZDirection().getAToZWavelengthNumber()));
- servicePathInputBuilder.setNodes(nodeLists.getList());
+ ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder()
+ .setServiceName(serviceName)
+ .setOperation(ServicePathInput.Operation.Create)
+ .setWaveNumber(new Long(pathDescription.getAToZDirection().getAToZWavelengthNumber()))
+ .setNodes(nodeLists.getList());
return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists);
}
public static ServicePathInputData rendererCreateServiceInputZToA(String serviceName,
- PathDescription pathDescription) {
- ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder();
+ PathDescription pathDescription) {
NodeLists nodeLists = getNodesListZtoA(pathDescription.getZToADirection().getZToA().iterator());
- servicePathInputBuilder.setOperation(ServicePathInput.Operation.Create);
- servicePathInputBuilder.setServiceName(serviceName);
- servicePathInputBuilder.setWaveNumber(new Long(pathDescription.getZToADirection().getZToAWavelengthNumber()));
- servicePathInputBuilder.setNodes(nodeLists.getList());
+ ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder()
+ .setOperation(ServicePathInput.Operation.Create)
+ .setServiceName(serviceName)
+ .setWaveNumber(new Long(pathDescription.getZToADirection().getZToAWavelengthNumber()))
+ .setNodes(nodeLists.getList());
return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists);
}
public static ServicePathInput rendererDeleteServiceInput(String serviceName,
- ServiceDeleteInput serviceDeleteInput) {
- ServicePathInputBuilder servicePathInput = new ServicePathInputBuilder();
- servicePathInput.setServiceName(serviceName);
+ ServiceDeleteInput serviceDeleteInput) {
+ ServicePathInputBuilder servicePathInput = new ServicePathInputBuilder()
+ .setServiceName(serviceName);
//TODO: finish model-model mapping
return servicePathInput.build();
}
String sortId = "";
while (iterator.hasNext()) {
ZToA pathDesObj = iterator.next();
- resourceType = pathDesObj.getResource().getResource().getImplementedInterface().getSimpleName();
- LOG.info("Inside AtoZ {}", resourceType);
+ resourceType = pathDesObj.getResource().getResource().implementedInterface().getSimpleName();
+ LOG.info("Inside ZtoA {}", resourceType);
try {
if (TERMINATION_POINT.equals(resourceType)) {
tp = (TerminationPoint) pathDesObj.getResource().getResource();
- LOG.info(" TP is {} {}", tp.getTerminationPointIdentifier().getTpId(),
- tp.getTerminationPointIdentifier().getNodeId());
- tpID = tp.getTerminationPointIdentifier().getTpId();
- nodeID = tp.getTerminationPointIdentifier().getNodeId();
+ LOG.info(" TP is {} {}", tp.getTpId(),
+ tp.getTpNodeId());
+ tpID = tp.getTpId();
+ nodeID = tp.getTpNodeId();
sortId = pathDesObj.getId();
//TODO: do not rely on ID to be in certain format
int[] pos = findTheLongestSubstring(nodeID, tpID);
//TODO: do not rely on nodeId to be integer
int id = Integer.parseInt(sortId);
- treeMap.put(id, new NodeIdPair(nodeID.substring(0, pos[0] - 1), tpID));
+ treeMap.put(id, new NodeIdPair(nodeID.substring(0, pos[0] - 1), tpID));
} else if (resourceType.equals("Link")) {
LOG.info("The type is link");
} else {
srcID = values.getTpID();
} else if (desID == null) {
desID = values.getTpID();
- NodesBuilder nb = new NodesBuilder();
- nb.withKey(new NodesKey(values.getNodeID()));
- nb.setDestTp(desID);
- nb.setSrcTp(srcID);
+ NodesBuilder nb = new NodesBuilder()
+ .withKey(new NodesKey(values.getNodeID()))
+ .setDestTp(desID)
+ .setSrcTp(srcID);
list.add(nb.build());
- NodesBuilder olmNb = new NodesBuilder();
- olmNb.setNodeId(values.getNodeID());
- olmNb.setDestTp(desID);
- olmNb.setSrcTp(srcID);
+ NodesBuilder olmNb = new NodesBuilder()
+ .setNodeId(values.getNodeID())
+ .setDestTp(desID)
+ .setSrcTp(srcID);
olmList.add(olmNb.build());
srcID = null;
desID = null;
while (iterator.hasNext()) {
AToZ pathDesObj = iterator.next();
- resourceType = pathDesObj.getResource().getResource().getImplementedInterface().getSimpleName();
+ resourceType = pathDesObj.getResource().getResource().implementedInterface().getSimpleName();
LOG.info("Inside AtoZ {}", resourceType);
try {
if (TERMINATION_POINT.equals(resourceType)) {
tp = (TerminationPoint) pathDesObj.getResource().getResource();
- LOG.info(" TP is {} {}", tp.getTerminationPointIdentifier().getTpId(),
- tp.getTerminationPointIdentifier().getNodeId());
- tpID = tp.getTerminationPointIdentifier().getTpId();
- nodeID = tp.getTerminationPointIdentifier().getNodeId();
+ LOG.info(" TP is {} {}", tp.getTpId(),
+ tp.getTpNodeId());
+ tpID = tp.getTpId();
+ nodeID = tp.getTpNodeId();
sortId = pathDesObj.getId();
//TODO: do not rely on ID to be in certain format
if (tpID.contains("CTP") || tpID.contains("CP")) {
continue;
}
- if (!tpID.contains(OpenRoadmInterfacesImpl.TTP_TOKEN)
- && !tpID.contains(OpenRoadmInterfacesImpl.PP_TOKEN)
- && !tpID.contains(OpenRoadmInterfacesImpl.NETWORK_TOKEN)
- && !tpID.contains(OpenRoadmInterfacesImpl.CLIENT_TOKEN)) {
+ if (!tpID.contains(StringConstants.TTP_TOKEN)
+ && !tpID.contains(StringConstants.PP_TOKEN)
+ && !tpID.contains(StringConstants.NETWORK_TOKEN)
+ && !tpID.contains(StringConstants.CLIENT_TOKEN)) {
continue;
}
int[] pos = findTheLongestSubstring(nodeID, tpID);
//TODO: do not rely on nodeId to be integer
int id = Integer.parseInt(sortId);
- treeMap.put(id, new NodeIdPair(nodeID.substring(0, pos[0] - 1), tpID));
+ treeMap.put(id, new NodeIdPair(nodeID.substring(0, pos[0] - 1), tpID));
} else if (resourceType.equals("Link")) {
LOG.info("The type is link");
} else {
srcID = values.getTpID();
} else if (desID == null) {
desID = values.getTpID();
- NodesBuilder nb = new NodesBuilder();
- nb.withKey(new NodesKey(values.getNodeID()));
- nb.setDestTp(desID);
- nb.setSrcTp(srcID);
+ NodesBuilder nb = new NodesBuilder()
+ .withKey(new NodesKey(values.getNodeID()))
+ .setDestTp(desID)
+ .setSrcTp(srcID);
list.add(nb.build());
- NodesBuilder olmNb = new NodesBuilder();
- olmNb.setNodeId(values.getNodeID());
- olmNb.setDestTp(desID);
- olmNb.setSrcTp(srcID);
+ NodesBuilder olmNb = new NodesBuilder()
+ .setNodeId(values.getNodeID())
+ .setDestTp(desID)
+ .setSrcTp(srcID);
olmList.add(olmNb.build());
srcID = null;
desID = null;
Code Review / transportpce.git / blobdiff