From 8e136272ffd5555c66ac4b8b6310eb974ca86e19 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 27 Aug 2019 09:53:59 -0400
Subject: Revert "GRAPI DG enhancement"

This reverts commit 48c912df5cc69f58592d96a93e8b72900587dc89 [formerly 8d5a350ab0128e46a81042341f2024a88631d35a].
This change breaks the flow in a few ways:
 - loses fix to case where now GW preload is found.
 - depends on an adaptor that is not part of ONAP (MSOAdaptor)
 - uses a rest api template that does not exist.

Change-Id: I7db150174484309e2ec3b49365403ca0d4f7ac6f
Issue-ID: SDNC-870
Issue-ID: SDNC-871
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

Former-commit-id: ffce554d009b58c71e433d9edc3ba6476f4ce9ce
---
 ...IC-RESOURCE-API_self-serve-vf-module-assign.xml |  141 +-
 ...RESOURCE-API_self-serve-vf-module-mdsal-put.xml |   75 --
 .../GENERIC-RESOURCE-API_self-serve-vnf-assign.xml |  196 ++-
 ...NERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml |   67 -
 ...RCE-API_vf-module-topology-operation-assign.xml | 1392 ++++----------------
 ...URCE-API_vf-module-topology-operation-async.xml |   28 -
 ...C-RESOURCE-API_vf-module-topology-operation.xml |    9 +-
 ...-RESOURCE-API_vnf-topology-operation-assign.xml | 1023 ++++----------
 ...C-RESOURCE-API_vnf-topology-operation-async.xml |   28 -
 ...GENERIC-RESOURCE-API_vnf-topology-operation.xml |    9 +-
 10 files changed, 766 insertions(+), 2202 deletions(-)
 delete mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml
 delete mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml
 delete mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
 delete mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
index d2bb3a0c..de88ad7d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
@@ -245,13 +245,75 @@ ss.capability.execution-order
                                             <outcome value='failure'>
                                                 <block atomic='true'>
                                                     <set>
-                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
+                                                        <parameter name='vf.vf-module-id'
+    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />
+                                                        <parameter name='vf.vf-module-data.sdnc-request-header.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />
+                                                        <parameter name='vf.vf-module-data.request-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />
+                                                        <parameter name='vf.vf-module-data.service-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />
+                                                        <parameter name='vf.vf-module-data.vnf-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-topology.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-level-oper-status.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.request-version'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.tenant'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />
                                                     </set>
-                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{service-instance-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{vnf-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{vf-module-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />
+                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />
+                                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                        <parameter name='format' value='json' />
+                                                        <parameter name='httpMethod' value='PUT' />
+                                                        <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />
+                                                        <outcome value='failure'>
+                                                            <set>
+                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <set>
+                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
+                                                            </set>
+                                                        </outcome>
+                                                    </execute>
                                                     <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
                                                         <parameter name='error-code' value='500' />
-                                                        <parameter name='error-message' value="`$error-message`" />
+                                                        <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
                                                     </return>
                                                 </block>
                                             </outcome>
@@ -268,13 +330,75 @@ ss.capability.execution-order
                                             <outcome value='failure'>
                                                 <block atomic='true'>
                                                     <set>
-                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
+                                                        <parameter name='vf.vf-module-id'
+    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />
+                                                        <parameter name='vf.vf-module-data.sdnc-request-header.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />
+                                                        <parameter name='vf.vf-module-data.request-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />
+                                                        <parameter name='vf.vf-module-data.service-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />
+                                                        <parameter name='vf.vf-module-data.vnf-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-topology.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-level-oper-status.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.request-version'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.tenant'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />
                                                     </set>
-                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{service-instance-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{vnf-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{vf-module-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />
+                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />
+                                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                        <parameter name='format' value='json' />
+                                                        <parameter name='httpMethod' value='PUT' />
+                                                        <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />
+                                                        <outcome value='failure'>
+                                                            <set>
+                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <set>
+                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
+                                                            </set>
+                                                        </outcome>
+                                                    </execute>
                                                     <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
                                                         <parameter name='error-code' value='500' />
-                                                        <parameter name='error-message' value="`$error-message`" />
+                                                        <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
                                                     </return>
                                                 </block>
                                             </outcome>
@@ -293,7 +417,6 @@ ss.capability.execution-order
                     </switch>
                 </for>
             </for>
-            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                 <parameter name='filename' value='/var/tmp/ss-vf-assign.log' />
             </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml
deleted file mode 100644
index 76b60872..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='self-serve-vf-module-mdsal-put' mode='sync'>
-        <block atomic='true'>
-            <set>
-                <parameter name='vf.vf-module-id'
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />
-                <parameter name='vf.vf-module-data.sdnc-request-header.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />
-                <parameter name='vf.vf-module-data.request-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />
-                <parameter name='vf.vf-module-data.service-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />
-                <parameter name='vf.vf-module-data.vnf-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />
-                <parameter name='vf.vf-module-data.vf-module-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />
-                <parameter name='vf.vf-module-data.vf-module-topology.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />
-                <parameter name='vf.vf-module-data.vf-module-level-oper-status.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.request-version'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.tenant'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>
-                <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
-                <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                <parameter name="target" value="{vnf-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
-                <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                <parameter name="target" value="{vf-module-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />
-                <outcome value='failure'>
-                    <set>
-                        <parameter name="error-message" value="`'Failed to persist self-serve vf-module assignments during assign in MD-SAL. ' + $error-message`" />
-                    </set>
-                </outcome>
-                <outcome value='not-found'>
-                    <set>
-                        <parameter name="error-message" value="`'Failed to persist self-serve vf-module assignments during assign in MD-SAL. ' + $error-message`" />
-                    </set>
-                </outcome>
-            </execute>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
index 96db3efe..c8b52b29 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
@@ -223,62 +223,154 @@ ss.capability.execution-order[]
                     </set>
                     <switch test='`$ss.capability-name == $tmp.param.capability-name`'>
                         <outcome value='true'>
-                            <block atomic='true'>
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
-                                    <outcome value='PENDING'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
-                                            <outcome value='failure'>
-                                                <block atomic='true'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
-                                                    </set>
-                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name='error-code' value='500' />
-                                                        <parameter name='error-message' value="`$error-message`" />
-                                                    </return>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='success'>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="`'EXECUTION DONE: ' + $ss.capability-dg`"/>
-                                                </record>
-                                            </outcome>
-                                        </call>
-                                    </outcome>
-                                    <outcome value='FAILED'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
-                                            <outcome value='failure'>
-                                                <block atomic='true'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
-                                                    </set>
-                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name='error-code' value='500' />
-                                                        <parameter name='error-message' value="`$error-message`" />
-                                                    </return>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='success'>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="`'EXECUTION DONE: ' + $ss.capability-dg`"/>
-                                                </record>
-                                            </outcome>
-                                        </call>
-                                    </outcome>
-                                </switch>
-                                <break/>
-                            </block>
+                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
+                                <outcome value='PENDING'>
+                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='vf.vnf-id'
+    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />
+                                                    <parameter name='vf.vnf-data.sdnc-request-header.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />
+                                                    <parameter name='vf.vnf-data.request-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />
+                                                    <parameter name='vf.vnf-data.service-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />
+                                                    <parameter name='vf.vnf-data.vnf-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
+                                                    <parameter name='vf.vnf-data.vnf-topology.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />
+                                                    <parameter name='vf.vnf-data.vnf-level-oper-status.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.request-version'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-name'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.tenant'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-clli'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />
+                                                </set>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$prop.restapi.ss-vnf-assignments`"/>
+                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
+                                                    <parameter name="target" value="{service-instance-id}"/>
+                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`"/>
+                                                </execute>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$tmp.ss-vnf-url`"/>
+                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
+                                                    <parameter name="target" value="{vnf-id}"/>
+                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
+                                                </execute>
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`" />
+                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />
+                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                    <parameter name='format' value='json' />
+                                                    <parameter name='httpMethod' value='PUT' />
+                                                    <parameter name="responsePrefix" value="mdsal-ss-vnf" />
+                                                    <outcome value='failure'>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
+                                                    </outcome>
+                                                    <outcome value='not-found'>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
+                                                    </outcome>
+                                                </execute>
+                                                <return status='failure'>
+                                                    <parameter name='error-code' value='500' />
+                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </call>
+                                </outcome>
+                                <outcome value='FAILED'>
+                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='vf.vnf-id'
+    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />
+                                                    <parameter name='vf.vnf-data.sdnc-request-header.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />
+                                                    <parameter name='vf.vnf-data.request-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />
+                                                    <parameter name='vf.vnf-data.service-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />
+                                                    <parameter name='vf.vnf-data.vnf-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
+                                                    <parameter name='vf.vnf-data.vnf-topology.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />
+                                                    <parameter name='vf.vnf-data.vnf-level-oper-status.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.request-version'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-name'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.tenant'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-clli'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />
+                                                </set>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$prop.restapi.ss-vnf-assignments`"/>
+                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
+                                                    <parameter name="target" value="{service-instance-id}"/>
+                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`"/>
+                                                </execute>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$tmp.ss-vnf-url`"/>
+                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
+                                                    <parameter name="target" value="{vnf-id}"/>
+                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
+                                                </execute>
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`" />
+                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />
+                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                    <parameter name='format' value='json' />
+                                                    <parameter name='httpMethod' value='PUT' />
+                                                    <parameter name="responsePrefix" value="mdsal-ss-vnf" />
+                                                    <outcome value='failure'>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
+                                                    </outcome>
+                                                    <outcome value='not-found'>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
+                                                    </outcome>
+                                                </execute>
+                                                <return status='failure'>
+                                                    <parameter name='error-code' value='500' />
+                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </call>
+                                </outcome>
+                            </switch>
                         </outcome>
                     </switch>
                 </for>
             </for>
-            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                 <parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />
             </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml
deleted file mode 100644
index a35b4c1b..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='self-serve-vnf-mdsal-put' mode='sync'>
-        <block atomic='true'>
-            <set>
-                <parameter name='vf.vnf-id'
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />
-                <parameter name='vf.vnf-data.sdnc-request-header.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />
-                <parameter name='vf.vnf-data.request-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />
-                <parameter name='vf.vnf-data.service-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />
-                <parameter name='vf.vnf-data.vnf-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
-                <parameter name='vf.vnf-data.vnf-topology.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />
-                <parameter name='vf.vnf-data.vnf-level-oper-status.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
-                <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />
-                <parameter name='vf.vnf-data.vnf-request-input.request-version'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />
-                <parameter name='vf.vnf-data.vnf-request-input.vnf-name'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />
-                <parameter name='vf.vnf-data.vnf-request-input.tenant'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />
-                <parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />
-                <parameter name='vf.vnf-data.vnf-request-input.aic-clli'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.ss-vnf-assignments`"/>
-                <parameter name="outputPath" value="tmp.ss-vnf-url"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.ss-vnf-url`"/>
-                <parameter name="outputPath" value="tmp.ss-vnf-url"/>
-                <parameter name="target" value="{vnf-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ss-vnf" />
-                <outcome value='failure'>
-                    <set>
-                        <parameter name="error-message" value="`'Failed to persist self-serve vnf assignments during assign in MD-SAL. ' + $error-message`" />
-                    </set>
-                </outcome>
-                <outcome value='not-found'>
-                    <set>
-                        <parameter name="error-message" value="`'Failed to persist self-serve vnf assignments during assign in MD-SAL. ' + $error-message`" />
-                    </set>
-                </outcome>
-            </execute>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_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>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
deleted file mode 100644
index 4c89d83b..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='vf-module-topology-operation-async' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='skip-mdsal-update' value='Y' />
-            </set>
-            <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
-                <outcome value='assign'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' ></call>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
-                    </return>
-                </outcome>
-            </switch>
-            <return status='success'>
-                <parameter name="ack-final" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index dae4b9b9..24863d44 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
@@ -6,14 +6,7 @@
             <call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' ></call>
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='skip-mdsal-update' value='Y' />
-                        </set>
-                        <set>
-                            <parameter name='ack-final' value='N' />
-                        </set>
-                    </block>
+                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' ></call>
                 </outcome>
                 <outcome value='unassign'>
                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' ></call>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
index 0b90096b..1433b7b5 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
@@ -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 'CreateVnfInstance'" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vnf-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 'CreateVnfInstance'" />
+                    </return>
                 </outcome>
             </switch>
             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-model'>
                 <outcome value='failure'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="Error reading VF_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="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vnf-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_MODEL table" />
+                    </return>
                 </outcome>
                 <outcome value='not-found'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-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="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vnf-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 VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`" />
+                    </return>
                 </outcome>
             </get-resource>
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' ></call>
@@ -101,27 +53,11 @@
                     <block atomic="true">
                         <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-assign' mode='sync' >
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'Failed to create self-serve assignment for vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-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="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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 vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`" />
+                                </return>
                             </outcome>
                         </call>
                         <set>
@@ -132,14 +68,6 @@
                         <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="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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" />
@@ -156,35 +84,19 @@
                                 </set>
                             </outcome>
                             <outcome value='Other'>
-                                <block atomic='true'>
+                                <block>
                                     <set>
                                         <parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />
                                     </set>
                                     <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
                                         <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>
                                             <outcome value='true'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id
       + ' already exists'`" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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>
@@ -204,52 +116,20 @@
 		key="instance-group.id = $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id"
         pfx='aai.instance-group' local-only='false' >
                                     <outcome value='not-found'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'Cannot find instance group id ' +
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'Cannot find instance group id ' +
       $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id
       + ' in AAI'`" />
-                                            </set>
-                                            <block atomic='true'>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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>
                                     <outcome value='failure'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="Error retrieving instance-group from AAI" />
-                                            </set>
-                                            <block atomic='true'>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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 instance-group from AAI" />
+                                        </return>
                                     </outcome>
                                 </get-resource>
                                 <for index='rel-index' start='0' end='`$aai.instance-group.relationship-list.relationship_length`' >
@@ -260,53 +140,20 @@
 		key="collection.collection-id = $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
         pfx='aai.collection' local-only='false' >
                                                 <outcome value='not-found'>
-                                                    <block atomic="true">
-                                                        <set>
-                                                            <parameter name="error-message" value="`'Unable to find AAI relationship from collection '
-      + $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value
-      + ' to service instance'`" />
-                                                        </set>
-                                                        <block atomic='true'>
-                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-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="`'Cannot find collection ' +
+      $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value
+      + ' in AAI'`" />
+                                                    </return>
                                                 </outcome>
                                                 <outcome value='failure'>
-                                                    <block atomic="true">
-                                                        <set>
-                                                            <parameter name="error-message" value="`'Failed to get network service instance '
-      + $network-service-instance + ' from 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="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-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="System error retrieving collection from AAI" />
+                                                    </return>
                                                 </outcome>
                                                 <outcome value='success'>
                                                     <block atomic="true">
@@ -328,30 +175,13 @@
                                                         </for>
                                                         <switch test='`$found-network-instance-group`'>
                                                             <outcome value='false'>
-                                                                <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name="error-message" value="`'Could not find network instance group ' +
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'Could not find network instance group ' +
       $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id
-      + ' in MD-SAL service instance '
-      + $network-service-instance`" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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>
+      + ' in MD-SAL'`" />
+                                                                </return>
                                                             </outcome>
                                                         </switch>
                                                         <set>
@@ -405,50 +235,18 @@
                                             <block></block>
                                         </outcome>
                                         <outcome value='N'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
-                                                </set>
-                                                <block>
-                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                        <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-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 vnf-name was received but ecomp-generated-naming is not Y" />
+                                            </return>
                                         </outcome>
                                         <outcome value='Other'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
-                                                </set>
-                                                <block>
-                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                        <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-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 vnf-name was received but ecomp-generated-naming is not Y" />
+                                            </return>
                                         </outcome>
                                     </switch>
                                     <switch test='`$db.vf-model.naming-policy`'>
@@ -464,27 +262,11 @@
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >
                                                     <outcome value='failure'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
-                                                            </set>
-                                                            <block>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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="`$generate-unique-name-output.error-message`" />
+                                                        </return>
                                                     </outcome>
                                                     <outcome value='success'>
                                                         <set>
@@ -505,27 +287,11 @@
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >
                                                     <outcome value='failure'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Unable to generate VNF name" />
-                                                            </set>
-                                                            <block>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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 generate VNF name" />
+                                                        </return>
                                                     </outcome>
                                                     <outcome value='success'>
                                                         <set>
@@ -619,10 +385,7 @@
 		     depth='all'"
         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>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -630,28 +393,16 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Cloud region not found in AAI" />
+                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error retrieving cloud region from AAI" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -659,21 +410,12 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error retrieving cloud region from AAI" />
+                                    </return>
                                 </block>
                             </outcome>
                         </get-resource>
@@ -697,10 +439,7 @@
                         </for>
                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-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 ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -708,21 +447,12 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                        <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 ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
+                                    </return>
                                 </block>
                             </outcome>
                         </switch>
@@ -730,10 +460,7 @@
   key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-network-role-mapping[]'>
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error reading VF_TO_NETWORK_ROLE_MAPPING table" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -741,21 +468,12 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error reading VF_TO_NETWORK_ROLE_MAPPING table" />
+                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='not-found'>
@@ -789,10 +507,7 @@
         pfx='aai.l3-network' local-only='false'
 >
                                             <outcome value='not-found'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
-                                                    </set>
+                                                <block>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -800,28 +515,18 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'No active l3-network found in AAI with cloud_region_id '
+          + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + ' and network_role '
+          + $db.vf-network-role-mapping[$network-index].network-role`" />
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='failure'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="Error retrieving l3-network from AAI" />
-                                                    </set>
+                                                <block>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -829,21 +534,12 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error retrieving l3-network from AAI" />
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </get-resource>
@@ -926,10 +622,7 @@
                                         </block>
                                         <switch test='`$l3-network-id`'>
                                             <outcome value='-1'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
-                                                    </set>
+                                                <block>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -937,21 +630,12 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </switch>
@@ -1049,10 +733,7 @@
     and network_role = $db.vf-network-role-mapping[$role-index].network-role'
   pfx='db.vnf-related-network-role[]'>
                                             <outcome value='failure'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="Error reading VNF_RELATED_NETWORK_ROLE table" />
-                                                    </set>
+                                                <block>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1060,21 +741,12 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error reading VNF_RELATED_NETWORK_ROLE table" />
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='success'>
@@ -1099,14 +771,7 @@
                                                         <parameter name='httpMethod' value='GET' />
                                                         <parameter name="responsePrefix" value="mdsal-ntis" />
                                                         <outcome value='failure'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name="error-message" value="`
-    'Error retrieving network-topology-identifier-structure for service instance '
-    + $network-service-instance-id
-    + ' and network-id '
-    + $l3-network-id`" />
-                                                                </set>
+                                                            <block>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1114,21 +779,16 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                        <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`
+    'Error retrieving network-topology-identifier-structure for service instance '
+    + $network-service-instance-id
+    + ' and network-id '
+    + $l3-network-id`" />
+                                                                </return>
                                                             </block>
                                                         </outcome>
                                                     </execute>
@@ -1148,10 +808,7 @@
                                                         <parameter name="start_length" value="1" />
                                                         <parameter name="query" value="/query/owning-entity-fromService-instance" />
                                                         <outcome value='failure'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name="error-message" value="Error getting owning entity from service instance" />
-                                                                </set>
+                                                            <block>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1159,28 +816,16 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                        <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="Error getting owning entity from service instance" />
+                                                                </return>
                                                             </block>
                                                         </outcome>
                                                         <outcome value='not-found'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name="error-message" value="Unable to find owning entity from service instance" />
-                                                                </set>
+                                                            <block>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1188,21 +833,12 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                        <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="Unable to find owning entity from service instance" />
+                                                                </return>
                                                             </block>
                                                         </outcome>
                                                     </save>
@@ -1229,10 +865,7 @@
                                                                 <parameter name="query" value="`'/query/getNetworks?networkRole=' + $db.vnf-related-network-role[$rel-network-role-index].related-network-role
   + '&amp;cloudRegionId=' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
                                                                 <outcome value='failure'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name="error-message" value="Error calling getNetworks custom query in AAI" />
-                                                                        </set>
+                                                                    <block>
                                                                         <block atomic="true">
                                                                             <set>
                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1240,29 +873,16 @@
                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                             </set>
                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="Error calling getNetworks custom query in AAI" />
+                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                                 <outcome value='not-found'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name="error-message" value="`'No l3-network returned from getNetworks custom query for related network role '
-      + $db.vnf-related-network-role[0].related-network-role`" />
-                                                                        </set>
+                                                                    <block>
                                                                         <block atomic="true">
                                                                             <set>
                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1270,21 +890,13 @@
                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                             </set>
                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="`'No l3-network returned from getNetworks custom query for related network role '
+      + $db.vnf-related-network-role[0].related-network-role`" />
+                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                             </save>
@@ -1307,10 +919,7 @@
         pfx='aai.vlan-tag' local-only='false'
 >
                                                                                 <outcome value='failure'>
-                                                                                    <block atomic="true">
-                                                                                        <set>
-                                                                                            <parameter name="error-message" value="Error getting vlan-tag object from AAI" />
-                                                                                        </set>
+                                                                                    <block>
                                                                                         <block atomic="true">
                                                                                             <set>
                                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1318,21 +927,12 @@
                                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                                             </set>
                                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="Error getting vlan-tag object from AAI" />
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='success'>
@@ -1384,11 +984,7 @@
                             <outcome value=''>
                                 <switch test='`$db.vf-model.avail-zone-max-count &gt; 0`'>
                                     <outcome value='true'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'No availability zones found in AAI for cloud region '
-       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1396,21 +992,13 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'No availability zones found in AAI for cloud region '
+       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
+                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='false'>
@@ -1439,10 +1027,7 @@
                                     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-key" value="availability-zone.availability-zone-name" />
                                     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-value" value="`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`" />
                                     <outcome value='failure'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1450,28 +1035,16 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
+                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1479,21 +1052,12 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1515,10 +1079,7 @@
                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />
                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-nw-index].network-id`" />
                                     <outcome value='failure'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1526,28 +1087,16 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
+                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1555,21 +1104,12 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1601,10 +1141,7 @@
                             <parameter name="in-maint" value="true" />
                             <parameter name="selflink" value="`$vnf-object-path`" />
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error updating selflink in generic-vnf in AAI" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1612,28 +1149,16 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error updating selflink in generic-vnf in AAI" />
+                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='not-found'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1641,21 +1166,12 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                    </return>
                                 </block>
                             </outcome>
                         </update>
@@ -1670,10 +1186,7 @@
       value="`'/aai/v$/network/instance-groups/instance-group/'
         + $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id`" />
                                     <outcome value='failure'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="Error updating relationship in generic-vnf in AAI" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1681,28 +1194,16 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error updating relationship in generic-vnf in AAI" />
+                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1710,21 +1211,12 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-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'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1742,84 +1234,9 @@
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
                         </set>
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'vnf-data-assign.json'`" />
-                            <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.vnf.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="vnf-assign" />
-                            <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error doing PUT of vnf-data" />
-                                    </set>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
-                                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
-                                        </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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 vnf-data" />
-                                    </set>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
-                                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
-                                        </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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-vnf.log' />
                         </execute>
-                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                            <parameter name="notification-url" value="`$vnf-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="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                            <parameter name="input.service-information.service-instance-id" value="`$vnf-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" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml
deleted file mode 100644
index 69175f2f..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='vnf-topology-operation-async' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='skip-mdsal-update' value='Y' />
-            </set>
-            <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
-                <outcome value='assign'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' ></call>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
-                    </return>
-                </outcome>
-            </switch>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index ecee104f..cabcce51 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
@@ -6,14 +6,7 @@
             <call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' ></call>
             <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='skip-mdsal-update' value='Y' />
-                        </set>
-                        <set>
-                            <parameter name='ack-final' value='N' />
-                        </set>
-                    </block>
+                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' ></call>
                 </outcome>
                 <outcome value='activate'>
                     <block atomic="true">
-- 
cgit 1.2.3-korg