GRAPI DG enhancement
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
index 1433b7b..0b90096 100755 (executable)
                     <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 'CreateVnfInstance'" />\r
-                    </return>\r
+                    <block atomic="true">\r
+                        <set>\r
+                            <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVnfInstance'" />\r
+                        </set>\r
+                        <block atomic='true'>\r
+                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                <parameter name="input.ack-final-indicator" value="Y" />\r
+                                <parameter name="input.response-code" value="500" />\r
+                                <parameter name="input.response-message" value="`$error-message`" />\r
+                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                            </configure>\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_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\r
   pfx='db.vf-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_MODEL table" />\r
-                    </return>\r
+                    <block atomic="true">\r
+                        <set>\r
+                            <parameter name="error-message" value="Error reading VF_MODEL table" />\r
+                        </set>\r
+                        <block atomic='true'>\r
+                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                <parameter name="input.ack-final-indicator" value="Y" />\r
+                                <parameter name="input.response-code" value="500" />\r
+                                <parameter name="input.response-message" value="`$error-message`" />\r
+                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                            </configure>\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 VNF customization UUID ' + $vnf-topology-operation-input.vnf-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 VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`" />\r
+                        </set>\r
+                        <block atomic='true'>\r
+                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                <parameter name="input.ack-final-indicator" value="Y" />\r
+                                <parameter name="input.response-code" value="500" />\r
+                                <parameter name="input.response-message" value="`$error-message`" />\r
+                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                            </configure>\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
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' ></call>\r
                     <block atomic="true">\r
                         <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-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 vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-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 vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`" />\r
+                                    </set>\r
+                                    <block atomic='true'>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
                             <parameter name='filename' value='/var/tmp/ss-vnfend.log' />\r
                         </execute>\r
+                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                            <parameter name="input.response-code" value="200" />\r
+                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                        </configure>\r
                         <return status='success'>\r
                             <parameter name="ack-final-indicator" value="Y" />\r
                             <parameter name="error-code" value="200" />\r
                                 </set>\r
                             </outcome>\r
                             <outcome value='Other'>\r
-                                <block>\r
+                                <block atomic='true'>\r
                                     <set>\r
                                         <parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\r
                                     </set>\r
                                     <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
                                         <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-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="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\r
+                                                <block atomic="true">\r
+                                                    <set>\r
+                                                        <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\r
       + ' already exists'`" />\r
-                                                </return>\r
+                                                    </set>\r
+                                                    <block atomic='true'>\r
+                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                            <parameter name="input.response-code" value="500" />\r
+                                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                        </configure>\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
                key="instance-group.id = $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id"\r
         pfx='aai.instance-group' 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="`'Cannot find instance group id ' +\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="`'Cannot find instance group id ' +\r
       $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\r
       + ' in AAI'`" />\r
-                                        </return>\r
+                                            </set>\r
+                                            <block atomic='true'>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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 instance-group from AAI" />\r
-                                        </return>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="Error retrieving instance-group from AAI" />\r
+                                            </set>\r
+                                            <block atomic='true'>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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='rel-index' start='0' end='`$aai.instance-group.relationship-list.relationship_length`' >\r
                key="collection.collection-id = $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"\r
         pfx='aai.collection' 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="`'Cannot find collection ' +\r
-      $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\r
-      + ' in AAI'`" />\r
-                                                    </return>\r
+                                                    <block atomic="true">\r
+                                                        <set>\r
+                                                            <parameter name="error-message" value="`'Unable to find AAI relationship from collection '\r
+      + $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\r
+      + ' to service instance'`" />\r
+                                                        </set>\r
+                                                        <block atomic='true'>\r
+                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                <parameter name="input.response-code" value="500" />\r
+                                                                <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                            </configure>\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="System error retrieving collection from AAI" />\r
-                                                    </return>\r
+                                                    <block atomic="true">\r
+                                                        <set>\r
+                                                            <parameter name="error-message" value="`'Failed to get network service instance '\r
+      + $network-service-instance + ' from MD-SAL'`" />\r
+                                                        </set>\r
+                                                        <block atomic='true'>\r
+                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                <parameter name="input.response-code" value="500" />\r
+                                                                <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                            </configure>\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
                                                     <block atomic="true">\r
                                                         </for>\r
                                                         <switch test='`$found-network-instance-group`'>\r
                                                             <outcome value='false'>\r
-                                                                <return status='failure'>\r
-                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                    <parameter name="error-code" value="500" />\r
-                                                                    <parameter name="error-message" value="`'Could not find network instance group ' +\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name="error-message" value="`'Could not find network instance group ' +\r
       $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\r
-      + ' in MD-SAL'`" />\r
-                                                                </return>\r
+      + ' in MD-SAL service instance '\r
+      + $network-service-instance`" />\r
+                                                                    </set>\r
+                                                                    <block atomic='true'>\r
+                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                            <parameter name="input.response-code" value="500" />\r
+                                                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                        </configure>\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
                                                         <set>\r
                                             <block></block>\r
                                         </outcome>\r
                                         <outcome value='N'>\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 vnf-name was received but ecomp-generated-naming is not Y" />\r
-                                            </return>\r
+                                            <block atomic="true">\r
+                                                <set>\r
+                                                    <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />\r
+                                                </set>\r
+                                                <block>\r
+                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                        <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                        <parameter name="input.response-code" value="500" />\r
+                                                        <parameter name="input.response-message" value="`$error-message`" />\r
+                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                    </configure>\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
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />\r
-                                            </return>\r
+                                            <block atomic="true">\r
+                                                <set>\r
+                                                    <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />\r
+                                                </set>\r
+                                                <block>\r
+                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                        <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                        <parameter name="input.response-code" value="500" />\r
+                                                        <parameter name="input.response-message" value="`$error-message`" />\r
+                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                    </configure>\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='`$db.vf-model.naming-policy`'>\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' 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="`$generate-unique-name-output.error-message`" />\r
-                                                        </return>\r
+                                                        <block atomic="true">\r
+                                                            <set>\r
+                                                                <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />\r
+                                                            </set>\r
+                                                            <block>\r
+                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                    <parameter name="input.response-code" value="500" />\r
+                                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                </configure>\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
                                                         <set>\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' 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="Unable to generate VNF name" />\r
-                                                        </return>\r
+                                                        <block atomic="true">\r
+                                                            <set>\r
+                                                                <parameter name="error-message" value="Unable to generate VNF name" />\r
+                                                            </set>\r
+                                                            <block>\r
+                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                    <parameter name="input.response-code" value="500" />\r
+                                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                </configure>\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
                                                         <set>\r
                     depth='all'"\r
         pfx='aai.cloud-region' local-only='false' >\r
                             <outcome value='not-found'>\r
-                                <block>\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
                                         <set>\r
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                         </set>\r
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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
-                                    <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>\r
                             </outcome>\r
                             <outcome value='failure'>\r
-                                <block>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="Error retrieving cloud region from AAI" />\r
+                                    </set>\r
                                     <block atomic="true">\r
                                         <set>\r
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                         </set>\r
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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
-                                    <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>\r
                             </outcome>\r
                         </get-resource>\r
                         </for>\r
                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli`'>\r
                             <outcome value=''>\r
-                                <block>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />\r
+                                    </set>\r
                                     <block atomic="true">\r
                                         <set>\r
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                         </set>\r
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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
-                                    <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 ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />\r
-                                    </return>\r
                                 </block>\r
                             </outcome>\r
                         </switch>\r
   key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\r
   pfx='db.vf-network-role-mapping[]'>\r
                             <outcome value='failure'>\r
-                                <block>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="Error reading VF_TO_NETWORK_ROLE_MAPPING table" />\r
+                                    </set>\r
                                     <block atomic="true">\r
                                         <set>\r
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                         </set>\r
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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
-                                    <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_TO_NETWORK_ROLE_MAPPING table" />\r
-                                    </return>\r
                                 </block>\r
                             </outcome>\r
                             <outcome value='not-found'>\r
         pfx='aai.l3-network' local-only='false'\r
 >\r
                                             <outcome value='not-found'>\r
-                                                <block>\r
+                                                <block atomic="true">\r
+                                                    <set>\r
+                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />\r
+                                                    </set>\r
                                                     <block atomic="true">\r
                                                         <set>\r
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                         </set>\r
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                            <parameter name="input.response-code" value="500" />\r
+                                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                        </configure>\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
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="`'No active l3-network found in AAI with cloud_region_id '\r
-          + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + ' and network_role '\r
-          + $db.vf-network-role-mapping[$network-index].network-role`" />\r
-                                                    </return>\r
                                                 </block>\r
                                             </outcome>\r
                                             <outcome value='failure'>\r
-                                                <block>\r
+                                                <block atomic="true">\r
+                                                    <set>\r
+                                                        <parameter name="error-message" value="Error retrieving l3-network from AAI" />\r
+                                                    </set>\r
                                                     <block atomic="true">\r
                                                         <set>\r
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                         </set>\r
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                            <parameter name="input.response-code" value="500" />\r
+                                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                        </configure>\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
-                                                    <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 l3-network from AAI" />\r
-                                                    </return>\r
                                                 </block>\r
                                             </outcome>\r
                                         </get-resource>\r
                                         </block>\r
                                         <switch test='`$l3-network-id`'>\r
                                             <outcome value='-1'>\r
-                                                <block>\r
+                                                <block atomic="true">\r
+                                                    <set>\r
+                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />\r
+                                                    </set>\r
                                                     <block atomic="true">\r
                                                         <set>\r
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                         </set>\r
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                            <parameter name="input.response-code" value="500" />\r
+                                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                        </configure>\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
-                                                    <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 l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />\r
-                                                    </return>\r
                                                 </block>\r
                                             </outcome>\r
                                         </switch>\r
     and network_role = $db.vf-network-role-mapping[$role-index].network-role'\r
   pfx='db.vnf-related-network-role[]'>\r
                                             <outcome value='failure'>\r
-                                                <block>\r
+                                                <block atomic="true">\r
+                                                    <set>\r
+                                                        <parameter name="error-message" value="Error reading VNF_RELATED_NETWORK_ROLE table" />\r
+                                                    </set>\r
                                                     <block atomic="true">\r
                                                         <set>\r
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                         </set>\r
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                            <parameter name="input.response-code" value="500" />\r
+                                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                        </configure>\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
-                                                    <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 VNF_RELATED_NETWORK_ROLE table" />\r
-                                                    </return>\r
                                                 </block>\r
                                             </outcome>\r
                                             <outcome value='success'>\r
                                                         <parameter name='httpMethod' value='GET' />\r
                                                         <parameter name="responsePrefix" value="mdsal-ntis" />\r
                                                         <outcome value='failure'>\r
-                                                            <block>\r
+                                                            <block atomic="true">\r
+                                                                <set>\r
+                                                                    <parameter name="error-message" value="`\r
+    'Error retrieving network-topology-identifier-structure for service instance '\r
+    + $network-service-instance-id\r
+    + ' and network-id '\r
+    + $l3-network-id`" />\r
+                                                                </set>\r
                                                                 <block atomic="true">\r
                                                                     <set>\r
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                                     </set>\r
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                        <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                        <parameter name="input.response-code" value="500" />\r
+                                                                        <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                    </configure>\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
-                                                                <return status='failure'>\r
-                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                    <parameter name="error-code" value="500" />\r
-                                                                    <parameter name="error-message" value="`\r
-    'Error retrieving network-topology-identifier-structure for service instance '\r
-    + $network-service-instance-id\r
-    + ' and network-id '\r
-    + $l3-network-id`" />\r
-                                                                </return>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </execute>\r
                                                         <parameter name="start_length" value="1" />\r
                                                         <parameter name="query" value="/query/owning-entity-fromService-instance" />\r
                                                         <outcome value='failure'>\r
-                                                            <block>\r
+                                                            <block atomic="true">\r
+                                                                <set>\r
+                                                                    <parameter name="error-message" value="Error getting owning entity from service instance" />\r
+                                                                </set>\r
                                                                 <block atomic="true">\r
                                                                     <set>\r
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                                     </set>\r
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                        <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                        <parameter name="input.response-code" value="500" />\r
+                                                                        <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                    </configure>\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
-                                                                <return status='failure'>\r
-                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                    <parameter name="error-code" value="500" />\r
-                                                                    <parameter name="error-message" value="Error getting owning entity from service instance" />\r
-                                                                </return>\r
                                                             </block>\r
                                                         </outcome>\r
                                                         <outcome value='not-found'>\r
-                                                            <block>\r
+                                                            <block atomic="true">\r
+                                                                <set>\r
+                                                                    <parameter name="error-message" value="Unable to find owning entity from service instance" />\r
+                                                                </set>\r
                                                                 <block atomic="true">\r
                                                                     <set>\r
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                                     </set>\r
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                        <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                        <parameter name="input.response-code" value="500" />\r
+                                                                        <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                    </configure>\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
-                                                                <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 owning entity from service instance" />\r
-                                                                </return>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </save>\r
                                                                 <parameter name="query" value="`'/query/getNetworks?networkRole=' + $db.vnf-related-network-role[$rel-network-role-index].related-network-role\r
   + '&amp;cloudRegionId=' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />\r
                                                                 <outcome value='failure'>\r
-                                                                    <block>\r
+                                                                    <block atomic="true">\r
+                                                                        <set>\r
+                                                                            <parameter name="error-message" value="Error calling getNetworks custom query in AAI" />\r
+                                                                        </set>\r
                                                                         <block atomic="true">\r
                                                                             <set>\r
                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                                             </set>\r
                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                                <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                                <parameter name="input.response-code" value="500" />\r
+                                                                                <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                            </configure>\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
-                                                                        <return status='failure'>\r
-                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                            <parameter name="error-code" value="500" />\r
-                                                                            <parameter name="error-message" value="Error calling getNetworks custom query in AAI" />\r
-                                                                        </return>\r
                                                                     </block>\r
                                                                 </outcome>\r
                                                                 <outcome value='not-found'>\r
-                                                                    <block>\r
+                                                                    <block atomic="true">\r
+                                                                        <set>\r
+                                                                            <parameter name="error-message" value="`'No l3-network returned from getNetworks custom query for related network role '\r
+      + $db.vnf-related-network-role[0].related-network-role`" />\r
+                                                                        </set>\r
                                                                         <block atomic="true">\r
                                                                             <set>\r
                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                                             </set>\r
                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                                <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                                <parameter name="input.response-code" value="500" />\r
+                                                                                <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                            </configure>\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
-                                                                        <return status='failure'>\r
-                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                            <parameter name="error-code" value="500" />\r
-                                                                            <parameter name="error-message" value="`'No l3-network returned from getNetworks custom query for related network role '\r
-      + $db.vnf-related-network-role[0].related-network-role`" />\r
-                                                                        </return>\r
                                                                     </block>\r
                                                                 </outcome>\r
                                                             </save>\r
         pfx='aai.vlan-tag' local-only='false'\r
 >\r
                                                                                 <outcome value='failure'>\r
-                                                                                    <block>\r
+                                                                                    <block atomic="true">\r
+                                                                                        <set>\r
+                                                                                            <parameter name="error-message" value="Error getting vlan-tag object from AAI" />\r
+                                                                                        </set>\r
                                                                                         <block atomic="true">\r
                                                                                             <set>\r
                                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                                                             </set>\r
                                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                                                                <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                                                                <parameter name="input.response-code" value="500" />\r
+                                                                                                <parameter name="input.response-message" value="`$error-message`" />\r
+                                                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                                                            </configure>\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
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
-                                                                                            <parameter name="error-message" value="Error getting vlan-tag object from AAI" />\r
-                                                                                        </return>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                                 <outcome value='success'>\r
                             <outcome value=''>\r
                                 <switch test='`$db.vf-model.avail-zone-max-count &gt; 0`'>\r
                                     <outcome value='true'>\r
-                                        <block>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="`'No availability zones found in AAI for cloud region '\r
+       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />\r
+                                            </set>\r
                                             <block atomic="true">\r
                                                 <set>\r
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="`'No availability zones found in AAI for cloud region '\r
-       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />\r
-                                            </return>\r
                                         </block>\r
                                     </outcome>\r
                                     <outcome value='false'>\r
                                     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-key" value="availability-zone.availability-zone-name" />\r
                                     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-value" value="`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`" />\r
                                     <outcome value='failure'>\r
-                                        <block>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />\r
+                                            </set>\r
                                             <block atomic="true">\r
                                                 <set>\r
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />\r
-                                            </return>\r
                                         </block>\r
                                     </outcome>\r
                                     <outcome value='not-found'>\r
-                                        <block>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />\r
+                                            </set>\r
                                             <block atomic="true">\r
                                                 <set>\r
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />\r
-                                            </return>\r
                                         </block>\r
                                     </outcome>\r
                                 </save>\r
                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />\r
                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-nw-index].network-id`" />\r
                                     <outcome value='failure'>\r
-                                        <block>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />\r
+                                            </set>\r
                                             <block atomic="true">\r
                                                 <set>\r
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />\r
-                                            </return>\r
                                         </block>\r
                                     </outcome>\r
                                     <outcome value='not-found'>\r
-                                        <block>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />\r
+                                            </set>\r
                                             <block atomic="true">\r
                                                 <set>\r
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />\r
-                                            </return>\r
                                         </block>\r
                                     </outcome>\r
                                 </save>\r
                             <parameter name="in-maint" value="true" />\r
                             <parameter name="selflink" value="`$vnf-object-path`" />\r
                             <outcome value='failure'>\r
-                                <block>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="Error updating selflink in generic-vnf in AAI" />\r
+                                    </set>\r
                                     <block atomic="true">\r
                                         <set>\r
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                         </set>\r
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="Error updating selflink in generic-vnf in AAI" />\r
-                                    </return>\r
                                 </block>\r
                             </outcome>\r
                             <outcome value='not-found'>\r
-                                <block>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />\r
+                                    </set>\r
                                     <block atomic="true">\r
                                         <set>\r
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                         </set>\r
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />\r
-                                    </return>\r
                                 </block>\r
                             </outcome>\r
                         </update>\r
       value="`'/aai/v$/network/instance-groups/instance-group/'\r
         + $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id`" />\r
                                     <outcome value='failure'>\r
-                                        <block>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="Error updating relationship in generic-vnf in AAI" />\r
+                                            </set>\r
                                             <block atomic="true">\r
                                                 <set>\r
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="Error updating relationship in generic-vnf in AAI" />\r
-                                            </return>\r
                                         </block>\r
                                     </outcome>\r
                                     <outcome value='not-found'>\r
-                                        <block>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />\r
+                                            </set>\r
                                             <block atomic="true">\r
                                                 <set>\r
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                                                 </set>\r
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                                    <parameter name="input.ack-final-indicator" value="Y" />\r
+                                                    <parameter name="input.response-code" value="500" />\r
+                                                    <parameter name="input.response-message" value="`$error-message`" />\r
+                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                                </configure>\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
-                                            <return status='failure'>\r
-                                                <parameter name='ack-final' value='Y'/>\r
-                                                <parameter name="error-code" value="500" />\r
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />\r
-                                            </return>\r
                                         </block>\r
                                     </outcome>\r
                                 </save>\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\r
                         </set>\r
+                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'vnf-data-assign.json'`" />\r
+                            <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.vnf.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="vnf-assign" />\r
+                            <outcome value='failure'>\r
+                                <block atomic="true">\r
+                                    <set>\r
+                                        <parameter name="error-message" value="Error doing PUT of vnf-data" />\r
+                                    </set>\r
+                                    <block atomic="true">\r
+                                        <set>\r
+                                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
+                                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
+                                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
+                                        </set>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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 vnf-data" />\r
+                                    </set>\r
+                                    <block atomic="true">\r
+                                        <set>\r
+                                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
+                                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
+                                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
+                                        </set>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                                            <parameter name="input.response-code" value="500" />\r
+                                            <parameter name="input.response-message" value="`$error-message`" />\r
+                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                                        </configure>\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-vnf.log' />\r
                         </execute>\r
+                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">\r
+                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />\r
+                            <parameter name="input.ack-final-indicator" value="Y" />\r
+                            <parameter name="input.response-code" value="200" />\r
+                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />\r
+                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />\r
+                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />\r
+                        </configure>\r
                         <return status='success'>\r
                             <parameter name="ack-final-indicator" value="Y" />\r
                             <parameter name="error-code" value="200" />\r