From e27e991d1c39b162209a95c76c0b1b5e4ea9b045 Mon Sep 17 00:00:00 2001
From: "Cheung, Pat (kc1472)" <kc1472@att.com>
Date: Fri, 15 Mar 2019 19:54:13 +0000
Subject: Dublin pnf DGs

Adding DGs to support pnf unassign

Change-Id: Ic480fc334729535d16c0f4f65ace502e69448a31
Issue-ID: SDNC-642
Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com>

Former-commit-id: e75b4f974c0d5f9ea54436b01aa85a93318e7199
---
 ...ESOURCE-API_pnf-topology-operation-unassign.xml |  93 +++
 ...-API_self-serve-capability-param-resolution.xml |  89 +++
 ...E-API_self-serve-generate-name-changeassign.xml | 261 ++-------
 ...NERIC-RESOURCE-API_self-serve-generate-name.xml | 623 +--------------------
 ...C-RESOURCE-API_self-serve-pnf-generate-name.xml | 233 ++++++++
 ...ENERIC-RESOURCE-API_self-serve-pnf-unassign.xml | 143 +++++
 ...-serve-vf-module-generate-name-changeassign.xml |  92 +++
 ...URCE-API_self-serve-vf-module-generate-name.xml | 233 ++++++++
 ...SOURCE-API_self-serve-vfmodule-changeassign.xml | 138 ++---
 ...IC-RESOURCE-API_self-serve-vnf-changeassign.xml | 138 ++---
 ...I_self-serve-vnf-generate-name-changeassign.xml |  94 ++++
 ...C-RESOURCE-API_self-serve-vnf-generate-name.xml | 233 ++++++++
 ...ENERIC-RESOURCE-API_self-serve-vnf-unassign.xml |   2 +-
 13 files changed, 1416 insertions(+), 956 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml

(limited to 'platform-logic/generic-resource-api/src/main/xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml
new file mode 100644
index 00000000..48bffb44
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml
@@ -0,0 +1,93 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='pnf-topology-operation-unassign' mode='sync'>
+        <block atomic="true">
+            <switch test='`$pnf-topology-operation-input.request-information.request-action`'>
+                <outcome value='DeletePnfInstance'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="If svc-action is 'unassign' then request-action must be 'DeletePnfInstance'" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$service-data.pnfs.pnf_length`'>
+                <outcome value=''>
+                    <return status='success'>
+                        <parameter name="ack-final-indicator" value="Y" />
+                        <parameter name="error-code" value="200" />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <for index='idx' start='0' end='`$service-data.pnfs.pnf_length`' >
+                            <switch test='`$service-data.pnfs.pnf[$idx].pnf-id == $pnf-topology-operation-input.pnf-details.pnf-id`' >
+                                <outcome value='true'>
+                                    <set>
+                                        <parameter name='pnf-index' value='`$idx`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$pnf-index`'>
+                            <outcome value=''>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                </return>
+                            </outcome>
+                            <outcome value='Other'>
+                                <block atomic="true">
+                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-unassign' mode='sync' >
+                                        <outcome value='success'>
+                                            <switch test='`$service-data.pnfs.pnf_length`'>
+                                                <outcome value='1'>
+                                                    <set>
+                                                        <parameter name="service-data.pnfs." value=""/>
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <block atomic="true">
+                                                        <for index='idx' start='`$pnf-index + 1`' end='`$service-data.pnfs.pnf_length`' >
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name="$tmpidx" value="`$idx - 1`"/>
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name="service-data.pnfs.pnf[$tmpidx]." value="" />
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name="service-data.pnfs.pnf[$tmpidx]." value="$service-data.pnfs.pnf[$idx]." />
+                                                                </set>
+                                                            </block>
+                                                        </for>
+                                                        <set>
+                                                            <parameter name="service-data.pnfs.pnf[$service-data.pnfs.pnf_length - 1]." value=""/>
+                                                        </set>
+                                                        <set>
+                                                            <parameter name="service-data.pnfs.pnf_length" value="`$service-data.pnfs.pnf_length - 1`"/>
+                                                        </set>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value="`'Encountered error while unassigning self-serve  pnf resources with error: '+ $error-message`" />
+                                            </return>
+                                        </outcome>
+                                    </call>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
index 2afe8be1..d3dce914 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
@@ -182,6 +182,95 @@
                         </outcome>
                     </switch>
                 </outcome>
+                <outcome value='pnf'>
+                    <switch test="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length == ''`">
+                        <outcome value='false'>
+                            <for silentFailure='true' index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                                <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                    <outcome value='true'>
+                                        <switch test="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length == ''`">
+                                            <outcome value='false'>
+                                                <for silentFailure='true' index='j' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
+                                                        <parameter name="source" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`" />
+                                                        <parameter name="target" value="$"/>
+                                                        <outcome value='true'>
+                                                            <block atomic='true'>
+                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                    <parameter name="logger" value="message-log"/>
+                                                                    <parameter name="field1" value="`'SS: param[].value with leading $: ' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                                </record>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                                    <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
+                                                                    <parameter name='original_string' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' />
+                                                                    <parameter name='regex' value='\$\{' />
+                                                                </execute>
+                                                                <set>
+                                                                    <parameter name="tmp.s1" value='`$resource-resolution-split[0]`'/>
+                                                                    <parameter name="tmp.s2.s2" value=''/>
+                                                                    <parameter name="tmp.resolved.var.value" value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`'/>
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                                    <parameter name='ctx_memory_result_key' value='s2' />
+                                                                    <parameter name='original_string' value='`$resource-resolution-split[1]`' />
+                                                                    <parameter name='regex' value='\}' />
+                                                                </execute>
+                                                                <switch test='`$s2_length`'>
+                                                                    <outcome value='1'>
+                                                                        <set>
+                                                                            <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
+                                                                        </set>
+                                                                    </outcome>
+                                                                    <outcome value='2'>
+                                                                        <block>
+                                                                            <set>
+                                                                                <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
+                                                                            </set>
+                                                                            <set>
+                                                                                <parameter name="tmp.s2.s2" value='`$s2[1]`'/>
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <for silentFailure='true' index='cn' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                                                                    <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cn].name == $tmp.s2.s1`'>
+                                                                        <outcome value='true'>
+                                                                            <set>
+                                                                                <parameter name='tmp.resolved.var.value' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cn].value`'/>
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                                    <parameter name='source' value='`$tmp.s1`' />
+                                                                    <parameter name='target' value='`$tmp.resolved.var.value`' />
+                                                                    <parameter name='outputPath' value='tmp.result' />
+                                                                </execute>
+                                                                <switch test="`$tmp.s2.s2 == ''`">
+                                                                    <outcome value='true'></outcome>
+                                                                    <outcome value='false'>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                                            <parameter name='source' value='`$tmp.result`' />
+                                                                            <parameter name='target' value='`$tmp.s2.s2`' />
+                                                                            <parameter name='outputPath' value='tmp.result' />
+                                                                        </execute>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <set>
+                                                                    <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
+                                                </for>
+                                            </outcome>
+                                        </switch>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
+                </outcome>
             </switch>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
index 6456f73b..a8ef58de 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
@@ -1,213 +1,50 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='self-serve-generate-name-changeassign' mode='sync'>
-        <block atomic="true">
-            <switch test='`$ss.input.param.index`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="ss.input.param.index is null" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$ss.service-data.param.index`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="ss.service-data.param.index is null" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$ss.capability-type`'>
-                <outcome value='vnf'>
-                    <block atomic='true'>
-                        <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>
-                                <outcome value='external-key'>
-                                    <set>
-                                        <parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.external-key.value`'>
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="self-service-generate-name-changeassign error : external-key is null for vnf" />
-                                </return>
-                            </outcome>
-                        </switch>
-                        <set>
-                            <parameter name="tmp.vnf.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
-                        </set>
-                        <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
-                            <parameter name='payload' value='`$tmp.vnf.changeassign.naming-data-payload`' />
-                            <parameter name="prifix" value="vnf.changeassign.nameGenResponse" />
-                            <outcome value='failure'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].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 ChangeAssign vnf ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].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 ChangeAssign vnf ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </execute>
-                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="generic-vnf"
-		key="generic-vnf.vnf-id =  $service-data.vnfs.vnf[$vnf-index].vnf-id " >
-                            <parameter name="vnf-name" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`' />
-                            <outcome value='failure'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].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="`'Failed to update generic-vnf.vnf-name to ' + $ss.changeassign.vnf-name + ' in AnAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].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="`'Failed to update generic-vnf.vnf-name to ' + $ss.changeassign.vnf-name + ' in AnAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </update>
-                        <set>
-                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].value`' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`'/>
-                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />
-                        </set>
-                    </block>
-                </outcome>
-                <outcome value='vf-module'>
-                    <block atomic='true'>
-                        <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>
-                                <outcome value='external-key'>
-                                    <set>
-                                        <parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.external-key.value`'>
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="self-service-generate-name-changeassign error : external-key is null for vf-module" />
-                                </return>
-                            </outcome>
-                        </switch>
-                        <set>
-                            <parameter name="tmp.vf-module.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
-                        </set>
-                        <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
-                            <parameter name='payload' value='`$tmp.vf-module.changeassign.naming-data-payload`' />
-                            <parameter name="prifix" value="vf-module.changeassign.nameGenResponse" />
-                            <outcome value='failure'>
-                                <block atomic='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[$ss.service-data.param.index].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 ChangeAssign vf-module ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='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[$ss.service-data.param.index].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 ChangeAssign vf-module ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </execute>
-                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="vf-module" key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id AND vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id " >
-                            <parameter name="vf-module-name" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`' />
-                            <outcome value='failure'>
-                                <block atomic='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[$ss.service-data.param.index].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="`'Failed to update vf-module.vf-module-name to ' + $ss.changeassign.vf-module-name + ' in AnAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='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[$ss.service-data.param.index].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="`'Failed to update vf-module.vf-module-name to ' + $ss.changeassign.vf-module-name + ' in AnAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </update>
-                        <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[$ss.service-data.param.index].value`' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].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[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />
-                        </set>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="capability-type is not vnf or vf-module" />
-                    </return>
-                </outcome>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="capability-type is not vnf or vf-module" />
-                    </return>
-                </outcome>
-            </switch>
-        </block>
-    </method>
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-generate-name-changeassign' mode='sync'>
+        <block atomic="true">
+            <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.input.param.index`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="ss.input.param.index is null" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$ss.service-data.param.index`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="ss.service-data.param.index is null" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$ss.capability-type`'>
+                <outcome value='vnf'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-generate-name-changeassign' mode='sync' ></call>
+                </outcome>
+                <outcome value='vf-module'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-generate-name-changeassign' mode='sync' ></call>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'Unknown capability-type [' + $ss.capability-type + '], valid value are: vnf, pnf, vf-module'`" />
+                    </return>
+                </outcome>
+            </switch>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
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 294ce772..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,616 +3,29 @@
     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>
-            <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>
-            <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error from capability-param-resolution" />
-                    </return>
+            <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>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error from capability-param-resolution" />
-                    </return>
+            </switch>
+            <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' ></call>
+            <switch test="`$ss.capability-type`">
+                <outcome value='vnf'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-generate-name' mode='sync' ></call>
                 </outcome>
-            </call>
-            <switch test="`$ss.capability-type == 'vnf'`">
-                <outcome value='true'>
-                    <block>
-                        <switch test="`$ss.capability-action == 'unassign'`">
-                            <outcome value='true'>
-                                <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 + '{'`" />
-                                                    <parameter name='tmp.gen-name_length' value='1' />
-                                                </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;,'`"/>
-                                                                <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`"/>
-                                                                <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`"/>
-                                                                <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
-                                                            </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>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
-                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='DELETE' />
-                                                    <parameter name="responsePrefix" 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>
-                                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />
-                                                    <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`' >
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                            <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />
-                                                            <parameter name="target" value="$"/>
-                                                            <outcome value='true'>
-                                                                <block>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                                        <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' />
-                                                                        <parameter name='regex' value='\$\{' />
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='s2' />
-                                                                        <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                                        <parameter name='regex' value='\}' />
-                                                                    </execute>
-                                                                    <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>
-                                                                        <outcome value='true'>
-                                                                            <block>
-                                                                                <set>
-                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='DELETED' />
-                                                                                </set>
-                                                                            </block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </for>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </for>
-                            </outcome>
-                        </switch>
-                        <switch test="`$ss.capability-action == 'assign'`">
-                            <outcome value='true'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
-                                        <parameter name='tmp.gen-name_length' value='0' />
-                                    </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;,'`"/>
-                                                            <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`"/>
-                                                            <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`"/>
-                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
-                                                        </set>
-                                                    </for>
-                                                    <set>
-                                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                                        <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
-                                                    </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>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
-                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='POST' />
-                                                    <parameter name="responsePrefix" 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>
-                                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />
-                                                    <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`' >
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                            <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />
-                                                            <parameter name="target" value="$"/>
-                                                            <outcome value='true'>
-                                                                <block>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                                        <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' />
-                                                                        <parameter name='regex' value='\$\{' />
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='s2' />
-                                                                        <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                                        <parameter name='regex' value='\}' />
-                                                                    </execute>
-                                                                    <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>
-                                                                        <outcome value='true'>
-                                                                            <block>
-                                                                                <set>
-                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
-                                                                                </set>
-                                                                            </block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </for>
-                                                </for>
-                                                <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                        <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />
-                                                        <parameter name="target" value="$"/>
-                                                        <outcome value='false'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.capability-name`' value='INPUT' />
-                                                                </set>
-                                                                <set>
-                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
+                <outcome value='vf-module'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-generate-name' mode='sync' ></call>
                 </outcome>
-            </switch>
-            <switch test="`$ss.capability-type == 'vf-module'`">
-                <outcome value='true'>
-                    <block>
-                        <switch test="`$ss.capability-action == 'unassign'`">
-                            <outcome value='true'>
-                                <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 + '{'`" />
-                                                    <parameter name='tmp.gen-name_length' value='1' />
-                                                </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;,'`"/>
-                                                                <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`"/>
-                                                                <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`"/>
-                                                                <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
-                                                            </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>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
-                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='DELETE' />
-                                                    <parameter name="responsePrefix" 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>
-                                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />
-                                                    <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`' >
-                                                    <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`' >
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                            <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`" />
-                                                            <parameter name="target" value="$"/>
-                                                            <outcome value='true'>
-                                                                <block>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                                        <parameter name='original_string' 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`' />
-                                                                        <parameter name='regex' value='\$\{' />
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='s2' />
-                                                                        <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                                        <parameter name='regex' value='\}' />
-                                                                    </execute>
-                                                                    <switch test='`$s2[0] == $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`" />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </for>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </for>
-                            </outcome>
-                        </switch>
-                        <switch test="`$ss.capability-action == 'assign'`">
-                            <outcome value='true'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
-                                        <parameter name='tmp.gen-name_length' value='0' />
-                                    </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;,'`"/>
-                                                            <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`"/>
-                                                            <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`"/>
-                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
-                                                        </set>
-                                                    </for>
-                                                    <set>
-                                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                                        <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
-                                                    </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>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
-                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='POST' />
-                                                    <parameter name="responsePrefix" 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>
-                                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />
-                                                    <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='SUCCESS' />
-                                                </set>
-                                                <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`' >
-                                                    <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'`">
-                                                        <outcome value='true'>
-                                                            <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`' >
-                                                                <block>
-                                                                    <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'`">
-                                                                        <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-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`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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'`">
-                                                                        <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-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`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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'`">
-                                                                        <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-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`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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'`">
-                                                                        <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-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`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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'`">
-                                                                        <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-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`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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'`">
-                                                                        <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-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`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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'`">
-                                                                        <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-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`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </for>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                                <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`' >
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                            <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`" />
-                                                            <parameter name="target" value="$"/>
-                                                            <outcome value='true'>
-                                                                <block>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                                        <parameter name='original_string' 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`' />
-                                                                        <parameter name='regex' value='\$\{' />
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='s2' />
-                                                                        <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                                        <parameter name='regex' value='\}' />
-                                                                    </execute>
-                                                                    <switch test='`$s2[0] == $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`" />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </for>
-                                                </for>
-                                                <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`' >
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                        <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`" />
-                                                        <parameter name="target" value="$"/>
-                                                        <outcome value='false'>
-                                                            <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[$l].resource-resolution-data.capability-name`' value='INPUT' />
-                                                                </set>
-                                                                <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].resource-resolution-data.status`' value='SUCCESS' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
+                <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' >
+                <parameter name='filename' value='`$pathname`' />
+            </execute>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml
new file mode 100644
index 00000000..bded0cb5
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml
@@ -0,0 +1,233 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-pnf-generate-name' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='pathname' 
+	value="`'/var/tmp/ss-gen-name-' + 
+	$ss.capability-type + '-' + $ss.capability-action + '-' + 
+	$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-details.pnf-id + '.log'`" />
+            </set>
+            <switch test="`$ss.capability-action`">
+                <outcome value='unassign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                        </set>
+                        <for index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                            <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-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 + '{'`" />
+                                            <parameter name='tmp.gen-name_length' value='1' />
+                                        </set>
+                                        <for index='j' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
+                                            <switch test="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-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.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+                                                        <parameter name="`tmp.gen-name[0].element[$j].name`" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+                                                        <parameter name="`tmp.gen-name[0].element[$j].value`" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                        <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
+                                                    </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.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                            <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                            <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='DELETE' />
+                                            <parameter name="responsePrefix" value="nameGenResponse" />
+                                            <outcome value='failure'>
+                                                <block>
+                                                    <set>
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-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.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-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>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                            <parameter name="source" value="nameGenResponse.httpResponse" />
+                                            <parameter name="outputPath" value="jsonContextPrefix" />
+                                            <parameter name="isEscaped" value="false" />
+                                        </execute>
+                                        <set>
+                                            <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='DELETED' />
+                                        </set>
+                                        <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
+                                            <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].name == $jsonContextPrefix.elements[$n].resource-name`'>
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='assign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                            <parameter name='tmp.gen-name_length' value='0' />
+                        </set>
+                        <for index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                            <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-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.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-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.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
+                                            </set>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                            <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
+                                        </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.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                        <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                        <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                        <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='httpMethod' value='POST' />
+                                        <parameter name="responsePrefix" value="nameGenResponse" />
+                                        <outcome value='failure'>
+                                            <block>
+                                                <set>
+                                                    <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-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.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-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>
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                        <parameter name="source" value="nameGenResponse.httpResponse" />
+                                        <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.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                                            <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].name == $jsonContextPrefix.elements[$n].resource-name`'>
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </for>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml
new file mode 100644
index 00000000..2fc4a3ae
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml
@@ -0,0 +1,143 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-pnf-unassign' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='ss.capability.execution-order[0]' value='mS-mac-address-assign' />
+                <parameter name='ss.capability.execution-order[1]' value='mac-address-assign' />
+                <parameter name='ss.capability.execution-order[2]' value='netbox-ip-assign' />
+                <parameter name='ss.capability.execution-order[3]' value='eipam-ip-assignment' />
+                <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />
+                <parameter name='ss.capability.execution-order[5]' value='vlan-tag-assign' />
+                <parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />
+                <parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />
+                <parameter name='ss.capability.execution-order[8]' value='generate-name' />
+                <parameter name='ss.capability.execution-order_length' value='9' />
+            </set>
+            <set>
+                <parameter name='ss.capability-type' value='pnf' />
+            </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>
+            <for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >
+                <set>
+                    <parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />
+                    <!--
+ss.capability.execution-order[]
+-->
+                </set>
+                <set>
+                    <parameter name='ss.capability-action' value='unassign' />
+                </set>
+                <set>
+                    <parameter name='ss.capability-dg' value="`'self-serve-' + $ss.capability.execution-order[$cidx]`" />
+                </set>
+                <for index='pidx' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                    <set>
+                        <parameter name='tmp.param.capability-name' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />
+                    </set>
+                    <switch test='`$ss.capability-name == $tmp.param.capability-name`'>
+                        <outcome value='true'>
+                            <block atomic='true'>
+                                <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
+                                    <outcome value='SUCCESS'>
+                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name='vf.pnf-id'
+    value='`$service-data.pnfs.pnf[$pnf-index].pnf-id`' />
+                                                        <parameter name='vf.pnf-data.sdnc-request-header.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.sdnc-request-header.`' />
+                                                        <parameter name='vf.pnf-data.request-information.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.request-information.`' />
+                                                        <parameter name='vf.pnf-data.service-information.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.service-information.`' />
+                                                        <parameter name='vf.pnf-data.pnf-information.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-details.`' />
+                                                        <parameter name='vf.pnf-data.pnf-request-input.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-request-input.`' />
+                                                        <parameter name='vf.pnf-data.pnf-request-input.pnf-input-parameters.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-request-input.pnf-input-parameters.`' />
+                                                        <parameter name='vf.pnf-data.pnf-topology.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.`' />
+                                                        <parameter name='vf.pnf-data.pnf-level-oper-status.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.`' />
+                                                    </set>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$prop.restapi.ss-pnf-assignments`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-pnf-url"/>
+                                                        <parameter name="target" value="{service-instance-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.service-information.service-instance-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-pnf-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-pnf-url"/>
+                                                        <parameter name="target" value="{pnf-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.pnfs.pnf[$pnf-index].pnf-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.pnf.templatefile`" />
+                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-pnf-url`' />
+                                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                        <parameter name='format' value='json' />
+                                                        <parameter name='httpMethod' value='PUT' />
+                                                        <parameter name="responsePrefix" value="mdsal-ss-pnf" />
+                                                        <outcome value='failure'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="Error persisting self-serve pnf assignments in MD-SAL during unassign" />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="Error persisting self-serve pnf assignments in MD-SAL during unassign" />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`'Failed to unassign self-serve pnf assignments for ' + $ss.capability-dg + ' with error: ' + $error-message`" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value="`'DONE: ' + $ss.capability-dg`"/>
+                                                </record>
+                                            </outcome>
+                                        </call>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="`'SS: resource-resolution-data.status: ' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.status`"/>
+                                            <parameter name="field2" value="`'SS: ss.capability-name: ' + $ss.capability-name`"/>
+                                            <parameter name="field3" value="`'SS: tmp.param.capability-name: ' + $tmp.param.capability-name`"/>
+                                        </record>
+                                    </outcome>
+                                </switch>
+                                <break/>
+                            </block>
+                        </outcome>
+                    </switch>
+                </for>
+            </for>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                <parameter name='filename' value='/var/tmp/ss-pnf-unassign.log' />
+            </execute>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml
new file mode 100644
index 00000000..e2dc3e32
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml
@@ -0,0 +1,92 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-vf-module-generate-name-changeassign' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='tmp.external-key.value' value='' />
+            </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[$ss.service-data.param.index].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[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>
+                    <outcome value='external-key'>
+                        <set>
+                            <parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />
+                        </set>
+                    </outcome>
+                </switch>
+            </for>
+            <switch test='`$tmp.external-key.value`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="self-service-vf-module-generate-name-changeassign error : external-key is null for vf-module" />
+                    </return>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="tmp.vf-module.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
+            </set>
+            <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
+                <parameter name='payload' value='`$tmp.vf-module.changeassign.naming-data-payload`' />
+                <parameter name="prifix" value="vf-module.changeassign.nameGenResponse" />
+                <outcome value='failure'>
+                    <block atomic='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[$ss.service-data.param.index].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 ChangeAssign vf-module ' + $error-message`" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block atomic='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[$ss.service-data.param.index].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 ChangeAssign vf-module ' + $error-message`" />
+                        </return>
+                    </block>
+                </outcome>
+            </execute>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="vf-module" key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id AND vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id " >
+                <parameter name="vf-module-name" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`' />
+                <outcome value='failure'>
+                    <block atomic='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[$ss.service-data.param.index].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="`'Failed to update vf-module.vf-module-name to ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block atomic='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[$ss.service-data.param.index].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="`'Failed to update vf-module.vf-module-name to ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`" />
+                        </return>
+                    </block>
+                </outcome>
+            </update>
+            <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[$ss.service-data.param.index].value`' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].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[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />
+            </set>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml
new file mode 100644
index 00000000..01ec0d4b
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml
@@ -0,0 +1,233 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-vf-module-generate-name' mode='sync'>
+        <block atomic='true'>
+            <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>
+            <switch test="`$ss.capability-action`">
+                <outcome value='unassign'>
+                    <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 + '{'`" />
+                                            <parameter name='tmp.gen-name_length' value='1' />
+                                        </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;,'`"/>
+                                                        <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`"/>
+                                                        <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`"/>
+                                                        <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
+                                                    </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.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                            <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                            <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='DELETE' />
+                                            <parameter name="responsePrefix" value="nameGenResponse" />
+                                            <outcome value='failure'>
+                                                <block atomic='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].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 atomic='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].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>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                            <parameter name="source" value="nameGenResponse.httpResponse" />
+                                            <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>
+                    </block>
+                </outcome>
+                <outcome value='assign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                            <parameter name='tmp.gen-name_length' value='0' />
+                        </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;,'`"/>
+                                                <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`"/>
+                                                <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`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
+                                            </set>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                            <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
+                                        </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.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                        <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                        <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                        <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='httpMethod' value='POST' />
+                                        <parameter name="responsePrefix" value="nameGenResponse" />
+                                        <outcome value='failure'>
+                                            <block atomic='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].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 atomic='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].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>
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                        <parameter name="source" value="nameGenResponse.httpResponse" />
+                                        <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>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
index 5aed4fc8..543b9f5c 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
@@ -1,70 +1,70 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='self-serve-vfmodule-changeassign' mode='sync'>
-        <block atomic="true">
-            <switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="no param name/value provided in vf-module-request-input" />
-                    </return>
-                </outcome>
-            </switch>
-            <for index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-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_length == ''`">
-                    <outcome value='false'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='ss.input.param.found.in.service.param' value='false' />
-                            </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_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[$j].name == $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>
-                                    <outcome value='true'>
-                                        <block atomic='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[$j].resource-resolution-data.status`' value='PENDING'/>
-                                                <parameter name='ss.input.param.index' value='`$i`' />
-                                                <parameter name='ss.service-data.param.index' value='`$j`' />
-                                                <parameter name='ss.input.param.found.in.service.param' value='true' />
-                                                <parameter name='ss.capability-type' value='vf-module' />
-                                                <parameter name='ss.capability-action' value='changeassign' />
-                                            </set>
-                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
-                                                    </return>
-                                                </outcome>
-                                            </call>
-                                            <return status='success'></return>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </for>
-                            <switch test='`$ss.input.param.found.in.service.param`'>
-                                <outcome value='false'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'No param with param[].name = ' +  $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`" />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </block>
-                    </outcome>
-                </switch>
-            </for>
-        </block>
-    </method>
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-vfmodule-changeassign' mode='sync'>
+        <block atomic="true">
+            <switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="no param name/value provided in vf-module-request-input" />
+                    </return>
+                </outcome>
+            </switch>
+            <for index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-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_length == ''`">
+                    <outcome value='false'>
+                        <block atomic='true'>
+                            <set>
+                                <parameter name='ss.input.param.found.in.service.param' value='false' />
+                            </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_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[$j].name == $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>
+                                    <outcome value='true'>
+                                        <block atomic='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[$j].resource-resolution-data.status`' value='PENDING'/>
+                                                <parameter name='ss.input.param.index' value='`$i`' />
+                                                <parameter name='ss.service-data.param.index' value='`$j`' />
+                                                <parameter name='ss.input.param.found.in.service.param' value='true' />
+                                                <parameter name='ss.capability-type' value='vf-module' />
+                                                <parameter name='ss.capability-action' value='changeassign' />
+                                            </set>
+                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
+                                                    </return>
+                                                </outcome>
+                                            </call>
+                                            <return status='success'></return>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                            <switch test='`$ss.input.param.found.in.service.param`'>
+                                <outcome value='false'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="No vf-module-request-input.vf-module-input-parameters.param[].name found in service-data." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </outcome>
+                </switch>
+            </for>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
index 4e049468..16da1bb7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
@@ -1,70 +1,70 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='self-serve-vnf-changeassign' mode='sync'>
-        <block atomic='true'>
-            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="no param name/value provided in vnf-request-input" />
-                    </return>
-                </outcome>
-            </switch>
-            <for index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
-                <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`">
-                    <outcome value='false'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='ss.input.param.found.in.service.param' value='false' />
-                            </set>
-                            <for index='j' 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[$j].name == $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>
-                                    <outcome value='true'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].resource-resolution-data.status`' value='PENDING'/>
-                                                <parameter name='ss.input.param.index' value='`$i`' />
-                                                <parameter name='ss.service-data.param.index' value='`$j`' />
-                                                <parameter name='ss.input.param.found.in.service.param' value='true' />
-                                                <parameter name='ss.capability-type' value='vnf' />
-                                                <parameter name='ss.capability-action' value='changeassign' />
-                                            </set>
-                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
-                                                    </return>
-                                                </outcome>
-                                            </call>
-                                            <return status='success'></return>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </for>
-                            <switch test='`$ss.input.param.found.in.service.param`'>
-                                <outcome value='false'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'No param with param[].name = ' +  $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`" />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </block>
-                    </outcome>
-                </switch>
-            </for>
-        </block>
-    </method>
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-vnf-changeassign' mode='sync'>
+        <block atomic='true'>
+            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="no param name/value provided in vnf-request-input" />
+                    </return>
+                </outcome>
+            </switch>
+            <for index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`">
+                    <outcome value='false'>
+                        <block atomic='true'>
+                            <set>
+                                <parameter name='ss.input.param.found.in.service.param' value='false' />
+                            </set>
+                            <for index='j' 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[$j].name == $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>
+                                    <outcome value='true'>
+                                        <block atomic='true'>
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].resource-resolution-data.status`' value='PENDING'/>
+                                                <parameter name='ss.input.param.index' value='`$i`' />
+                                                <parameter name='ss.service-data.param.index' value='`$j`' />
+                                                <parameter name='ss.input.param.found.in.service.param' value='true' />
+                                                <parameter name='ss.capability-type' value='vnf' />
+                                                <parameter name='ss.capability-action' value='changeassign' />
+                                            </set>
+                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
+                                                    </return>
+                                                </outcome>
+                                            </call>
+                                            <return status='success'></return>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                            <switch test='`$ss.input.param.found.in.service.param`'>
+                                <outcome value='false'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="No vnf-request-input.vnf-input-parameters.param[].name found in service-data." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </outcome>
+                </switch>
+            </for>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml
new file mode 100644
index 00000000..c8a419a4
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml
@@ -0,0 +1,94 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-vnf-generate-name-changeassign' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='tmp.external-key.value' value='' />
+            </set>
+            <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >
+                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>
+                    <outcome value='external-key'>
+                        <set>
+                            <parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />
+                        </set>
+                    </outcome>
+                </switch>
+            </for>
+            <switch test='`$tmp.external-key.value`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="self-service-vnf-generate-name-changeassign error : external-key is null for vnf" />
+                    </return>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="tmp.vnf.changeassign.naming-data-payload" 
+	value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
+            </set>
+            <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
+                <parameter name='payload' value='`$tmp.vnf.changeassign.naming-data-payload`' />
+                <parameter name="prifix" value="vnf.changeassign.nameGenResponse" />
+                <outcome value='failure'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].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 ChangeAssign vnf ' + $error-message`" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].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 ChangeAssign vnf ' + $error-message`" />
+                        </return>
+                    </block>
+                </outcome>
+            </execute>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+	resource="generic-vnf"
+		key="generic-vnf.vnf-id =  $service-data.vnfs.vnf[$vnf-index].vnf-id " >
+                <parameter name="vnf-name" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`' />
+                <outcome value='failure'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].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="`'Failed to update generic-vnf.vnf-name to ' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].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="`'Failed to update generic-vnf.vnf-name to ' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`" />
+                        </return>
+                    </block>
+                </outcome>
+            </update>
+            <set>
+                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].value`' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`'/>
+                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />
+            </set>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml
new file mode 100644
index 00000000..4a876794
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml
@@ -0,0 +1,233 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='self-serve-vnf-generate-name' mode='sync'>
+        <block atomic='true'>
+            <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>
+            <switch test="`$ss.capability-action`">
+                <outcome value='unassign'>
+                    <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 + '{'`" />
+                                            <parameter name='tmp.gen-name_length' value='1' />
+                                        </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;,'`"/>
+                                                        <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`"/>
+                                                        <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`"/>
+                                                        <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
+                                                    </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.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                            <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                            <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='DELETE' />
+                                            <parameter name="responsePrefix" value="nameGenResponse" />
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <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 atomic='true'>
+                                                    <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>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                            <parameter name="source" value="nameGenResponse.httpResponse" />
+                                            <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>
+                    </block>
+                </outcome>
+                <outcome value='assign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                            <parameter name='tmp.gen-name_length' value='0' />
+                        </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;,'`"/>
+                                                <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`"/>
+                                                <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`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
+                                            </set>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                            <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
+                                        </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.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                        <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                        <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                        <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='httpMethod' value='POST' />
+                                        <parameter name="responsePrefix" value="nameGenResponse" />
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <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 atomic='true'>
+                                                <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>
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                        <parameter name="source" value="nameGenResponse.httpResponse" />
+                                        <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>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
index d69f4758..b640fbfa 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
@@ -136,7 +136,7 @@ ss.capability.execution-order[]
                 </for>
             </for>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />
+                <parameter name='filename' value='/var/tmp/ss-vnf-unassign.log' />
             </execute>
         </block>
     </method>
-- 
cgit 1.2.3-korg