Revert "GRAPI DG enhancement"
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
index 6abe827..de88ad7 100644 (file)
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\r
   value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\r
-  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
+  value='`$vf-module-topology-operation-input.request-information.request-action`' />\r
                         </set>\r
                         <set>\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.sdnc-generated-cloud-resources' \r
                 <parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\r
                 <parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\r
                 <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\r
-                <parameter name='ss.capability.execution-order[4]' value='eipam-ip-assign' />\r
-                <parameter name='ss.capability.execution-order[5]' value='eipam-create-pool"' />\r
-                <parameter name='ss.capability.execution-order[6]' value='mac-address-assign' />\r
-                <parameter name='ss.capability.execution-order[7]' value='create-vpe-pool' />\r
-                <parameter name='ss.capability.execution-order[8]' value='unresolved-composite-data' />\r
-                <parameter name='ss.capability.execution-order_length' value='9' />\r
+                <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\r
+                <parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\r
+                <parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\r
+                <parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\r
+                <parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\r
+                <parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\r
+                <parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\r
+                <parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\r
+                <parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\r
+                <parameter name='ss.capability.execution-order_length' value='13' />\r
             </set>\r
+            <switch test='`$prop.controller.user`'>\r
+                <outcome value=''>\r
+                    <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                        <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                        <parameter name='contextPrefix' value='prop' />\r
+                    </execute>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\r
                 <outcome value=''>\r
                     <block atomic='true'>\r
                                 </return>\r
                             </outcome>\r
                         </call>\r
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                            <parameter name="logger" value="message-log"/>\r
+                            <parameter name="field1" value="DONE with vfmodule-ra-assignment"/>\r
+                        </record>\r
                     </block>\r
                 </outcome>\r
             </switch>\r
@@ -213,336 +229,194 @@ ss.capability.execution-order
                 <set>\r
                     <parameter name='ss.capability-action' value='assign' />\r
                 </set>\r
-                <switch test='`$ss.capability-name`'>\r
-                    <outcome value='alts-entitlement-assign'>\r
-                        <set>\r
-                            <parameter name='ss.capability-dg' value='self-serve-alts-assignment' />\r
-                        </set>\r
-                    </outcome>\r
-                    <outcome value='alts-license-assign'>\r
-                        <set>\r
-                            <parameter name='ss.capability-dg' value='self-serve-alts-assignment' />\r
-                        </set>\r
-                    </outcome>\r
-                    <outcome value='Other'>\r
-                        <set>\r
-                            <parameter name='ss.capability-dg' value="`'self-serve-' + $ss.capability.execution-order[$cidx]`" />\r
-                        </set>\r
-                    </outcome>\r
-                </switch>\r
+                <set>\r
+                    <parameter name='ss.capability-dg' value="`'self-serve-' + $ss.capability.execution-order[$cidx]`" />\r
+                </set>\r
                 <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\r
                     <set>\r
                         <parameter name='tmp.param.capability-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[$pidx].resource-resolution-data.capability-name`' />\r
                     </set>\r
                     <switch test='`$ss.capability-name == $tmp.param.capability-name`'>\r
                         <outcome value='true'>\r
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\r
-                                <outcome value='SUCCESS'>\r
-                                    <set>\r
-                                        <parameter name='`$ss.capability-dg`' value='ASSIGNED' />\r
-                                    </set>\r
-                                </outcome>\r
-                                <outcome value='PENDING'>\r
-                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='`$ss.capability-dg`' value='ASSIGNED' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                        <outcome value='failure'>\r
-                                            <block atomic='true'>\r
-                                                <set>\r
-                                                    <parameter name='vf.vf-module-id'\r
+                            <block atomic='true'>\r
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\r
+                                    <outcome value='PENDING'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
+                                            <outcome value='failure'>\r
+                                                <block atomic='true'>\r
+                                                    <set>\r
+                                                        <parameter name='vf.vf-module-id'\r
     value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\r
-                                                    <parameter name='vf.vf-module-data.sdnc-request-header.'\r
+                                                        <parameter name='vf.vf-module-data.sdnc-request-header.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\r
-                                                    <parameter name='vf.vf-module-data.request-information.'\r
+                                                        <parameter name='vf.vf-module-data.request-information.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.service-information.'\r
+                                                        <parameter name='vf.vf-module-data.service-information.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vnf-information.'\r
+                                                        <parameter name='vf.vf-module-data.vnf-information.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-information.'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-information.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-topology.'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-topology.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-level-oper-status.'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-level-oper-status.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.request-version'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.request-version'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.tenant'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.tenant'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />\r
-                                                </set>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{service-instance-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{vnf-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{vf-module-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />\r
-                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\r
-                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />\r
-                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
-                                                    <parameter name='format' value='json' />\r
-                                                    <parameter name='httpMethod' value='PUT' />\r
-                                                    <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />\r
-                                                    <outcome value='success'>\r
-                                                        <block></block>\r
-                                                    </outcome>\r
-                                                    <outcome value='failure'>\r
-                                                        <block atomic="true">\r
+                                                    </set>\r
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                                                        <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>\r
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
+                                                        <parameter name="target" value="{service-instance-id}"/>\r
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>\r
+                                                    </execute>\r
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
+                                                        <parameter name="target" value="{vnf-id}"/>\r
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>\r
+                                                    </execute>\r
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
+                                                        <parameter name="target" value="{vf-module-id}"/>\r
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>\r
+                                                    </execute>\r
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />\r
+                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\r
+                                                        <parameter name='restapiUser' value='`$prop.controller.user`' />\r
+                                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
+                                                        <parameter name='format' value='json' />\r
+                                                        <parameter name='httpMethod' value='PUT' />\r
+                                                        <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />\r
+                                                        <outcome value='failure'>\r
                                                             <set>\r
                                                                 <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />\r
                                                             </set>\r
-                                                        </block>\r
-                                                    </outcome>\r
-                                                    <outcome value='not-found'>\r
-                                                        <block atomic="true">\r
+                                                        </outcome>\r
+                                                        <outcome value='not-found'>\r
                                                             <set>\r
                                                                 <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />\r
                                                             </set>\r
-                                                        </block>\r
-                                                    </outcome>\r
-                                                </execute>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='error-code' value='500' />\r
-                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />\r
-                                                </return>\r
-                                            </block>\r
-                                        </outcome>\r
-                                    </call>\r
-                                </outcome>\r
-                                <outcome value='FAILED'>\r
-                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='`$ss.capability-dg`' value='ASSIGNED' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                        <outcome value='failure'>\r
-                                            <block atomic='true'>\r
-                                                <set>\r
-                                                    <parameter name='vf.vf-module-id'\r
+                                                        </outcome>\r
+                                                    </execute>\r
+                                                    <return status='failure'>\r
+                                                        <parameter name='error-code' value='500' />\r
+                                                        <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />\r
+                                                    </return>\r
+                                                </block>\r
+                                            </outcome>\r
+                                            <outcome value='success'>\r
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                    <parameter name="logger" value="message-log"/>\r
+                                                    <parameter name="field1" value="`'DONE: ' + $ss.capability-dg`"/>\r
+                                                </record>\r
+                                            </outcome>\r
+                                        </call>\r
+                                    </outcome>\r
+                                    <outcome value='FAILED'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\r
+                                            <outcome value='failure'>\r
+                                                <block atomic='true'>\r
+                                                    <set>\r
+                                                        <parameter name='vf.vf-module-id'\r
     value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\r
-                                                    <parameter name='vf.vf-module-data.sdnc-request-header.'\r
+                                                        <parameter name='vf.vf-module-data.sdnc-request-header.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\r
-                                                    <parameter name='vf.vf-module-data.request-information.'\r
+                                                        <parameter name='vf.vf-module-data.request-information.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.service-information.'\r
+                                                        <parameter name='vf.vf-module-data.service-information.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vnf-information.'\r
+                                                        <parameter name='vf.vf-module-data.vnf-information.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-information.'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-information.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-topology.'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-topology.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-level-oper-status.'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-level-oper-status.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.request-version'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.request-version'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.tenant'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.tenant'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\r
-                                                    <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\r
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\r
   value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />\r
-                                                </set>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{service-instance-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{vnf-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                                                    <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
-                                                    <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
-                                                    <parameter name="target" value="{vf-module-id}"/>\r
-                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>\r
-                                                </execute>\r
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />\r
-                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\r
-                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />\r
-                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
-                                                    <parameter name='format' value='json' />\r
-                                                    <parameter name='httpMethod' value='PUT' />\r
-                                                    <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />\r
-                                                    <outcome value='success'>\r
-                                                        <block></block>\r
-                                                    </outcome>\r
-                                                    <outcome value='failure'>\r
-                                                        <block atomic="true">\r
+                                                    </set>\r
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                                                        <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>\r
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
+                                                        <parameter name="target" value="{service-instance-id}"/>\r
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>\r
+                                                    </execute>\r
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
+                                                        <parameter name="target" value="{vnf-id}"/>\r
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>\r
+                                                    </execute>\r
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>\r
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>\r
+                                                        <parameter name="target" value="{vf-module-id}"/>\r
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>\r
+                                                    </execute>\r
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />\r
+                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\r
+                                                        <parameter name='restapiUser' value='`$prop.controller.user`' />\r
+                                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
+                                                        <parameter name='format' value='json' />\r
+                                                        <parameter name='httpMethod' value='PUT' />\r
+                                                        <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />\r
+                                                        <outcome value='failure'>\r
                                                             <set>\r
                                                                 <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />\r
                                                             </set>\r
-                                                        </block>\r
-                                                    </outcome>\r
-                                                    <outcome value='not-found'>\r
-                                                        <block atomic="true">\r
+                                                        </outcome>\r
+                                                        <outcome value='not-found'>\r
                                                             <set>\r
                                                                 <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />\r
                                                             </set>\r
-                                                        </block>\r
-                                                    </outcome>\r
-                                                </execute>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='error-code' value='500' />\r
-                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />\r
-                                                </return>\r
-                                            </block>\r
-                                        </outcome>\r
-                                    </call>\r
-                                </outcome>\r
-                            </switch>\r
-                        </outcome>\r
-                    </switch>\r
-                </for>\r
-            </for>\r
-            <switch test="`$self-serve-generate-name == 'ASSIGNED'`">\r
-                <outcome value='false'>\r
-                    <block atomic='true'>\r
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                            <parameter name="logger" value="message-log"/>\r
-                            <parameter name="field1" value="`'SS: self-serve-generate-name status: ' + $self-serve-generate-name`"/>\r
-                        </record>\r
-                        <return status='failure'>\r
-                            <parameter name='error-code' value='500' />\r
-                            <parameter name='error-message' value="`'AAI Put is being skipped because NOT all capability components have SUCCESS status; '+ $error-message`" />\r
-                        </return>\r
-                    </block>\r
-                </outcome>\r
-                <outcome value='true'>\r
-                    <switch test="`$self-serve-unresolved-composite-data == 'ASSIGNED' or $self-serve-unresolved-composite-data == ''`">\r
-                        <outcome value='false'>\r
-                            <block atomic='true'>\r
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                                    <parameter name="logger" value="message-log"/>\r
-                                    <parameter name="field1" value="`'SS: self-serve-unresolved-composite-data: ' + $self-serve-unresolved-composite-data`"/>\r
-                                </record>\r
-                                <return status='failure'>\r
-                                    <parameter name='error-code' value='500' />\r
-                                    <parameter name='error-message' value="`'AAI Put is being skipped because NOT all capability components have SUCCESS status; '+ $error-message`" />\r
-                                </return>\r
-                            </block>\r
-                        </outcome>\r
-                        <outcome value='true'>\r
-                            <block atomic='true'>\r
-                                <set>\r
-                                    <parameter name='tmp.ss.nfc-naming-code' value='' />\r
-                                    <parameter name='tmp.ss.nfc-function' value='' />\r
-                                    <parameter name='tmp.ss.vnfc-name' value='' />\r
-                                </set>\r
-                                <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\r
-                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].name`'>\r
-                                        <outcome value='vnfc-name'>\r
-                                            <!--\r
-<outcome value='vmxvre_name_0'>\r
--->\r
-                                            <block>\r
-                                                <set>\r
-                                                    <parameter name='tmp.ss.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[$i].value`' />\r
-                                                </set>\r
-                                                <break/>\r
-                                            </block>\r
-                                        </outcome>\r
-                                    </switch>\r
-                                </for>\r
-                                <switch test="`$tmp.ss.vnfc-name != ''`">\r
-                                    <outcome value='true'>\r
-                                        <block atomic='true'>\r
-                                            <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key_length`">\r
-                                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$kidx].name`'>\r
-                                                    <outcome value='nfc-naming-code'>\r
-                                                        <!--\r
-<outcome value='NFC_NAMING_CODE'>\r
--->\r
-                                                        <set>\r
-                                                            <parameter name='tmp.ss.nfc-naming-code' 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[$kidx].value`' />\r
-                                                        </set>\r
-                                                    </outcome>\r
-                                                    <outcome value='nfc-function'>\r
-                                                        <set>\r
-                                                            <parameter name='tmp.ss.nfc-function' 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[$kidx].value`' />\r
-                                                        </set>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </for>\r
-                                            <switch test="`$tmp.ss.nfc-naming-code != '' and $tmp.ss.nfc-function != ''`">\r
-                                                <outcome value='true'>\r
-                                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="vnfc" \r
-               key="vnfc.vnfc-name = $tmp.ss.vnfc-name" >\r
-                                                        <parameter name="nfc-function" value="`$tmp.ss.nfc-function`" />\r
-                                                        <parameter name="nfc-naming-code" value="`$tmp.ss.nfc-naming-code`" />\r
-                                                        <parameter name="orchestration-status" value="pending-create" />\r
-                                                        <outcome value='failure'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='error-code' value='500' />\r
-                                                                <parameter name='error-message' value="Failed to save vnfc object in AAI" />\r
-                                                            </return>\r
                                                         </outcome>\r
-                                                    </save>\r
-                                                </outcome>\r
-                                                <outcome value='false'>\r
+                                                    </execute>\r
                                                     <return status='failure'>\r
                                                         <parameter name='error-code' value='500' />\r
-                                                        <parameter name='error-message' value="`'vnfc object not updated because param.value of vnfc-name is null; '+ $error-message`" />\r
+                                                        <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />\r
                                                     </return>\r
-                                                </outcome>\r
-                                            </switch>\r
-                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-aai-vfmodule-put' mode='sync' >\r
-                                                <outcome value='failure'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='error-code' value='500' />\r
-                                                        <parameter name='error-message' value="`'generic-vnf and vf-module not updated; '+ $error-message`" />\r
-                                                    </return>\r
-                                                </outcome>\r
-                                            </call>\r
-                                        </block>\r
-                                    </outcome>\r
-                                    <outcome value='false'>\r
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-                                            <parameter name="logger" value="message-log"/>\r
-                                            <parameter name="field1" value="`'SS: vnfc-name: ' + $tmp.ss.vnfc-name`"/>\r
-                                        </record>\r
+                                                </block>\r
+                                            </outcome>\r
+                                            <outcome value='success'>\r
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                    <parameter name="logger" value="message-log"/>\r
+                                                    <parameter name="field1" value="`'DONE: ' + $ss.capability-dg`"/>\r
+                                                </record>\r
+                                            </outcome>\r
+                                        </call>\r
                                     </outcome>\r
                                 </switch>\r
+                                <break/>\r
                             </block>\r
                         </outcome>\r
                     </switch>\r
-                </outcome>\r
-            </switch>\r
+                </for>\r
+            </for>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
                 <parameter name='filename' value='/var/tmp/ss-vf-assign.log' />\r
             </execute>\r