1 files changed, 26 insertions, 22 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
index 87cf6fbd0f..fc6293c11f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
@@ -156,29 +156,33 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 			execution.setVariable("subscriberInfo", subscriberInfo)
 			utils.log("DEBUG", "Incoming subscriberInfo is: " + subscriberInfo, isDebugEnabled)
 
-		  /*
-		  * Extracting User Parameters from incoming Request and converting into a Map
-		  */
-		  def jsonSlurper = new JsonSlurper()
-		  def jsonOutput = new JsonOutput()
+		  /*
+		  * Extracting User Parameters from incoming Request and converting into a Map
+		  */
+		  def jsonSlurper = new JsonSlurper()
+		  def jsonOutput = new JsonOutput()
+
+		  Map reqMap = jsonSlurper.parseText(createVcpeServiceRequest)
+
+  
+		  //InputParams
+		  def userParams = reqMap.requestDetails?.requestParameters?.userParams
   
-		  Map reqMap = jsonSlurper.parseText(createVcpeServiceRequest)
-  
-		  //InputParams
-		  def userParams = reqMap.requestDetails?.requestParameters?.userParams
-  
-		  Map<String, String> inputMap = [:]
-		  if (userParams) {
-			  userParams.each {
-				  name, value -> inputMap.put(name, value)
-					if (name.equals("BRG_WAN_MAC_Address"))
-							execution.setVariable("brgWanMacAddress", value)
-			  }
-		  }
-
-		  utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
-		  execution.setVariable("serviceInputParams", inputMap)
-
+		  Map<String, String> inputMap = [:]
+
+
+		  if (userParams) {
+				userParams.each {
+								userParam ->
+								if("BRG_WAN_MAC_Address".equals(userParam?.name)) {
+												execution.setVariable("brgWanMacAddress", userParam.value)
+												inputMap.put("BRG_WAN_MAC_Address", userParam.value)
+					}
+				}
+		  }
+
+		  utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
+		  execution.setVariable("serviceInputParams", inputMap)
+
 			utils.log("DEBUG", "Incoming brgWanMacAddress is: " + execution.getVariable('brgWanMacAddress'), isDebugEnabled)
 
 			//For Completion Handler & Fallout Handler