Fixed bug to parse json userParams array

BPMN request - userParams is an array of maps, rather than a map.
Each map has name and value elements.
Changed code to parse the array correctly.

Change-Id: Ie06ba22b03fa5c5ceb103c42daa3bbf7e6e252db
Issue-Id: SO-262
Signed-off-by: Shailendra Borale <sb8915@att.com>

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 87cf6fb..fc6293c 100644 (file)
--- 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)\r
                        utils.log("DEBUG", "Incoming subscriberInfo is: " + subscriberInfo, isDebugEnabled)\r
 \r
-                 /*
-                 * Extracting User Parameters from incoming Request and converting into a Map
-                 */
-                 def jsonSlurper = new JsonSlurper()
-                 def jsonOutput = new JsonOutput()
+                 /*\r
+                 * Extracting User Parameters from incoming Request and converting into a Map\r
+                 */\r
+                 def jsonSlurper = new JsonSlurper()\r
+                 def jsonOutput = new JsonOutput()\r
+\r
+                 Map reqMap = jsonSlurper.parseText(createVcpeServiceRequest)\r
+\r  
+                 //InputParams\r
+                 def userParams = reqMap.requestDetails?.requestParameters?.userParams\r
   
-                 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)\r
-                         }
-                 }
-
-                 utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
-                 execution.setVariable("serviceInputParams", inputMap)
-
+                 Map<String, String> inputMap = [:]\r
+\r
+\r
+                 if (userParams) {\r
+                               userParams.each {\r
+                                                               userParam ->\r
+                                                               if("BRG_WAN_MAC_Address".equals(userParam?.name)) {\r
+                                                                                               execution.setVariable("brgWanMacAddress", userParam.value)\r
+                                                                                               inputMap.put("BRG_WAN_MAC_Address", userParam.value)\r
+                                       }\r
+                               }\r
+                 }\r
+\r
+                 utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)\r
+                 execution.setVariable("serviceInputParams", inputMap)\r
+\r
                        utils.log("DEBUG", "Incoming brgWanMacAddress is: " + execution.getVariable('brgWanMacAddress'), isDebugEnabled)\r
 \r
                        //For Completion Handler & Fallout Handler\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
index dc4669e..a0168bd 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
@@ -31,9 +31,12 @@
                                        "subscriptionServiceType":"123456789",
                                        "aLaCarte":"false",
                                        "userParams":
-                                               {
-                                                       "BRG_WAN_MAC_Address" : "brgmac"
-                                               }
+                                          [
+                                               {
+                                                       "name":"BRG_WAN_MAC_Address",
+                                                       "value":"brgmac"
+                                               }
+                                          ]
                                }
                                
                }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
index dc9ac49..17c6d15 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
@@ -29,10 +29,13 @@
                                {
                                        "subscriptionServiceType":"123456789",
                                        "aLaCarte":"false",
-                                       "userParams":
-                                               {
-                                                       "BRG_WAN_MAC_Address" : "brgmac"
-                                               }
+                    "userParams":
+                       [
+                            {
+                                "name":"BRG_WAN_MAC_Address",
+                                "value":"brgmac"
+                            }
+                       ]
                                }
                                
                }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
index d5b0713..8583e66 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
@@ -29,10 +29,13 @@
                                {
                                        "subscriptionServiceType":"123456789",
                                        "aLaCarte":"false",
-                                       "userParams":
-                                               {
-                                                       "BRG_WAN_MAC_Address" : "brgmac"
-                                               }
+                    "userParams":
+                       [
+                            {
+                                "name":"BRG_WAN_MAC_Address",
+                                "value":"brgmac"
+                            }
+                       ]
                                }
                                
                }

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
index dc4669e..99941c9 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
@@ -30,10 +30,13 @@
                                {
                                        "subscriptionServiceType":"123456789",
                                        "aLaCarte":"false",
-                                       "userParams":
-                                               {
-                                                       "BRG_WAN_MAC_Address" : "brgmac"
-                                               }
+                    "userParams":
+                       [
+                            {
+                                "name":"BRG_WAN_MAC_Address",
+                                "value":"brgmac"
+                            }
+                       ]
                                }
                                
                }