Fix self serve DG

[sdnc/oam.git] / 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 719d009..294ce77 100644 (file)
--- 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\r
     xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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'>\r
+    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}'>\r
     <method rpc='self-serve-generate-name' mode='sync'>\r
         <block atomic="true">\r
             <set>\r
@@ -107,9 +107,6 @@
                                                     <parameter name="outputPath" value="jsonContextPrefix" />\r
                                                     <parameter name="isEscaped" value="false" />\r
                                                 </execute>\r
-                                                <set>\r
-                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='DELETED' />\r
-                                                </set>\r
                                                 <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\r
                                                     <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\r
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\r
@@ -129,9 +126,14 @@
                                                                     </execute>\r
                                                                     <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\r
                                                                         <outcome value='true'>\r
-                                                                            <set>\r
-                                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />\r
-                                                                            </set>\r
+                                                                            <block>\r
+                                                                                <set>\r
+                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />\r
+                                                                                </set>\r
+                                                                                <set>\r
+                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='DELETED' />\r
+                                                                                </set>\r
+                                                                            </block>\r
                                                                         </outcome>\r
                                                                     </switch>\r
                                                                 </block>\r
@@ -231,9 +233,6 @@
                                                     <parameter name="outputPath" value="jsonContextPrefix" />\r
                                                     <parameter name="isEscaped" value="false" />\r
                                                 </execute>\r
-                                                <set>\r
-                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='SUCCESS' />\r
-                                                </set>\r
                                                 <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\r
                                                     <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\r
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\r
@@ -253,9 +252,14 @@
                                                                     </execute>\r
                                                                     <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\r
                                                                         <outcome value='true'>\r
-                                                                            <set>\r
-                                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />\r
-                                                                            </set>\r
+                                                                            <block>\r
+                                                                                <set>\r
+                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />\r
+                                                                                </set>\r
+                                                                                <set>\r
+                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />\r
+                                                                                </set>\r
+                                                                            </block>\r
                                                                         </outcome>\r
                                                                     </switch>\r
                                                                 </block>\r