X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_self-serve-generate-name.xml;h=c6b5a9abab3ddc21a74d4f7b4c61deea2daed58b;hb=refs%2Fheads%2Fmaster;hp=94225a1564d112319da5f2d73954d27e6a4df039;hpb=3447fbd0ac1b8bfe7a0c0080fa702e69a80112f3;p=sdnc%2Foam.git

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 94225a15..c6b5a9ab 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
@@ -3,428 +3,24 @@
     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>
-                <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
-            </set>
+            <switch test='`$prop.controller.user`'>
+                <outcome value=''>
+                    <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                        <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                        <parameter name='contextPrefix' value='prop' />
+                    </execute>
+                </outcome>
+            </switch>
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' ></call>
             <switch test="`$ss.capability-type`">
                 <outcome value='vnf'>
-                    <switch test="`$ss.capability-action`">
-                        <outcome value='unassign'>
-                            <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                <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`'>
-                                    <outcome value='true'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
-                                            </set>
-                                            <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`' >
-                                                <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'`">
-                                                    <outcome value='true'>
-                                                        <set>
-                                                            <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;,'`"/>
-                                                        </set>
-                                                    </outcome>
-                                                </switch>
-                                            </for>
-                                            <set>
-                                                <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                            </set>
-                                            <set>
-                                                <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
-                                            </set>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                <parameter name='target' value=',}' />
-                                                <parameter name='replacement' value='}' />
-                                            </execute>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                <parameter name='target' value=',]' />
-                                                <parameter name='replacement' value=']' />
-                                            </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="BEFORE namegeneration.node.UnAssignNameNode"/>
-                                            </record>
-                                            <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>
-                                                <parameter name='payload' value='`$tmp.naming-data-payload`' />
-                                                <parameter name="prifix" value="nameGenResponse" />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <block>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="AFTER namegeneration.node.UnAssignNameNode"/>
-                                            </record>
-                                            <set>
-                                                <parameter name='pathname' 
-	value="`'/var/tmp/ss-gen-name-' + 
-	$ss.capability-type + '-' + $ss.capability-action + '-' + 
-	$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`" />
-                                            </set>
-                                            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                <parameter name="source" value="nameGenResponse.response-payload" />
-                                                <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`' >
-                                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].name == $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[$i].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                        </set>
-                                                    </outcome>
-                                                </switch>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </outcome>
-                        <outcome value='assign'>
-                            <block atomic='true'>
-                                <set>
-                                    <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
-                                </set>
-                                <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                    <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`'>
-                                        <outcome value='true'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
-                                                </set>
-                                                <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`' >
-                                                    <set>
-                                                        <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;,'`"/>
-                                                    </set>
-                                                </for>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                                </set>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </for>
-                                <switch test="`$tmp.naming-data-payload == ''`">
-                                    <outcome value='false'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
-                                            </set>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                <parameter name='target' value=',}' />
-                                                <parameter name='replacement' value='}' />
-                                            </execute>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                <parameter name='target' value=',]' />
-                                                <parameter name='replacement' value=']' />
-                                            </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="BEFORE namegeneration.node.AssignNameNode"/>
-                                            </record>
-                                            <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
-                                                <parameter name='payload' value='`$tmp.naming-data-payload`' />
-                                                <parameter name="prifix" value="nameGenResponse" />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error from NameGenerationNode Assign" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <block>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error from NameGenerationNode Assign" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="AFTER namegeneration.node.AssignNameNode"/>
-                                            </record>
-                                            <set>
-                                                <parameter name='pathname' 
-	value="`'/var/tmp/ss-gen-name-' + 
-	$ss.capability-type + '-' + $ss.capability-action + '-' + 
-	$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`" />
-                                            </set>
-                                            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                <parameter name="source" value="nameGenResponse.response-payload" />
-                                                <parameter name="outputPath" value="jsonContextPrefix" />
-                                                <parameter name="isEscaped" value="false" />
-                                            </execute>
-                                            <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`' >
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].name == $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`" />
-                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </outcome>
-                    </switch>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-generate-name' mode='sync' ></call>
                 </outcome>
                 <outcome value='vf-module'>
-                    <switch test="`$ss.capability-action`">
-                        <outcome value='unassign'>
-                            <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`' >
-                                <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`'>
-                                    <outcome value='true'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
-                                            </set>
-                                            <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`' >
-                                                <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'`">
-                                                    <outcome value='true'>
-                                                        <set>
-                                                            <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;,'`"/>
-                                                        </set>
-                                                    </outcome>
-                                                </switch>
-                                            </for>
-                                            <set>
-                                                <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                            </set>
-                                            <set>
-                                                <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
-                                            </set>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                <parameter name='target' value=',}' />
-                                                <parameter name='replacement' value='}' />
-                                            </execute>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                <parameter name='target' value=',]' />
-                                                <parameter name='replacement' value=']' />
-                                            </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="BEFORE namegeneration.node.UnAssignNameNode"/>
-                                            </record>
-                                            <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>
-                                                <parameter name='payload' value='`$tmp.naming-data-payload`' />
-                                                <parameter name="prifix" value="nameGenResponse" />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <block>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="AFTER namegeneration.node.UnAssignNameNode"/>
-                                            </record>
-                                            <set>
-                                                <parameter name='pathname' 
-	value="`'/var/tmp/ss-gen-name-' + 
-	$ss.capability-type + '-' + $ss.capability-action + '-' + 
-	$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.vf-module-id + '.log'`" />
-                                            </set>
-                                            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                <parameter name="source" value="nameGenResponse.response-payload" />
-                                                <parameter name="outputPath" value="jsonContextPrefix" />
-                                                <parameter name="isEscaped" value="false" />
-                                            </execute>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='DELETED' />
-                                            </set>
-                                            <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
-                                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].name == $jsonContextPrefix.elements[$n].resource-name`'>
-                                                    <outcome value='true'>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                        </set>
-                                                    </outcome>
-                                                </switch>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </outcome>
-                        <outcome value='assign'>
-                            <block atomic='true'>
-                                <set>
-                                    <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
-                                </set>
-                                <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`' >
-                                    <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`'>
-                                        <outcome value='true'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
-                                                </set>
-                                                <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`' >
-                                                    <set>
-                                                        <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;,'`"/>
-                                                    </set>
-                                                </for>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                                </set>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </for>
-                                <switch test="`$tmp.naming-data-payload == ''`">
-                                    <outcome value='false'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
-                                            </set>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                <parameter name='target' value=',}' />
-                                                <parameter name='replacement' value='}' />
-                                            </execute>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                <parameter name='target' value=',]' />
-                                                <parameter name='replacement' value=']' />
-                                            </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="BEFORE namegeneration.node.AssignNameNode"/>
-                                            </record>
-                                            <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
-                                                <parameter name='payload' value='`$tmp.naming-data-payload`' />
-                                                <parameter name="prifix" value="nameGenResponse" />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error from NameGenerationNode Assign" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <block>
-                                                        <set>
-                                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error from NameGenerationNode Assign" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="AFTER namegeneration.node.AssignNameNode"/>
-                                            </record>
-                                            <set>
-                                                <parameter name='pathname' 
-	value="`'/var/tmp/ss-gen-name-' + 
-	$ss.capability-type + '-' + $ss.capability-action + '-' +
-	$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.vf-module-id + '.log'`" />
-                                            </set>
-                                            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                <parameter name="source" value="nameGenResponse.response-payload" />
-                                                <parameter name="outputPath" value="jsonContextPrefix" />
-                                                <parameter name="isEscaped" value="false" />
-                                            </execute>
-                                            <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
-                                                <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`' >
-                                                    <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[$l].name == $jsonContextPrefix.elements[$n].resource-name`'>
-                                                        <outcome value='true'>
-                                                            <set>
-                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                <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' />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </outcome>
-                    </switch>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-generate-name' mode='sync' ></call>
+                </outcome>
+                <outcome value='pnf'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-generate-name' mode='sync' ></call>
                 </outcome>
             </switch>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >