Check input node parameter of getPM RPC

[transportpce.git] / olm / src / main / java / org / opendaylight / transportpce / olm / service / OlmPowerServiceImpl.java

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
index b92b8c3909354a65c0f66fd13a136d13fe735cd5..8b7dad5a08b73586303099fda45b8b0b82eb54d7 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
@@ -73,10 +73,10 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfa
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.Ots;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.PmNamesEnum;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.olm.get.pm.input.ResourceIdentifierBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.PmGranularity;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.PmNamesEnum;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.olm.get.pm.input.ResourceIdentifierBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
@@ -126,17 +126,20 @@ public class OlmPowerServiceImpl implements OlmPowerService {
 
     @Override
     public GetPmOutput getPm(GetPmInput pmInput) {
-        OpenroadmNodeVersion openroadmVersion;
         GetPmOutputBuilder pmOutputBuilder = new GetPmOutputBuilder();
+        if (mappingUtils.getOpenRoadmVersion(pmInput.getNodeId()) == null) {
+            return pmOutputBuilder.build();
+        }
+        OpenroadmNodeVersion nodeVersion;
         switch (mappingUtils.getOpenRoadmVersion(pmInput.getNodeId())) {
             case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1:
-                openroadmVersion = OpenroadmNodeVersion._121;
+                nodeVersion = OpenroadmNodeVersion._121;
                 break;
             case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1:
-                openroadmVersion = OpenroadmNodeVersion._221;
+                nodeVersion = OpenroadmNodeVersion._221;
                 break;
             case StringConstants.OPENROADM_DEVICE_VERSION_7_1:
-                openroadmVersion = OpenroadmNodeVersion._71;
+                nodeVersion = OpenroadmNodeVersion._71;
                 break;
             default:
                 LOG.error("Unknown device version");
@@ -144,7 +147,7 @@ public class OlmPowerServiceImpl implements OlmPowerService {
         }
         LOG.info("Now calling get pm data");
         pmOutputBuilder = OlmUtils.pmFetch(pmInput, deviceTransactionManager,
-            openroadmVersion);
+            nodeVersion);
         return pmOutputBuilder.build();
     }