Fix ss-netbox-dg

Change-Id: I7702c3720115772c3d463f5d53625a0d3d2c2124
Issue-ID: SDNC-444
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Former-commit-id: e4add829a5ea23fdceee7117c4781fc54aed0e25

1 files changed, 36 insertions, 52 deletions

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 167ab43e..7ef78f6c 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
@@ -1,7 +1,7 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='self-serve-netbox-ip-assignment' mode='sync'>
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='1.4.1-SNAPSHOT'>
+    <method rpc='self-serve-netbox-ip-assign' mode='sync'>
         <block atomic="true">
             <switch test='`$ss.capability-name`'>
                 <outcome value=''>
@@ -94,23 +94,19 @@
                                                                 </return>
                                                             </block>
                                                         </outcome>
-                                                    </execute>
-                                                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                                            <outcome value='`$tmp.ss.param.name`'>
-                                                                <block>
-                                                                    <set>
-                                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
 	value='`$self_serve_netbox_ip_assignement.ip-address`' />
-                                                                    </set>
-                                                                    <set>
-                                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
 	value='SUCCESS' />
-                                                                    </set>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
                                                 </block>
                                             </outcome>
                                             <outcome value='unassign'>
@@ -149,20 +145,16 @@
                                                                             <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
                                                                         </return>
                                                                     </outcome>
+                                                                    <outcome value='success'>
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
+	value='DELETED' />
+                                                                        </set>
+                                                                    </outcome>
                                                                 </execute>
                                                             </block>
                                                         </outcome>
                                                     </get-resource>
-                                                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                                            <outcome value='ip-address'>
-                                                                <set>
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
-                                                                </set>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
                                                 </block>
                                             </outcome>
                                         </switch>
@@ -219,23 +211,19 @@
                                                                 </return>
                                                             </block>
                                                         </outcome>
-                                                    </execute>
-                                                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                                            <outcome value='`$tmp.ss.param.name`'>
-                                                                <block>
-                                                                    <set>
-                                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
 	value='`$self_serve_netbox_ip_assignement.ip-address`' />
-                                                                    </set>
-                                                                    <set>
-                                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
 	value='SUCCESS' />
-                                                                    </set>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
                                                 </block>
                                             </outcome>
                                             <outcome value='unassign'>
@@ -274,20 +262,16 @@
                                                                             <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
                                                                         </return>
                                                                     </outcome>
+                                                                    <outcome value='success'>
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
+	value='DELETED' />
+                                                                        </set>
+                                                                    </outcome>
                                                                 </execute>
                                                             </block>
                                                         </outcome>
                                                     </get-resource>
-                                                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                                            <outcome value='ip-address'>
-                                                                <set>
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
-                                                                </set>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
                                                 </block>
                                             </outcome>
                                         </switch>