generic-resource-api DG enhancement
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
index b7888ed..b9589a7 100755 (executable)
@@ -1,12 +1,20 @@
 <service-logic\r
     xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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}'>\r
+    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'>\r
     <method rpc='vf-module-topology-operation-assign' mode='sync'>\r
         <block atomic="true">\r
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
+            <set>\r
+                <parameter name="so.ack-final-indicator" value="Y" />\r
+                <parameter name="so.response-code" value="500" />\r
+                <parameter name="so.notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                <parameter name="so.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                <parameter name="so.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />\r
+                <parameter name="so.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />\r
+            </set>\r
             <switch test='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`'>\r
                 <outcome value=''>\r
                     <block></block>\r
                     <block></block>\r
                 </outcome>\r
                 <outcome value='Other'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'" />\r
-                    </return>\r
+                    <block atomic="true">\r
+                        <set>\r
+                            <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'" />\r
+                        </set>\r
+                        <block atomic='true'>\r
+                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`$error-message`" />\r
+                            </return>\r
+                        </block>\r
+                    </block>\r
                 </outcome>\r
             </switch>\r
             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
   key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid'\r
   pfx='db.vf-module-model'>\r
                 <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error reading VF_MODULE_MODEL table" />\r
-                    </return>\r
+                    <block atomic="true">\r
+                        <set>\r
+                            <parameter name="error-message" value="Error reading VF_MODULE_MODEL table" />\r
+                        </set>\r
+                        <block atomic='true'>\r
+                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`$error-message`" />\r
+                            </return>\r
+                        </block>\r
+                    </block>\r
                 </outcome>\r
                 <outcome value='not-found'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <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`" />\r
-                    </return>\r
+                    <block atomic="true">\r
+                        <set>\r
+                            <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`" />\r
+                        </set>\r
+                        <block atomic='true'>\r
+                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`$error-message`" />\r
+                            </return>\r
+                        </block>\r
+                    </block>\r
                 </outcome>\r
             </get-resource>\r
             <set>\r
             </set>\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
                 <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="There are no VNFs defined in MD-SAL" />\r
-                    </return>\r
+                    <block atomic="true">\r
+                        <set>\r
+                            <parameter name="error-message" value="There are no VNFs defined in MD-SAL" />\r
+                        </set>\r
+                        <block atomic='true'>\r
+                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`$error-message`" />\r
+                            </return>\r
+                        </block>\r
+                    </block>\r
                 </outcome>\r
                 <outcome value='Other'>\r
                     <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
             </switch>\r
             <switch test='`$vnf-index`'>\r
                 <outcome value='-1'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`" />\r
-                    </return>\r
+                    <block atomic="true">\r
+                        <set>\r
+                            <parameter name="error-message" value="`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`" />\r
+                        </set>\r
+                        <block atomic='true'>\r
+                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`$error-message`" />\r
+                            </return>\r
+                        </block>\r
+                    </block>\r
                 </outcome>\r
             </switch>\r
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-forking-logic' mode='sync' ></call>\r
                     <block atomic="true">\r
                         <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-assign' mode='sync' >\r
                             <outcome value='failure'>\r
-                                <return status='failure'>\r
-                                    <parameter name='ack-final' value='Y'/>\r
-                                    <parameter name="error-code" value="500" />\r
-                                    <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`" />\r
-                                </return>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <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`" />\r
+                                    </set>\r
+                                    <block atomic='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`$error-message`" />\r
+                                        </return>\r
+                                    </block>\r
+                                </block>\r
                             </outcome>\r
                         </call>\r
                         <set>\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\r
   value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\r
-  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
+  value='`$vf-module-topology-operation-input.request-information.request-action`' />\r
                         </set>\r
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
                             <parameter name='filename' value='/var/tmp/ss-vnfend.log' />\r
                         </execute>\r
+                        <set>\r
+                            <parameter name="so.response-code" value="200" />\r
+                        </set>\r
+                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
                         <return status='success'>\r
                             <parameter name="ack-final-indicator" value="Y" />\r
                             <parameter name="error-code" value="200" />\r
                                     <for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\r
                                         <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`'>\r
                                             <outcome value='true'>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='ack-final' value='Y'/>\r
-                                                    <parameter name="error-code" value="500" />\r
-                                                    <parameter name="error-message" value="`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id\r
+                                                <block atomic="true">\r
+                                                    <set>\r
+                                                        <parameter name="error-message" value="`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id\r
        + ' 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`" />\r
-                                                </return>\r
+                                                    </set>\r
+                                                    <block atomic='true'>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='ack-final' value='Y'/>\r
+                                                            <parameter name="error-code" value="500" />\r
+                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                        </return>\r
+                                                    </block>\r
+                                                </block>\r
                                             </outcome>\r
                                         </switch>\r
                                     </for>\r
                     cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region"\r
         pfx='aai.cloud-region' local-only='false' >\r
                             <outcome value='not-found'>\r
-                                <return status='failure'>\r
-                                    <parameter name='ack-final' value='Y'/>\r
-                                    <parameter name="error-code" value="500" />\r
-                                    <parameter name="error-message" value="Cloud region not found in AAI" />\r
-                                </return>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="Cloud region not found in AAI" />\r
+                                    </set>\r
+                                    <block atomic='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`$error-message`" />\r
+                                        </return>\r
+                                    </block>\r
+                                </block>\r
                             </outcome>\r
                             <outcome value='failure'>\r
-                                <return status='failure'>\r
-                                    <parameter name='ack-final' value='Y'/>\r
-                                    <parameter name="error-code" value="500" />\r
-                                    <parameter name="error-message" value="Error retrieving cloud region from AAI" />\r
-                                </return>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="Error retrieving cloud region from AAI.  Is AAI down?" />\r
+                                    </set>\r
+                                    <block atomic='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`$error-message`" />\r
+                                        </return>\r
+                                    </block>\r
+                                </block>\r
                             </outcome>\r
                         </get-resource>\r
                         <for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\r
                         </for>\r
                         <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`'>\r
                             <outcome value=''>\r
-                                <return status='failure'>\r
-                                    <parameter name='ack-final' value='Y'/>\r
-                                    <parameter name="error-code" value="500" />\r
-                                    <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`" />\r
-                                </return>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <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`" />\r
+                                    </set>\r
+                                    <block atomic='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`$error-message`" />\r
+                                        </return>\r
+                                    </block>\r
+                                </block>\r
                             </outcome>\r
                         </switch>\r
                         <switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >\r
                                     <outcome value='failure'>\r
                                         <block atomic="true">\r
-                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                            <return status='failure'></return>\r
+                                            <set>\r
+                                                <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`" />\r
+                                            </set>\r
+                                            <block atomic='true'>\r
+                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                <return status='failure'>\r
+                                                    <parameter name='ack-final' value='Y'/>\r
+                                                    <parameter name="error-code" value="500" />\r
+                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                </return>\r
+                                            </block>\r
                                         </block>\r
                                     </outcome>\r
                                 </call>\r
                                                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >\r
                                                         <outcome value='failure'>\r
                                                             <block atomic="true">\r
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                <return status='failure'></return>\r
+                                                                <set>\r
+                                                                    <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`" />\r
+                                                                </set>\r
+                                                                <block atomic='true'>\r
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                    <return status='failure'>\r
+                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                        <parameter name="error-code" value="500" />\r
+                                                                        <parameter name="error-message" value="`$error-message`" />\r
+                                                                    </return>\r
+                                                                </block>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </call>\r
                                                 </outcome>\r
                                                 <outcome value='Other'>\r
                                                     <block atomic="true">\r
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='ack-final' value='Y'/>\r
-                                                            <parameter name="error-code" value="500" />\r
+                                                        <set>\r
                                                             <parameter name="error-message" value="Error retrieving preload-information" />\r
-                                                        </return>\r
+                                                        </set>\r
+                                                        <block atomic='true'>\r
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                            <return status='failure'>\r
+                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                <parameter name="error-code" value="500" />\r
+                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                            </return>\r
+                                                        </block>\r
                                                     </block>\r
                                                 </outcome>\r
                                             </switch>\r
                                         <block>\r
                                             <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-preload' mode='sync' >\r
                                                 <outcome value='failure'>\r
-                                                    <block atomic="true">\r
+                                                    <block atomic='true'>\r
                                                         <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                        <return status='failure'></return>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='ack-final' value='Y'/>\r
+                                                            <parameter name="error-code" value="500" />\r
+                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                        </return>\r
                                                     </block>\r
                                                 </outcome>\r
                                             </call>\r
                                         <switch test='`$vnf-network-index`'>\r
                                             <outcome value='-1'>\r
                                                 <block atomic="true">\r
-                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
+                                                    <set>\r
                                                         <parameter name="error-message" value="`'VNFC network role '\r
       + $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\r
       + ' is not found in VNF network list'\r
       `" />\r
-                                                    </return>\r
+                                                    </set>\r
+                                                    <block atomic='true'>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='ack-final' value='Y'/>\r
+                                                            <parameter name="error-code" value="500" />\r
+                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                        </return>\r
+                                                    </block>\r
                                                 </block>\r
                                             </outcome>\r
                                         </switch>\r
                                                                                         <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`'>\r
                                                                                             <outcome value=''>\r
                                                                                                 <block atomic="true">\r
-                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                                    <return status='failure'>\r
-                                                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                                    <set>\r
                                                                                                         <parameter name="error-message" value="`'SDNC subnet id '\r
       + $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\r
       + ' does not have network-start-address populated'`" />\r
-                                                                                                    </return>\r
+                                                                                                    </set>\r
+                                                                                                    <block atomic='true'>\r
+                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                                        <return status='failure'>\r
+                                                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                                                                        </return>\r
+                                                                                                    </block>\r
                                                                                                 </block>\r
                                                                                             </outcome>\r
                                                                                             <outcome value='Other'>\r
                                                                                                 <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`'>\r
                                                                                                     <outcome value=''>\r
                                                                                                         <block atomic="true">\r
-                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                                            <return status='failure'>\r
-                                                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                            <set>\r
                                                                                                                 <parameter name="error-message" value="`'SDNC subnet id '\r
       + $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\r
       + ' does not have cidr-mask populated'`" />\r
-                                                                                                            </return>\r
+                                                                                                            </set>\r
+                                                                                                            <block atomic='true'>\r
+                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                                                <return status='failure'>\r
+                                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                                                                </return>\r
+                                                                                                            </block>\r
                                                                                                         </block>\r
                                                                                                     </outcome>\r
                                                                                                     <outcome value='Other'>\r
                                                                             <switch test='`$subnet-id`'>\r
                                                                                 <outcome value='-1'>\r
                                                                                     <block atomic="true">\r
-                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                        <set>\r
                                                                                             <parameter name="error-message" value="`'Not able to find VNF network subnet that contains address '\r
       + $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\r
       `" />\r
-                                                                                        </return>\r
+                                                                                        </set>\r
+                                                                                        <block atomic='true'>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                            <return status='failure'>\r
+                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                                            </return>\r
+                                                                                        </block>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                             </switch>\r
     and network_role = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-role'\r
   pfx='db.vnf-related-network-role[]'>\r
                                             <outcome value='failure'>\r
-                                                <block>\r
-                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
+                                                <block atomic='true'>\r
+                                                    <set>\r
                                                         <parameter name="error-message" value="Error reading VFC_RELATED_NETWORK_ROLE table" />\r
-                                                    </return>\r
+                                                    </set>\r
+                                                    <block atomic='true'>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='ack-final' value='Y'/>\r
+                                                            <parameter name="error-code" value="500" />\r
+                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                        </return>\r
+                                                    </block>\r
                                                 </block>\r
                                             </outcome>\r
                                             <outcome value='success'>\r
                                                         </for>\r
                                                         <switch test='`$found-related-network`'>\r
                                                             <outcome value='false'>\r
-                                                                <block>\r
-                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                    <return status='failure'>\r
-                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                        <parameter name="error-code" value="500" />\r
+                                                                <block atomic='true'>\r
+                                                                    <set>\r
                                                                         <parameter name="error-message" value="`'Unable to find related network '\r
       + $db.vnf-related-network-role[$db-related-network-index].related-network-role + ' in vnf-networks'`" />\r
-                                                                    </return>\r
+                                                                    </set>\r
+                                                                    <block atomic='true'>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                        <return status='failure'>\r
+                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                            <parameter name="error-code" value="500" />\r
+                                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                                        </return>\r
+                                                                    </block>\r
                                                                 </block>\r
                                                             </outcome>\r
                                                         </switch>\r
                             <parameter name="automated-assignment" value="`$automated-assignment`" />\r
                             <outcome value='failure'>\r
                                 <block atomic="true">\r
-                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
+                                    <set>\r
                                         <parameter name="error-message" value="Error updating vf-module in AAI" />\r
-                                    </return>\r
+                                    </set>\r
+                                    <block atomic='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`$error-message`" />\r
+                                        </return>\r
+                                    </block>\r
                                 </block>\r
                             </outcome>\r
                             <outcome value='not-found'>\r
                                 <block atomic="true">\r
-                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
+                                    <set>\r
                                         <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`" />\r
-                                    </return>\r
+                                    </set>\r
                                 </block>\r
                             </outcome>\r
                         </update>\r
                                                     <parameter name="prov-status" value="`PREPROV`" />\r
                                                     <outcome value='failure'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
+                                                            <set>\r
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />\r
-                                                            </return>\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                     <outcome value='not-found'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
+                                                            <set>\r
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />\r
-                                                            </return>\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </save>\r
                                                     <parameter name="prov-status" value="`PREPROV`" />\r
                                                     <outcome value='failure'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
+                                                            <set>\r
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />\r
-                                                            </return>\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                     <outcome value='not-found'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
+                                                            <set>\r
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />\r
-                                                            </return>\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </save>\r
         $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`" />\r
                                             <outcome value='failure'>\r
                                                 <block atomic="true">\r
-                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
+                                                    <set>\r
                                                         <parameter name="error-message" value="Error updating vnfc relationships in AAI" />\r
-                                                    </return>\r
+                                                    </set>\r
+                                                    <block atomic='true'>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='ack-final' value='Y'/>\r
+                                                            <parameter name="error-code" value="500" />\r
+                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                        </return>\r
+                                                    </block>\r
                                                 </block>\r
                                             </outcome>\r
                                             <outcome value='not-found'>\r
                                                 <block atomic="true">\r
-                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
+                                                    <set>\r
                                                         <parameter name="error-message" value="Not-found error updating vnfc relationships" />\r
-                                                    </return>\r
+                                                    </set>\r
+                                                    <block atomic='true'>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='ack-final' value='Y'/>\r
+                                                            <parameter name="error-code" value="500" />\r
+                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                        </return>\r
+                                                    </block>\r
                                                 </block>\r
                                             </outcome>\r
                                         </save>\r
                                                     <parameter name="port-id" value="0" />\r
                                                     <outcome value='failure'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="Error creating cp object in AAI" />\r
-                                                            </return>\r
+                                                            <set>\r
+                                                                <parameter name="error-message" value="Error saving cp object to AAI" />\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                     <outcome value='not-found'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="Error creating cp object in AAI" />\r
-                                                            </return>\r
+                                                            <set>\r
+                                                                <parameter name="error-message" value="Error saving cp object to AAI" />\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </save>\r
                                                                                 <parameter name="is-floating" value="false" />\r
                                                                                 <outcome value='failure'>\r
                                                                                     <block atomic="true">\r
-                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                        <set>\r
                                                                                             <parameter name="error-message" value="Error creating l3-interface-ipv4-address-list object in AAI" />\r
-                                                                                        </return>\r
+                                                                                        </set>\r
+                                                                                        <block atomic='true'>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                            <return status='failure'>\r
+                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                                            </return>\r
+                                                                                        </block>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                             </save>\r
         $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`" />\r
                                                                                 <outcome value='failure'>\r
                                                                                     <block atomic="true">\r
-                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                        <set>\r
                                                                                             <parameter name="error-message" value="Error updating l3-interface-ipv4-address-list relationships in AAI" />\r
-                                                                                        </return>\r
+                                                                                        </set>\r
+                                                                                        <block atomic='true'>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                            <return status='failure'>\r
+                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                                            </return>\r
+                                                                                        </block>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                                 <outcome value='not-found'>\r
                                                                                     <block atomic="true">\r
-                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                        <set>\r
                                                                                             <parameter name="error-message" value="Not-found error updating l3-interface-ipv4-address-list relationships" />\r
-                                                                                        </return>\r
+                                                                                        </set>\r
+                                                                                        <block atomic='true'>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                            <return status='failure'>\r
+                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                                            </return>\r
+                                                                                        </block>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                             </save>\r
                                                                                 <parameter name="is-floating" value="false" />\r
                                                                                 <outcome value='failure'>\r
                                                                                     <block atomic="true">\r
-                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                        <set>\r
                                                                                             <parameter name="error-message" value="Error creating l3-interface-ipv6-address-list object in AAI" />\r
-                                                                                        </return>\r
+                                                                                        </set>\r
+                                                                                        <block atomic='true'>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                            <return status='failure'>\r
+                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                                            </return>\r
+                                                                                        </block>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                             </save>\r
         $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`" />\r
                                                                                 <outcome value='failure'>\r
                                                                                     <block atomic="true">\r
-                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                        <set>\r
                                                                                             <parameter name="error-message" value="Error updating l3-interface-ipv6-address-list relationships in AAI" />\r
-                                                                                        </return>\r
+                                                                                        </set>\r
+                                                                                        <block atomic='true'>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                            <return status='failure'>\r
+                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                                            </return>\r
+                                                                                        </block>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                                 <outcome value='not-found'>\r
                                                                                     <block atomic="true">\r
-                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                        <set>\r
                                                                                             <parameter name="error-message" value="Not-found error updating l3-interface-ipv6-address-list relationships" />\r
-                                                                                        </return>\r
+                                                                                        </set>\r
+                                                                                        <block atomic='true'>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                            <return status='failure'>\r
+                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                                            </return>\r
+                                                                                        </block>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                             </save>\r
         $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].network-id`" />\r
                                                                 <outcome value='failure'>\r
                                                                     <block atomic="true">\r
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                        <return status='failure'>\r
-                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                            <parameter name="error-code" value="500" />\r
+                                                                        <set>\r
                                                                             <parameter name="error-message" value="Error updating cp relationship to l3-network in AAI" />\r
-                                                                        </return>\r
+                                                                        </set>\r
+                                                                        <block atomic='true'>\r
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                            <return status='failure'>\r
+                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                <parameter name="error-code" value="500" />\r
+                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                            </return>\r
+                                                                        </block>\r
                                                                     </block>\r
                                                                 </outcome>\r
                                                                 <outcome value='not-found'>\r
                                                                     <block atomic="true">\r
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                        <return status='failure'>\r
-                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                            <parameter name="error-code" value="500" />\r
+                                                                        <set>\r
                                                                             <parameter name="error-message" value="Not-found error updating cp relationship to l3-network" />\r
-                                                                        </return>\r
+                                                                        </set>\r
+                                                                        <block atomic='true'>\r
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                            <return status='failure'>\r
+                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                <parameter name="error-code" value="500" />\r
+                                                                                <parameter name="error-message" value="`$error-message`" />\r
+                                                                            </return>\r
+                                                                        </block>\r
                                                                     </block>\r
                                                                 </outcome>\r
                                                             </save>\r
         $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`" />\r
                                                                     <outcome value='failure'>\r
                                                                         <block atomic="true">\r
-                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                            <return status='failure'>\r
-                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                <parameter name="error-code" value="500" />\r
+                                                                            <set>\r
                                                                                 <parameter name="error-message" value="Error updating cp relationship to l3-network and vlan-tag in AAI" />\r
-                                                                            </return>\r
+                                                                            </set>\r
+                                                                            <block atomic='true'>\r
+                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                <return status='failure'>\r
+                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                                </return>\r
+                                                                            </block>\r
                                                                         </block>\r
                                                                     </outcome>\r
                                                                     <outcome value='not-found'>\r
                                                                         <block atomic="true">\r
-                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                            <return status='failure'>\r
-                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                <parameter name="error-code" value="500" />\r
+                                                                            <set>\r
                                                                                 <parameter name="error-message" value="Not-found error updating cp relationship to l3-network and vlan-tag" />\r
-                                                                            </return>\r
+                                                                            </set>\r
+                                                                            <block atomic='true'>\r
+                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                <return status='failure'>\r
+                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                                </return>\r
+                                                                            </block>\r
                                                                         </block>\r
                                                                     </outcome>\r
                                                                 </save>\r
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`" />\r
                                             <outcome value='failure'>\r
                                                 <block atomic="true">\r
-                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
+                                                    <set>\r
                                                         <parameter name="error-message" value="Error updating vf-module relationships in AAI" />\r
-                                                    </return>\r
+                                                    </set>\r
+                                                    <block atomic='true'>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='ack-final' value='Y'/>\r
+                                                            <parameter name="error-code" value="500" />\r
+                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                        </return>\r
+                                                    </block>\r
                                                 </block>\r
                                             </outcome>\r
                                             <outcome value='not-found'>\r
                                                 <block atomic="true">\r
-                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
+                                                    <set>\r
                                                         <parameter name="error-message" value="`'No l3-network found in AAI for network ID '\r
       + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`" />\r
-                                                    </return>\r
+                                                    </set>\r
+                                                    <block atomic='true'>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='ack-final' value='Y'/>\r
+                                                            <parameter name="error-code" value="500" />\r
+                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                        </return>\r
+                                                    </block>\r
                                                 </block>\r
                                             </outcome>\r
                                         </save>\r
                                                     <parameter name="is-floating" value="false" />\r
                                                     <outcome value='failure'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
+                                                            <set>\r
                                                                 <parameter name="error-message" value="Error saving vip-ipv4-address-list in AAI" />\r
-                                                            </return>\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                     <outcome value='not-found'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
+                                                            <set>\r
                                                                 <parameter name="error-message" value="Not-found error saving vip-ipv4-address-list" />\r
-                                                            </return>\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </save>\r
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`" />\r
                                                             <outcome value='failure'>\r
                                                                 <block atomic="true">\r
-                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                    <return status='failure'>\r
-                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                        <parameter name="error-code" value="500" />\r
+                                                                    <set>\r
                                                                         <parameter name="error-message" value="Error updating vip-ipv4-address-list relationships in AAI" />\r
-                                                                    </return>\r
+                                                                    </set>\r
+                                                                    <block atomic='true'>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                        <return status='failure'>\r
+                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                            <parameter name="error-code" value="500" />\r
+                                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                                        </return>\r
+                                                                    </block>\r
                                                                 </block>\r
                                                             </outcome>\r
                                                             <outcome value='not-found'>\r
                                                                 <block atomic="true">\r
-                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                    <return status='failure'>\r
-                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                        <parameter name="error-code" value="500" />\r
+                                                                    <set>\r
                                                                         <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationships" />\r
-                                                                    </return>\r
+                                                                    </set>\r
+                                                                    <block atomic='true'>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                        <return status='failure'>\r
+                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                            <parameter name="error-code" value="500" />\r
+                                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                                        </return>\r
+                                                                    </block>\r
                                                                 </block>\r
                                                             </outcome>\r
                                                         </save>\r
         + $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`" />\r
                                                                         <outcome value='failure'>\r
                                                                             <block atomic="true">\r
-                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                <return status='failure'>\r
-                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                <set>\r
                                                                                     <parameter name="error-message" value="Error updating vip-ipv4-address-list relationship to cp in AAI" />\r
-                                                                                </return>\r
+                                                                                </set>\r
+                                                                                <block atomic='true'>\r
+                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                    <return status='failure'>\r
+                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                        <parameter name="error-message" value="`$error-message`" />\r
+                                                                                    </return>\r
+                                                                                </block>\r
                                                                             </block>\r
                                                                         </outcome>\r
                                                                         <outcome value='not-found'>\r
                                                                             <block atomic="true">\r
-                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                                <return status='failure'>\r
-                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                <set>\r
                                                                                     <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationship to cp" />\r
-                                                                                </return>\r
+                                                                                </set>\r
+                                                                                <block atomic='true'>\r
+                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                    <return status='failure'>\r
+                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                        <parameter name="error-message" value="`$error-message`" />\r
+                                                                                    </return>\r
+                                                                                </block>\r
                                                                             </block>\r
                                                                         </outcome>\r
                                                                     </save>\r
                                                     <parameter name="is-floating" value="false" />\r
                                                     <outcome value='failure'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
+                                                            <set>\r
                                                                 <parameter name="error-message" value="Error saving vip-ipv6-address-list in AAI" />\r
-                                                            </return>\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                     <outcome value='not-found'>\r
                                                         <block atomic="true">\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
+                                                            <set>\r
                                                                 <parameter name="error-message" value="Not-found error saving vip-ipv6-address-list" />\r
-                                                            </return>\r
+                                                            </set>\r
+                                                            <block atomic='true'>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`$error-message`" />\r
+                                                                </return>\r
+                                                            </block>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </save>\r
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`" />\r
                                                             <outcome value='failure'>\r
                                                                 <block atomic="true">\r
-                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                    <return status='failure'>\r
-                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                        <parameter name="error-code" value="500" />\r
+                                                                    <set>\r
                                                                         <parameter name="error-message" value="Error updating vip-ipv6-address-list relationships in AAI" />\r
-                                                                    </return>\r
+                                                                    </set>\r
+                                                                    <block atomic='true'>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                        <return status='failure'>\r
+                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                            <parameter name="error-code" value="500" />\r
+                                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                                        </return>\r
+                                                                    </block>\r
                                                                 </block>\r
                                                             </outcome>\r
                                                             <outcome value='not-found'>\r
                                                                 <block atomic="true">\r
-                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
-                                                                    <return status='failure'>\r
-                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                        <parameter name="error-code" value="500" />\r
+                                                                    <set>\r
                                                                         <parameter name="error-message" value="Not-found error updating vip-ipv6-address-list relationships" />\r
-                                                                    </return>\r
+                                                                    </set>\r
+                                                                    <block atomic='true'>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                        <return status='failure'>\r
+                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                            <parameter name="error-code" value="500" />\r
+                                                                            <parameter name="error-message" value="`$error-message`" />\r
+                                                                        </return>\r
+                                                                    </block>\r
                                                                 </block>\r
                                                             </outcome>\r
                                                         </save>\r
         + $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`" />\r
                                                                         <outcome value='failure'>\r
                                                                             <block atomic="true">\r
-                                                                                <return status='failure'>\r
-                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                <set>\r
                                                                                     <parameter name="error-message" value="Error updating vip-ipv4-address-list relationship to cp in AAI" />\r
-                                                                                </return>\r
+                                                                                </set>\r
+                                                                                <block atomic='true'>\r
+                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                    <return status='failure'>\r
+                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                        <parameter name="error-message" value="`$error-message`" />\r
+                                                                                    </return>\r
+                                                                                </block>\r
                                                                             </block>\r
                                                                         </outcome>\r
                                                                         <outcome value='not-found'>\r
                                                                             <block atomic="true">\r
-                                                                                <return status='failure'>\r
-                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                <set>\r
                                                                                     <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationship to cp" />\r
-                                                                                </return>\r
+                                                                                </set>\r
+                                                                                <block atomic='true'>\r
+                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                                                                    <return status='failure'>\r
+                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                        <parameter name="error-message" value="`$error-message`" />\r
+                                                                                    </return>\r
+                                                                                </block>\r
                                                                             </block>\r
                                                                         </outcome>\r
                                                                     </save>\r
                         <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-vlan-tagging-assign' mode='sync' >\r
                             <outcome value='failure'>\r
                                 <block atomic="true">\r
-                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
                                         <parameter name='filename' value='/var/tmp/bgb-vlantaggingfailure.log' />\r
                                     </execute>\r
-                                    <return status='failure'></return>\r
+                                    <block atomic='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`$error-message`" />\r
+                                        </return>\r
+                                    </block>\r
                                 </block>\r
                             </outcome>\r
                         </call>\r
@@ -1408,7 +1771,6 @@ 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-request-input.'\r
    value='$vf-module-topology-operation-input.vf-module-request-input.' />\r
                         </set>\r
-                        <call module='GENERIC-RESOURCE-API' rpc='gw-vfmodule-update' mode='sync' ></call>\r
                         <set>\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'\r
   value='PendingCreate' />\r
@@ -1417,9 +1779,76 @@ 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'\r
   value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
                         </set>\r
+                        <set>\r
+                            <parameter name='vf-module-data.'\r
+  value='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.' />\r
+                        </set>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                            <parameter name="source" value="`$prop.restapi.vf-module`"/>\r
+                            <parameter name="outputPath" value="tmp.part"/>\r
+                            <parameter name="target" value="{service-instance-id}"/>\r
+                            <parameter name="replacement" value="`$service-data.service-topology.service-topology-identifier.service-instance-id`"/>\r
+                        </execute>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                            <parameter name="source" value="`$tmp.part`"/>\r
+                            <parameter name="outputPath" value="tmp.part"/>\r
+                            <parameter name="target" value="{vnf-id}"/>\r
+                            <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>\r
+                        </execute>\r
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                            <parameter name="source" value="`$tmp.part`"/>\r
+                            <parameter name="outputPath" value="tmp.vf-module.url"/>\r
+                            <parameter name="target" value="{vf-module-id}"/>\r
+                            <parameter name="replacement" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`"/>\r
+                        </execute>\r
+                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'vf-module-assign.json'`" />\r
+                            <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.vf-module.url`" />\r
+                            <parameter name='restapiUser' value='`$prop.controller.user`' />\r
+                            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
+                            <parameter name='format' value='json' />\r
+                            <parameter name='httpMethod' value='PUT' />\r
+                            <parameter name="responsePrefix" value="vf-module-assign" />\r
+                            <outcome value='failure'>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="Error doing PUT of vf-module" />\r
+                                    </set>\r
+                                    <block atomic='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`$error-message`" />\r
+                                        </return>\r
+                                    </block>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='not-found'>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="Error doing PUT of vf-module" />\r
+                                    </set>\r
+                                    <block atomic='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`$error-message`" />\r
+                                        </return>\r
+                                    </block>\r
+                                </block>\r
+                            </outcome>\r
+                        </execute>\r
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
                             <parameter name='filename' value='/var/tmp/bgb-vfmodule.log' />\r
                         </execute>\r
+                        <set>\r
+                            <parameter name="so.response-code" value="200" />\r
+                        </set>\r
+                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>\r
                         <return status='success'>\r
                             <parameter name="ack-final-indicator" value="Y" />\r
                             <parameter name="error-code" value="200" />\r
@@ -1430,4 +1859,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
             </switch>\r
         </block>\r
     </method>\r
-</service-logic>\r
+</service-logic>
\ No newline at end of file