upgrade portmapping YANG to introduce OTN

[transportpce.git] / renderer / src / main / java / org / opendaylight / transportpce / renderer / ModelMappingUtils.java

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
index 093729ac54cc59ffb2eb0ec58d3f5dfccf508f01..57cd8b2ce47bfe765075924bf2be46e0d3280a61 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
@@ -24,9 +24,9 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.
 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.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.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;
@@ -49,28 +49,28 @@ public final class ModelMappingUtils {
 
     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();
     }
 
@@ -85,32 +85,31 @@ public final class ModelMappingUtils {
     }
 
     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();
     }
@@ -126,7 +125,7 @@ public final class ModelMappingUtils {
         String sortId = "";
         while (iterator.hasNext()) {
             ZToA pathDesObj = iterator.next();
-            resourceType = pathDesObj.getResource().getResource().getImplementedInterface().getSimpleName();
+            resourceType = pathDesObj.getResource().getResource().implementedInterface().getSimpleName();
             LOG.info("Inside ZtoA {}", resourceType);
 
             try {
@@ -169,16 +168,16 @@ public final class ModelMappingUtils {
                 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;
@@ -201,7 +200,7 @@ public final class ModelMappingUtils {
 
         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)) {
@@ -245,16 +244,16 @@ public final class ModelMappingUtils {
                 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;