From: Dan Timoney <dtimoney@att.com>
Date: Thu, 10 Oct 2019 21:38:17 +0000 (+0000)
Subject: Merge "Add logic to use sync vs async SO response" into elalto
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8cd67b5568664fabec6f2225fc71e7480af53c8a;hp=2e90e431a879146a4b66a2d93dffdd40c6a0d2ea;p=sdnc%2Foam.git

Merge "Add logic to use sync vs async SO response" into elalto
---

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
index b83f7f5e..c9fe4fa5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
@@ -971,7 +971,7 @@
         "id": "37af35ce.c8f9aa",
         "type": "for",
         "name": "for pidx in param_length",
-        "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 920.3847732543945,
@@ -1846,4 +1846,4 @@
             ]
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
index 85522cf6..4cf5cdb3 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
@@ -33,7 +33,7 @@
             <switch test="`$ss.capability-type == 'vnf'`">
                 <outcome value='true'>
                     <block>
-                        <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                        <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
                             <set>
                                 <parameter name='tmp.ss.param.capability-name' 
 	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />
@@ -411,4 +411,4 @@
             </switch>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>