Multiple self-serve fixes

[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 1d074f4..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
@@ -6,6 +6,10 @@
             <set>\r
                 <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\r
             </set>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                <parameter name='contextPrefix' value='prop' />\r
+            </execute>\r
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\r
                 <outcome value='failure'>\r
                     <return status='failure'>\r
@@ -33,12 +37,16 @@
                                             <block atomic='true'>\r
                                                 <set>\r
                                                     <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />\r
+                                                    <parameter name='tmp.gen-name_length' value='1' />\r
                                                 </set>\r
                                                 <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\r
                                                     <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
                                                                 <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>\r
+                                                                <parameter name="`tmp.gen-name[0].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>\r
+                                                                <parameter name="`tmp.gen-name[0].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>\r
+                                                                <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />\r
                                                             </set>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -61,9 +69,14 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\r
-                                                <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>\r
-                                                    <parameter name='payload' value='`$tmp.naming-data-payload`' />\r
-                                                    <parameter name="prifix" value="nameGenResponse" />\r
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />\r
+                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\r
+                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\r
+                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\r
+                                                    <parameter name='format' value='json' />\r
+                                                    <parameter name='httpMethod' value='DELETE' />\r
+                                                    <parameter name="responsePrefix" value="nameGenResponse" />\r
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -90,13 +103,10 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.response-payload" />\r
+                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
                                                     <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
@@ -116,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
@@ -136,7 +151,8 @@
                             <outcome value='true'>\r
                                 <block atomic='true'>\r
                                     <set>\r
-                                        <parameter name='tmp.naming-data-payload' value='' />\r
+                                        <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\r
+                                        <parameter name='tmp.gen-name_length' value='0' />\r
                                     </set>\r
                                     <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\r
                                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\r
@@ -148,10 +164,14 @@
                                                     <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\r
                                                         <set>\r
                                                             <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>\r
+                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>\r
+                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>\r
+                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />\r
                                                         </set>\r
                                                     </for>\r
                                                     <set>\r
                                                         <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />\r
+                                                        <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />\r
                                                     </set>\r
                                                 </block>\r
                                             </outcome>\r
@@ -175,9 +195,14 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\r
-                                                <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\r
-                                                    <parameter name='payload' value='`$tmp.naming-data-payload`' />\r
-                                                    <parameter name="prifix" value="nameGenResponse" />\r
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />\r
+                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\r
+                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\r
+                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\r
+                                                    <parameter name='format' value='json' />\r
+                                                    <parameter name='httpMethod' value='POST' />\r
+                                                    <parameter name="responsePrefix" value="nameGenResponse" />\r
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -204,13 +229,10 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.response-payload" />\r
+                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
                                                     <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
@@ -230,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
@@ -276,12 +303,16 @@
                                             <block atomic='true'>\r
                                                 <set>\r
                                                     <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />\r
+                                                    <parameter name='tmp.gen-name_length' value='1' />\r
                                                 </set>\r
                                                 <for index='j' 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[$i].resource-resolution-data.resource-key_length`' >\r
                                                     <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[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
                                                                 <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>\r
+                                                                <parameter name="`tmp.gen-name[0].element[$j].name`" value="`$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[$i].resource-resolution-data.resource-key[$j].name`"/>\r
+                                                                <parameter name="`tmp.gen-name[0].element[$j].value`" value="`$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[$i].resource-resolution-data.resource-key[$j].value`"/>\r
+                                                                <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />\r
                                                             </set>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -304,9 +335,14 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\r
-                                                <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>\r
-                                                    <parameter name='payload' value='`$tmp.naming-data-payload`' />\r
-                                                    <parameter name="prifix" value="nameGenResponse" />\r
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />\r
+                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\r
+                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\r
+                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\r
+                                                    <parameter name='format' value='json' />\r
+                                                    <parameter name='httpMethod' value='DELETE' />\r
+                                                    <parameter name="responsePrefix" value="nameGenResponse" />\r
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -333,7 +369,7 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.response-payload" />\r
+                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
                                                     <parameter name="outputPath" value="jsonContextPrefix" />\r
                                                     <parameter name="isEscaped" value="false" />\r
                                                 </execute>\r
@@ -379,7 +415,8 @@
                             <outcome value='true'>\r
                                 <block atomic='true'>\r
                                     <set>\r
-                                        <parameter name='tmp.naming-data-payload' value='' />\r
+                                        <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\r
+                                        <parameter name='tmp.gen-name_length' value='0' />\r
                                     </set>\r
                                     <for index='i' 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`' >\r
                                         <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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\r
@@ -391,10 +428,14 @@
                                                     <for index='j' 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[$i].resource-resolution-data.resource-key_length`' >\r
                                                         <set>\r
                                                             <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>\r
+                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" value="`$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[$i].resource-resolution-data.resource-key[$j].name`"/>\r
+                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" value="`$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[$i].resource-resolution-data.resource-key[$j].value`"/>\r
+                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />\r
                                                         </set>\r
                                                     </for>\r
                                                     <set>\r
                                                         <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />\r
+                                                        <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />\r
                                                     </set>\r
                                                 </block>\r
                                             </outcome>\r
@@ -418,9 +459,14 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\r
-                                                <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\r
-                                                    <parameter name='payload' value='`$tmp.naming-data-payload`' />\r
-                                                    <parameter name="prifix" value="nameGenResponse" />\r
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />\r
+                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\r
+                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\r
+                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\r
+                                                    <parameter name='format' value='json' />\r
+                                                    <parameter name='httpMethod' value='POST' />\r
+                                                    <parameter name="responsePrefix" value="nameGenResponse" />\r
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -447,7 +493,7 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.response-payload" />\r
+                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
                                                     <parameter name="outputPath" value="jsonContextPrefix" />\r
                                                     <parameter name="isEscaped" value="false" />\r
                                                 </execute>\r
@@ -457,7 +503,7 @@
                                                 <for index='cn' 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`' >\r
                                                     <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[$cn].name == 'vnfc-name'`">\r
                                                         <outcome value='true'>\r
-                                                            <for index='j' 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[$cn].resource-resolution-data.resource-key_length`' >\r
+                                                            <for silentFailure='true' index='j' 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[$cn].resource-resolution-data.resource-key_length`' >\r
                                                                 <block>\r
                                                                     <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[$cn].resource-resolution-data.resource-key[$j].name == 'vm-type'`">\r
                                                                         <outcome value='true'>\r