From 00a4dd594c5fce63ab9961ed668c3c4bd2cbeaf9 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 9 Oct 2018 13:57:21 -0400
Subject: Multiple self-serve fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix ss-generate-name to not set SUCCESS status randomly.
fix vf-module ss dg to populate correctly the order-status
data.
add support for vnf level assignemnet for ss netbox
fix parsing resolved ip to remove prefix info (/32)

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

Former-commit-id: 1adbc091ff99771a16599d7459296dea77e69380
---
 ...NERIC-RESOURCE-API_self-serve-generate-name.xml | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
index 719d009b..294ce772 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
@@ -1,6 +1,6 @@
 <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='1.4.1-SNAPSHOT'>
+    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-generate-name' mode='sync'>
         <block atomic="true">
             <set>
@@ -107,9 +107,6 @@
                                                     <parameter name="outputPath" value="jsonContextPrefix" />
                                                     <parameter name="isEscaped" value="false" />
                                                 </execute>
-                                                <set>
-                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='DELETED' />
-                                                </set>
                                                 <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
                                                     <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
@@ -129,9 +126,14 @@
                                                                     </execute>
                                                                     <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>
                                                                         <outcome value='true'>
-                                                                            <set>
-                                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                            </set>
+                                                                            <block>
+                                                                                <set>
+                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='DELETED' />
+                                                                                </set>
+                                                                            </block>
                                                                         </outcome>
                                                                     </switch>
                                                                 </block>
@@ -231,9 +233,6 @@
                                                     <parameter name="outputPath" value="jsonContextPrefix" />
                                                     <parameter name="isEscaped" value="false" />
                                                 </execute>
-                                                <set>
-                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='SUCCESS' />
-                                                </set>
                                                 <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
                                                     <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
@@ -253,9 +252,14 @@
                                                                     </execute>
                                                                     <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>
                                                                         <outcome value='true'>
-                                                                            <set>
-                                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                            </set>
+                                                                            <block>
+                                                                                <set>
+                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
+                                                                                </set>
+                                                                            </block>
                                                                         </outcome>
                                                                     </switch>
                                                                 </block>
-- 
cgit 1.2.3-korg