X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml;h=b7888ede94d7b8641abd4bc0332e8d3251908283;hb=ffce554d009b58c71e433d9edc3ba6476f4ce9ce;hp=5f1fd4383caa1be50641433a64427381460c579f;hpb=829c1b2c472f491b108afd6348bd39d570eb0b83;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
index 5f1fd438..b7888ede 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
@@ -1,6 +1,6 @@
 <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='1-4-2-20181108R1'>
+    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='vf-module-topology-operation-assign' mode='sync'>
         <block atomic="true">
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
@@ -22,77 +22,29 @@
                     <block></block>
                 </outcome>
                 <outcome value='Other'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'" />
+                    </return>
                 </outcome>
             </switch>
             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-module-model'>
                 <outcome value='failure'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="Error reading VF_MODULE_MODEL table" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error reading VF_MODULE_MODEL table" />
+                    </return>
                 </outcome>
                 <outcome value='not-found'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`" />
+                    </return>
                 </outcome>
             </get-resource>
             <set>
@@ -100,27 +52,11 @@
             </set>
             <switch test='`$service-data.vnfs.vnf_length`'>
                 <outcome value=''>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="There are no VNFs defined in MD-SAL" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="There are no VNFs defined in MD-SAL" />
+                    </return>
                 </outcome>
                 <outcome value='Other'>
                     <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
@@ -139,27 +75,11 @@
             </switch>
             <switch test='`$vnf-index`'>
                 <outcome value='-1'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`" />
+                    </return>
                 </outcome>
             </switch>
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-forking-logic' mode='sync' ></call>
@@ -168,27 +88,11 @@
                     <block atomic="true">
                         <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-assign' mode='sync' >
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'Failed to create self-serve assignment for vf-module with vf-module-id=' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' with error: ' + $error-message`" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Failed to create self-serve assignment for vf-module with vf-module-id=' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' with error: ' + $error-message`" />
+                                </return>
                             </outcome>
                         </call>
                         <set>
@@ -197,19 +101,11 @@
                             <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'
   value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
                             <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'
-  value='`$vf-module-topology-operation-input.request-information.request-action`' />
+  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
                         </set>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                             <parameter name='filename' value='/var/tmp/ss-vnfend.log' />
                         </execute>
-                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                            <parameter name="input.ack-final-indicator" value="Y" />
-                            <parameter name="input.response-code" value="200" />
-                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                        </configure>
                         <return status='success'>
                             <parameter name="ack-final-indicator" value="Y" />
                             <parameter name="error-code" value="200" />
@@ -233,28 +129,12 @@
                                     <for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >
                                         <switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id`'>
                                             <outcome value='true'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id
        + ' already exists, and status is ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-level-oper-status.order-status`" />
-                                                    </set>
-                                                    <block>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
-                                                </block>
+                                                </return>
                                             </outcome>
                                         </switch>
                                     </for>
@@ -281,50 +161,18 @@
 		     cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region"
         pfx='aai.cloud-region' local-only='false' >
                             <outcome value='not-found'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Cloud region not found in AAI" />
-                                    </set>
-                                    <block>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Cloud region not found in AAI" />
+                                </return>
                             </outcome>
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error retrieving cloud region from AAI.  Is AAI down?" />
-                                    </set>
-                                    <block>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error retrieving cloud region from AAI" />
+                                </return>
                             </outcome>
                         </get-resource>
                         <for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >
@@ -347,27 +195,11 @@
                         </for>
                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli`'>
                             <outcome value=''>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`" />
-                                    </set>
-                                    <block>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`" />
+                                </return>
                             </outcome>
                         </switch>
                         <switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>
@@ -435,26 +267,8 @@
                                 <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >
                                     <outcome value='failure'>
                                         <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'from-preload flag is true but could not find preload information for VF module name ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-name`" />
-                                            </set>
-                                            <block atomic='true'>
-                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
-                                            </block>
+                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                            <return status='failure'></return>
                                         </block>
                                     </outcome>
                                 </call>
@@ -474,52 +288,20 @@
                                                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >
                                                         <outcome value='failure'>
                                                             <block atomic="true">
-                                                                <set>
-                                                                    <parameter name="error-message" value="`'from-preload flag is true but could not find preload information for VF module name ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-name`" />
-                                                                </set>
-                                                                <block atomic='true'>
-                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                        <parameter name="input.response-code" value="500" />
-                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                    </configure>
-                                                                    <return status='failure'>
-                                                                        <parameter name='ack-final' value='Y'/>
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                    </return>
-                                                                </block>
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                <return status='failure'></return>
                                                             </block>
                                                         </outcome>
                                                     </call>
                                                 </outcome>
                                                 <outcome value='Other'>
                                                     <block atomic="true">
-                                                        <set>
+                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
                                                             <parameter name="error-message" value="Error retrieving preload-information" />
-                                                        </set>
-                                                        <block atomic='true'>
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                <parameter name="input.response-code" value="500" />
-                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                            </configure>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`$error-message`" />
-                                                            </return>
-                                                        </block>
+                                                        </return>
                                                     </block>
                                                 </outcome>
                                             </switch>
@@ -529,22 +311,9 @@
                                         <block>
                                             <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-preload' mode='sync' >
                                                 <outcome value='failure'>
-                                                    <block atomic='true'>
+                                                    <block atomic="true">
                                                         <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
+                                                        <return status='failure'></return>
                                                     </block>
                                                 </outcome>
                                             </call>
@@ -595,29 +364,15 @@
                                         <switch test='`$vnf-network-index`'>
                                             <outcome value='-1'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="`'VNFC network role '
       + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-network-role
       + ' is not found in VNF network list'
       `" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </switch>
@@ -676,56 +431,28 @@
                                                                                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].network-start-address`'>
                                                                                             <outcome value=''>
                                                                                                 <block atomic="true">
-                                                                                                    <set>
+                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                                    <return status='failure'>
+                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                        <parameter name="error-code" value="500" />
                                                                                                         <parameter name="error-message" value="`'SDNC subnet id '
       + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id
       + ' does not have network-start-address populated'`" />
-                                                                                                    </set>
-                                                                                                    <block atomic='true'>
-                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                            <parameter name="input.response-code" value="500" />
-                                                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                                        </configure>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                                                        </return>
-                                                                                                    </block>
+                                                                                                    </return>
                                                                                                 </block>
                                                                                             </outcome>
                                                                                             <outcome value='Other'>
                                                                                                 <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].cidr-mask`'>
                                                                                                     <outcome value=''>
                                                                                                         <block atomic="true">
-                                                                                                            <set>
+                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
                                                                                                                 <parameter name="error-message" value="`'SDNC subnet id '
       + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id
       + ' does not have cidr-mask populated'`" />
-                                                                                                            </set>
-                                                                                                            <block atomic='true'>
-                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                                    <parameter name="input.response-code" value="500" />
-                                                                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                                                </configure>
-                                                                                                                <return status='failure'>
-                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                                                                </return>
-                                                                                                            </block>
+                                                                                                            </return>
                                                                                                         </block>
                                                                                                     </outcome>
                                                                                                     <outcome value='Other'>
@@ -767,28 +494,14 @@
                                                                             <switch test='`$subnet-id`'>
                                                                                 <outcome value='-1'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="`'Not able to find VNF network subnet that contains address '
       + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[0].vnfc-ip-address
       `" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </switch>
@@ -820,27 +533,13 @@
     and network_role = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-role'
   pfx='db.vnf-related-network-role[]'>
                                             <outcome value='failure'>
-                                                <block atomic='true'>
-                                                    <set>
+                                                <block>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="Error reading VFC_RELATED_NETWORK_ROLE table" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='success'>
@@ -877,28 +576,14 @@
                                                         </for>
                                                         <switch test='`$found-related-network`'>
                                                             <outcome value='false'>
-                                                                <block atomic='true'>
-                                                                    <set>
+                                                                <block>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="`'Unable to find related network '
       + $db.vnf-related-network-role[$db-related-network-index].related-network-role + ' in vnf-networks'`" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                         </switch>
@@ -977,33 +662,22 @@
                             <parameter name="automated-assignment" value="`$automated-assignment`" />
                             <outcome value='failure'>
                                 <block atomic="true">
-                                    <set>
+                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
                                         <parameter name="error-message" value="Error updating vf-module in AAI" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
+                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='not-found'>
                                 <block atomic="true">
-                                    <set>
+                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
                                         <parameter name="error-message" value="`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`" />
-                                    </set>
+                                    </return>
                                 </block>
                             </outcome>
                         </update>
@@ -1048,50 +722,22 @@
                                                     <parameter name="prov-status" value="`PREPROV`" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1111,50 +757,22 @@
                                                     <parameter name="prov-status" value="`PREPROV`" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1179,50 +797,22 @@
         $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`" />
                                             <outcome value='failure'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="Error updating vnfc relationships in AAI" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='not-found'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="Not-found error updating vnfc relationships" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </save>
@@ -1239,50 +829,22 @@
                                                     <parameter name="port-id" value="0" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Error saving cp object to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error creating cp object in AAI" />
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Error saving cp object to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error creating cp object in AAI" />
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1313,26 +875,12 @@
                                                                                 <parameter name="is-floating" value="false" />
                                                                                 <outcome value='failure'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Error creating l3-interface-ipv4-address-list object in AAI" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </save>
@@ -1354,50 +902,22 @@
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].subnet-id`" />
                                                                                 <outcome value='failure'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Error updating l3-interface-ipv4-address-list relationships in AAI" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='not-found'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Not-found error updating l3-interface-ipv4-address-list relationships" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </save>
@@ -1415,26 +935,12 @@
                                                                                 <parameter name="is-floating" value="false" />
                                                                                 <outcome value='failure'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Error creating l3-interface-ipv6-address-list object in AAI" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </save>
@@ -1456,50 +962,22 @@
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].subnet-id`" />
                                                                                 <outcome value='failure'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Error updating l3-interface-ipv6-address-list relationships in AAI" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='not-found'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Not-found error updating l3-interface-ipv6-address-list relationships" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </save>
@@ -1525,50 +1003,22 @@
         $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].network-id`" />
                                                                 <outcome value='failure'>
                                                                     <block atomic="true">
-                                                                        <set>
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
                                                                             <parameter name="error-message" value="Error updating cp relationship to l3-network in AAI" />
-                                                                        </set>
-                                                                        <block atomic='true'>
-                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                <parameter name="input.response-code" value="500" />
-                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                            </configure>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                            </return>
-                                                                        </block>
+                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                                 <outcome value='not-found'>
                                                                     <block atomic="true">
-                                                                        <set>
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
                                                                             <parameter name="error-message" value="Not-found error updating cp relationship to l3-network" />
-                                                                        </set>
-                                                                        <block atomic='true'>
-                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                <parameter name="input.response-code" value="500" />
-                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                            </configure>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                            </return>
-                                                                        </block>
+                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                             </save>
@@ -1595,50 +1045,22 @@
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$related-network-index].vlan-tags.vlan-interface`" />
                                                                     <outcome value='failure'>
                                                                         <block atomic="true">
-                                                                            <set>
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
                                                                                 <parameter name="error-message" value="Error updating cp relationship to l3-network and vlan-tag in AAI" />
-                                                                            </set>
-                                                                            <block atomic='true'>
-                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                    <parameter name="input.response-code" value="500" />
-                                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                </configure>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                                </return>
-                                                                            </block>
+                                                                            </return>
                                                                         </block>
                                                                     </outcome>
                                                                     <outcome value='not-found'>
                                                                         <block atomic="true">
-                                                                            <set>
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
                                                                                 <parameter name="error-message" value="Not-found error updating cp relationship to l3-network and vlan-tag" />
-                                                                            </set>
-                                                                            <block atomic='true'>
-                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                    <parameter name="input.response-code" value="500" />
-                                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                </configure>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                                </return>
-                                                                            </block>
+                                                                            </return>
                                                                         </block>
                                                                     </outcome>
                                                                 </save>
@@ -1663,51 +1085,23 @@
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`" />
                                             <outcome value='failure'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="Error updating vf-module relationships in AAI" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='not-found'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="`'No l3-network found in AAI for network ID '
       + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </save>
@@ -1726,50 +1120,22 @@
                                                     <parameter name="is-floating" value="false" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vip-ipv4-address-list in AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Not-found error saving vip-ipv4-address-list" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1796,50 +1162,22 @@
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`" />
                                                             <outcome value='failure'>
                                                                 <block atomic="true">
-                                                                    <set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="Error updating vip-ipv4-address-list relationships in AAI" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                             <outcome value='not-found'>
                                                                 <block atomic="true">
-                                                                    <set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationships" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                         </save>
@@ -1861,50 +1199,22 @@
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-role-index].connection-point.connection-point-id`" />
                                                                         <outcome value='failure'>
                                                                             <block atomic="true">
-                                                                                <set>
+                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
                                                                                     <parameter name="error-message" value="Error updating vip-ipv4-address-list relationship to cp in AAI" />
-                                                                                </set>
-                                                                                <block atomic='true'>
-                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                        <parameter name="input.response-code" value="500" />
-                                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                    </configure>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                                    </return>
-                                                                                </block>
+                                                                                </return>
                                                                             </block>
                                                                         </outcome>
                                                                         <outcome value='not-found'>
                                                                             <block atomic="true">
-                                                                                <set>
+                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
                                                                                     <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationship to cp" />
-                                                                                </set>
-                                                                                <block atomic='true'>
-                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                        <parameter name="input.response-code" value="500" />
-                                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                    </configure>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                                    </return>
-                                                                                </block>
+                                                                                </return>
                                                                             </block>
                                                                         </outcome>
                                                                     </save>
@@ -1927,50 +1237,22 @@
                                                     <parameter name="is-floating" value="false" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vip-ipv6-address-list in AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Not-found error saving vip-ipv6-address-list" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1997,50 +1279,22 @@
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`" />
                                                             <outcome value='failure'>
                                                                 <block atomic="true">
-                                                                    <set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="Error updating vip-ipv6-address-list relationships in AAI" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                             <outcome value='not-found'>
                                                                 <block atomic="true">
-                                                                    <set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="Not-found error updating vip-ipv6-address-list relationships" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                         </save>
@@ -2062,50 +1316,20 @@
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-role-index].connection-point.connection-point-id`" />
                                                                         <outcome value='failure'>
                                                                             <block atomic="true">
-                                                                                <set>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
                                                                                     <parameter name="error-message" value="Error updating vip-ipv4-address-list relationship to cp in AAI" />
-                                                                                </set>
-                                                                                <block atomic='true'>
-                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                        <parameter name="input.response-code" value="500" />
-                                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                    </configure>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                                    </return>
-                                                                                </block>
+                                                                                </return>
                                                                             </block>
                                                                         </outcome>
                                                                         <outcome value='not-found'>
                                                                             <block atomic="true">
-                                                                                <set>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
                                                                                     <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationship to cp" />
-                                                                                </set>
-                                                                                <block atomic='true'>
-                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                        <parameter name="input.response-code" value="500" />
-                                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                    </configure>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                                    </return>
-                                                                                </block>
+                                                                                </return>
                                                                             </block>
                                                                         </outcome>
                                                                     </save>
@@ -2123,26 +1347,11 @@
                         <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-vlan-tagging-assign' mode='sync' >
                             <outcome value='failure'>
                                 <block atomic="true">
+                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                                         <parameter name='filename' value='/var/tmp/bgb-vlantaggingfailure.log' />
                                     </execute>
-                                    <block atomic='true'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
+                                    <return status='failure'></return>
                                 </block>
                             </outcome>
                         </call>
@@ -2208,74 +1417,9 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
                             <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'
   value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
                         </set>
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'vf-module-assign.json'`" />
-                            <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.vf-module.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="vf-module-assign" />
-                            <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error doing PUT of vf-module" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error doing PUT of vf-module" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
-                            </outcome>
-                        </execute>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                             <parameter name='filename' value='/var/tmp/bgb-vfmodule.log' />
                         </execute>
-                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                            <parameter name="input.ack-final-indicator" value="Y" />
-                            <parameter name="input.response-code" value="200" />
-                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                        </configure>
                         <return status='success'>
                             <parameter name="ack-final-indicator" value="Y" />
                             <parameter name="error-code" value="200" />
@@ -2286,4 +1430,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
             </switch>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>