self-serve dg patch

[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 ba373a2..527ac84 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,10 +6,6 @@
             <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
@@ -31,22 +27,18 @@
                     <block>\r
                         <switch test="`$ss.capability-action == 'unassign'`">\r
                             <outcome value='true'>\r
-                                <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\r
+                                <for silentFailure='true' 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
                                         <outcome value='true'>\r
                                             <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
+                                                <for silentFailure='true' 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
@@ -69,14 +61,9 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\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
+                                                <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
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -103,15 +90,15 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
+                                                    <parameter name="source" value="nameGenResponse.response-payload" />\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
+                                                <for silentFailure='true' index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\r
+                                                    <for silentFailure='true' 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
                                                             <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />\r
                                                             <parameter name="target" value="$"/>\r
@@ -150,26 +137,21 @@
                                 <block atomic='true'>\r
                                     <set>\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
+                                    <for silentFailure='true' 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
                                             <outcome value='true'>\r
                                                 <block atomic='true'>\r
                                                     <set>\r
                                                         <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />\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
+                                                    <for silentFailure='true' 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
@@ -193,14 +175,9 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\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
+                                                <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
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -227,15 +204,15 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
+                                                    <parameter name="source" value="nameGenResponse.response-payload" />\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
+                                                <for silentFailure='true' index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\r
+                                                    <for silentFailure='true' 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
                                                             <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />\r
                                                             <parameter name="target" value="$"/>\r
@@ -263,22 +240,6 @@
                                                         </execute>\r
                                                     </for>\r
                                                 </for>\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
-                                                        <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />\r
-                                                        <parameter name="target" value="$"/>\r
-                                                        <outcome value='false'>\r
-                                                            <block>\r
-                                                                <set>\r
-                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.capability-name`' value='INPUT' />\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
-                                                    </execute>\r
-                                                </for>\r
                                             </block>\r
                                         </outcome>\r
                                     </switch>\r
@@ -293,22 +254,18 @@
                     <block>\r
                         <switch test="`$ss.capability-action == 'unassign'`">\r
                             <outcome value='true'>\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
+                                <for silentFailure='true' 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
                                         <outcome value='true'>\r
                                             <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
+                                                <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[$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
@@ -331,14 +288,9 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\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
+                                                <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
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -365,15 +317,15 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
+                                                    <parameter name="source" value="nameGenResponse.response-payload" />\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.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.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.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\r
+                                                <for silentFailure='true' index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\r
+                                                    <for silentFailure='true' index='l' 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
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\r
                                                             <parameter name="source" 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[$l].value`" />\r
                                                             <parameter name="target" value="$"/>\r
@@ -412,26 +364,21 @@
                                 <block atomic='true'>\r
                                     <set>\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
+                                    <for silentFailure='true' 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
                                             <outcome value='true'>\r
                                                 <block atomic='true'>\r
                                                     <set>\r
                                                         <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />\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
+                                                    <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[$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
@@ -455,14 +402,9 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\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
+                                                <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
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -489,74 +431,15 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
+                                                    <parameter name="source" value="nameGenResponse.response-payload" />\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.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='SUCCESS' />\r
                                                 </set>\r
-                                                <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
-                                                                <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
-                                                                            <set>\r
-                                                                                <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-assignments.vms.vm[0].vm-type`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\r
-                                                                            </set>\r
-                                                                        </outcome>\r
-                                                                    </switch>\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 == 'model-invariant-uuid'`">\r
-                                                                        <outcome value='true'>\r
-                                                                            <set>\r
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-invariant-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\r
-                                                                            </set>\r
-                                                                        </outcome>\r
-                                                                    </switch>\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 == 'model-customization-uuid'`">\r
-                                                                        <outcome value='true'>\r
-                                                                            <set>\r
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-customization-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\r
-                                                                            </set>\r
-                                                                        </outcome>\r
-                                                                    </switch>\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 == 'model-uuid'`">\r
-                                                                        <outcome value='true'>\r
-                                                                            <set>\r
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\r
-                                                                            </set>\r
-                                                                        </outcome>\r
-                                                                    </switch>\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 == 'model-version'`">\r
-                                                                        <outcome value='true'>\r
-                                                                            <set>\r
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-version`' 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[$cn].resource-resolution-data.resource-key[j].value`' />\r
-                                                                            </set>\r
-                                                                        </outcome>\r
-                                                                    </switch>\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 == 'model-name'`">\r
-                                                                        <outcome value='true'>\r
-                                                                            <set>\r
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-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[$cn].resource-resolution-data.resource-key[$j].value`' />\r
-                                                                            </set>\r
-                                                                        </outcome>\r
-                                                                    </switch>\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 == 'vnfc-name'`">\r
-                                                                        <outcome value='true'>\r
-                                                                            <set>\r
-                                                                                <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-assignments.vms.vm[0].vm-names.vnfc-names[0].vnfc-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[$cn].resource-resolution-data.resource-key[$j].value`' />\r
-                                                                            </set>\r
-                                                                        </outcome>\r
-                                                                    </switch>\r
-                                                                </block>\r
-                                                            </for>\r
-                                                        </outcome>\r
-                                                    </switch>\r
-                                                </for>\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.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\r
+                                                <for silentFailure='true' index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\r
+                                                    <for silentFailure='true' index='l' 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
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\r
                                                             <parameter name="source" 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[$l].value`" />\r
                                                             <parameter name="target" value="$"/>\r
@@ -584,22 +467,6 @@
                                                         </execute>\r
                                                     </for>\r
                                                 </for>\r
-                                                <for index='l' 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
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\r
-                                                        <parameter name="source" 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[$l].value`" />\r
-                                                        <parameter name="target" value="$"/>\r
-                                                        <outcome value='false'>\r
-                                                            <block>\r
-                                                                <set>\r
-                                                                    <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[$l].resource-resolution-data.capability-name`' value='INPUT' />\r
-                                                                </set>\r
-                                                                <set>\r
-                                                                    <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[$l].resource-resolution-data.status`' value='SUCCESS' />\r
-                                                                </set>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                    </execute>\r
-                                                </for>\r
                                             </block>\r
                                         </outcome>\r
                                     </switch>\r