1 files changed, 7 insertions, 2 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/InstanceIdMapValidation.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/InstanceIdMapValidation.java
index 2cf01f9390..55a68ff7df 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/InstanceIdMapValidation.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/InstanceIdMapValidation.java
@@ -21,7 +21,7 @@
 
 package org.onap.so.apihandlerinfra.validation;
 
-import java.util.HashMap;
+import java.util.Map;
 import org.onap.so.apihandler.common.CommonConstants;
 import org.onap.so.exceptions.ValidationException;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
@@ -31,6 +31,7 @@ public class InstanceIdMapValidation implements ValidationRule {
 
     private static final String Service_InstanceId = "serviceInstanceId";
     private static final String Vnf_InstanceId = "vnfInstanceId";
+    private static final String PNF_NAME = "pnfName";
     private static final String vfModule_InstanceId = "vfModuleInstanceId";
 
     private static final String volume_Group_InstanceId = "volumeGroupInstanceId";
@@ -39,7 +40,7 @@ public class InstanceIdMapValidation implements ValidationRule {
 
     @Override
     public ValidationInformation validate(ValidationInformation info) throws ValidationException {
-        HashMap<String, String> instanceIdMap = info.getInstanceIdMap();
+        Map<String, String> instanceIdMap = info.getInstanceIdMap();
         ServiceInstancesRequest sir = info.getSir();
         if (instanceIdMap != null) {
             if (instanceIdMap.get(Service_InstanceId) != null) {
@@ -90,6 +91,10 @@ public class InstanceIdMapValidation implements ValidationRule {
                 }
                 sir.setInstanceGroupId(instanceIdMap.get(CommonConstants.INSTANCE_GROUP_INSTANCE_ID));
             }
+
+            if (instanceIdMap.get(PNF_NAME) != null) {
+                sir.setPnfName(instanceIdMap.get(PNF_NAME));
+            }
         }
         return info;
     }