From edfd51b6ac224d8d4eef723f109c78a532684a74 Mon Sep 17 00:00:00 2001
From: "Cheung, Pat (kc1472)" <kc1472@att.com>
Date: Wed, 4 Sep 2019 22:06:21 +0000
Subject: generic-resource-api DG enhancement

Add vnf and vf-module async and concurrency support

Issue-ID: SDNC-854
Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com>
Change-Id: I2d1ebecca6661ef84d01994a77f5ec2f57c81497

Former-commit-id: 49752d7a66e8edf73e94fd2f7c6191dba1d2d2fc
---
 ...-RESOURCE-API_vnf-topology-operation-assign.xml | 726 ++++++++++++++-------
 1 file changed, 506 insertions(+), 220 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
index 1433b7b5..66341c30 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
@@ -7,6 +7,14 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <set>
+                <parameter name="so.ack-final-indicator" value="Y" />
+                <parameter name="so.response-code" value="500" />
+                <parameter name="so.notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
+                <parameter name="so.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
+                <parameter name="so.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
+                <parameter name="so.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
+            </set>
             <switch test='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`'>
                 <outcome value=''>
                     <block></block>
@@ -22,29 +30,53 @@
                     <block></block>
                 </outcome>
                 <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVnfInstance'" />
-                    </return>
+                    <block atomic="true">
+                        <set>
+                            <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVnfInstance'" />
+                        </set>
+                        <block atomic='true'>
+                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`$error-message`" />
+                            </return>
+                        </block>
+                    </block>
                 </outcome>
             </switch>
             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-model'>
                 <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error reading VF_MODEL table" />
-                    </return>
+                    <block atomic="true">
+                        <set>
+                            <parameter name="error-message" value="Error reading VF_MODEL table" />
+                        </set>
+                        <block atomic='true'>
+                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`$error-message`" />
+                            </return>
+                        </block>
+                    </block>
                 </outcome>
                 <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`" />
-                    </return>
+                    <block atomic="true">
+                        <set>
+                            <parameter name="error-message" value="`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`" />
+                        </set>
+                        <block atomic='true'>
+                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`$error-message`" />
+                            </return>
+                        </block>
+                    </block>
                 </outcome>
             </get-resource>
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' ></call>
@@ -53,11 +85,19 @@
                     <block atomic="true">
                         <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-assign' mode='sync' >
                             <outcome value='failure'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="`'Failed to create self-serve assignment for vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`" />
-                                </return>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="`'Failed to create self-serve assignment for vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`" />
+                                    </set>
+                                    <block atomic='true'>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
+                                    </block>
+                                </block>
                             </outcome>
                         </call>
                         <set>
@@ -68,6 +108,10 @@
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                             <parameter name='filename' value='/var/tmp/ss-vnfend.log' />
                         </execute>
+                        <set>
+                            <parameter name="so.response-code" value="200" />
+                        </set>
+                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
                         <return status='success'>
                             <parameter name="ack-final-indicator" value="Y" />
                             <parameter name="error-code" value="200" />
@@ -84,19 +128,27 @@
                                 </set>
                             </outcome>
                             <outcome value='Other'>
-                                <block>
+                                <block atomic='true'>
                                     <set>
                                         <parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />
                                     </set>
                                     <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
                                         <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>
                                             <outcome value='true'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id
+                                                <block atomic="true">
+                                                    <set>
+                                                        <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id
       + ' already exists'`" />
-                                                </return>
+                                                    </set>
+                                                    <block atomic='true'>
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`$error-message`" />
+                                                        </return>
+                                                    </block>
+                                                </block>
                                             </outcome>
                                         </switch>
                                     </for>
@@ -116,20 +168,36 @@
 		key="instance-group.id = $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id"
         pfx='aai.instance-group' local-only='false' >
                                     <outcome value='not-found'>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`'Cannot find instance group id ' +
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="`'Cannot find instance group id ' +
       $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id
       + ' in AAI'`" />
-                                        </return>
+                                            </set>
+                                            <block atomic='true'>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
+                                            </block>
+                                        </block>
                                     </outcome>
                                     <outcome value='failure'>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="Error retrieving instance-group from AAI" />
-                                        </return>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="Error retrieving instance-group from AAI" />
+                                            </set>
+                                            <block atomic='true'>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
+                                            </block>
+                                        </block>
                                     </outcome>
                                 </get-resource>
                                 <for index='rel-index' start='0' end='`$aai.instance-group.relationship-list.relationship_length`' >
@@ -140,20 +208,37 @@
 		key="collection.collection-id = $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
         pfx='aai.collection' local-only='false' >
                                                 <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'Cannot find collection ' +
-      $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value
-      + ' in AAI'`" />
-                                                    </return>
+                                                    <block atomic="true">
+                                                        <set>
+                                                            <parameter name="error-message" value="`'Unable to find AAI relationship from collection '
+      + $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value
+      + ' to service instance'`" />
+                                                        </set>
+                                                        <block atomic='true'>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`$error-message`" />
+                                                            </return>
+                                                        </block>
+                                                    </block>
                                                 </outcome>
                                                 <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="System error retrieving collection from AAI" />
-                                                    </return>
+                                                    <block atomic="true">
+                                                        <set>
+                                                            <parameter name="error-message" value="`'Failed to get network service instance '
+      + $network-service-instance + ' from MD-SAL'`" />
+                                                        </set>
+                                                        <block atomic='true'>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`$error-message`" />
+                                                            </return>
+                                                        </block>
+                                                    </block>
                                                 </outcome>
                                                 <outcome value='success'>
                                                     <block atomic="true">
@@ -175,13 +260,22 @@
                                                         </for>
                                                         <switch test='`$found-network-instance-group`'>
                                                             <outcome value='false'>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`'Could not find network instance group ' +
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name="error-message" value="`'Could not find network instance group ' +
       $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id
-      + ' in MD-SAL'`" />
-                                                                </return>
+      + ' in MD-SAL service instance '
+      + $network-service-instance`" />
+                                                                    </set>
+                                                                    <block atomic='true'>
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="`$error-message`" />
+                                                                        </return>
+                                                                    </block>
+                                                                </block>
                                                             </outcome>
                                                         </switch>
                                                         <set>
@@ -235,18 +329,34 @@
                                             <block></block>
                                         </outcome>
                                         <outcome value='N'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
-                                            </return>
+                                            <block atomic="true">
+                                                <set>
+                                                    <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
+                                                </set>
+                                                <block atomic='true'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`$error-message`" />
+                                                    </return>
+                                                </block>
+                                            </block>
                                         </outcome>
                                         <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
-                                            </return>
+                                            <block atomic="true">
+                                                <set>
+                                                    <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
+                                                </set>
+                                                <block atomic='true'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`$error-message`" />
+                                                    </return>
+                                                </block>
+                                            </block>
                                         </outcome>
                                     </switch>
                                     <switch test='`$db.vf-model.naming-policy`'>
@@ -262,11 +372,19 @@
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >
                                                     <outcome value='failure'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
-                                                        </return>
+                                                        <block atomic="true">
+                                                            <set>
+                                                                <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
+                                                            </set>
+                                                            <block atomic='true'>
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`$error-message`" />
+                                                                </return>
+                                                            </block>
+                                                        </block>
                                                     </outcome>
                                                     <outcome value='success'>
                                                         <set>
@@ -287,11 +405,19 @@
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >
                                                     <outcome value='failure'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Unable to generate VNF name" />
-                                                        </return>
+                                                        <block atomic="true">
+                                                            <set>
+                                                                <parameter name="error-message" value="Unable to generate VNF name" />
+                                                            </set>
+                                                            <block atomic='true'>
+                                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`$error-message`" />
+                                                                </return>
+                                                            </block>
+                                                        </block>
                                                     </outcome>
                                                     <outcome value='success'>
                                                         <set>
@@ -385,7 +511,10 @@
 		     depth='all'"
         pfx='aai.cloud-region' local-only='false' >
                             <outcome value='not-found'>
-                                <block>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="Cloud region not found in AAI" />
+                                    </set>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -393,16 +522,20 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
                                     </block>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Cloud region not found in AAI" />
-                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='failure'>
-                                <block>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="Error retrieving cloud region from AAI" />
+                                    </set>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -410,12 +543,13 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
                                     </block>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error retrieving cloud region from AAI" />
-                                    </return>
                                 </block>
                             </outcome>
                         </get-resource>
@@ -439,7 +573,10 @@
                         </for>
                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli`'>
                             <outcome value=''>
-                                <block>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
+                                    </set>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -447,12 +584,13 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
                                     </block>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
-                                    </return>
                                 </block>
                             </outcome>
                         </switch>
@@ -460,7 +598,10 @@
   key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-network-role-mapping[]'>
                             <outcome value='failure'>
-                                <block>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="Error reading VF_TO_NETWORK_ROLE_MAPPING table" />
+                                    </set>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -468,12 +609,13 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
                                     </block>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error reading VF_TO_NETWORK_ROLE_MAPPING table" />
-                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='not-found'>
@@ -507,7 +649,10 @@
         pfx='aai.l3-network' local-only='false'
 >
                                             <outcome value='not-found'>
-                                                <block>
+                                                <block atomic="true">
+                                                    <set>
+                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
+                                                    </set>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -515,18 +660,20 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`$error-message`" />
+                                                        </return>
                                                     </block>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'No active l3-network found in AAI with cloud_region_id '
-          + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + ' and network_role '
-          + $db.vf-network-role-mapping[$network-index].network-role`" />
-                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='failure'>
-                                                <block>
+                                                <block atomic="true">
+                                                    <set>
+                                                        <parameter name="error-message" value="Error retrieving l3-network from AAI" />
+                                                    </set>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -534,12 +681,13 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`$error-message`" />
+                                                        </return>
                                                     </block>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error retrieving l3-network from AAI" />
-                                                    </return>
                                                 </block>
                                             </outcome>
                                         </get-resource>
@@ -622,7 +770,10 @@
                                         </block>
                                         <switch test='`$l3-network-id`'>
                                             <outcome value='-1'>
-                                                <block>
+                                                <block atomic="true">
+                                                    <set>
+                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
+                                                    </set>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -630,12 +781,13 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`$error-message`" />
+                                                        </return>
                                                     </block>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
-                                                    </return>
                                                 </block>
                                             </outcome>
                                         </switch>
@@ -733,7 +885,10 @@
     and network_role = $db.vf-network-role-mapping[$role-index].network-role'
   pfx='db.vnf-related-network-role[]'>
                                             <outcome value='failure'>
-                                                <block>
+                                                <block atomic="true">
+                                                    <set>
+                                                        <parameter name="error-message" value="Error reading VNF_RELATED_NETWORK_ROLE table" />
+                                                    </set>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -741,12 +896,13 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`$error-message`" />
+                                                        </return>
                                                     </block>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error reading VNF_RELATED_NETWORK_ROLE table" />
-                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='success'>
@@ -771,7 +927,14 @@
                                                         <parameter name='httpMethod' value='GET' />
                                                         <parameter name="responsePrefix" value="mdsal-ntis" />
                                                         <outcome value='failure'>
-                                                            <block>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="`
+    'Error retrieving network-topology-identifier-structure for service instance '
+    + $network-service-instance-id
+    + ' and network-id '
+    + $l3-network-id`" />
+                                                                </set>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -779,16 +942,13 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`$error-message`" />
+                                                                    </return>
                                                                 </block>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`
-    'Error retrieving network-topology-identifier-structure for service instance '
-    + $network-service-instance-id
-    + ' and network-id '
-    + $l3-network-id`" />
-                                                                </return>
                                                             </block>
                                                         </outcome>
                                                     </execute>
@@ -808,7 +968,10 @@
                                                         <parameter name="start_length" value="1" />
                                                         <parameter name="query" value="/query/owning-entity-fromService-instance" />
                                                         <outcome value='failure'>
-                                                            <block>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="Error getting owning entity from service instance" />
+                                                                </set>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -816,16 +979,20 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`$error-message`" />
+                                                                    </return>
                                                                 </block>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="Error getting owning entity from service instance" />
-                                                                </return>
                                                             </block>
                                                         </outcome>
                                                         <outcome value='not-found'>
-                                                            <block>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="Unable to find owning entity from service instance" />
+                                                                </set>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -833,12 +1000,13 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`$error-message`" />
+                                                                    </return>
                                                                 </block>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="Unable to find owning entity from service instance" />
-                                                                </return>
                                                             </block>
                                                         </outcome>
                                                     </save>
@@ -865,7 +1033,10 @@
                                                                 <parameter name="query" value="`'/query/getNetworks?networkRole=' + $db.vnf-related-network-role[$rel-network-role-index].related-network-role
   + '&amp;cloudRegionId=' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
                                                                 <outcome value='failure'>
-                                                                    <block>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name="error-message" value="Error calling getNetworks custom query in AAI" />
+                                                                        </set>
                                                                         <block atomic="true">
                                                                             <set>
                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -873,16 +1044,21 @@
                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                             </set>
                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`$error-message`" />
+                                                                            </return>
                                                                         </block>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="Error calling getNetworks custom query in AAI" />
-                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                                 <outcome value='not-found'>
-                                                                    <block>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name="error-message" value="`'No l3-network returned from getNetworks custom query for related network role '
+      + $db.vnf-related-network-role[0].related-network-role`" />
+                                                                        </set>
                                                                         <block atomic="true">
                                                                             <set>
                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -890,13 +1066,13 @@
                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                             </set>
                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`$error-message`" />
+                                                                            </return>
                                                                         </block>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`'No l3-network returned from getNetworks custom query for related network role '
-      + $db.vnf-related-network-role[0].related-network-role`" />
-                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                             </save>
@@ -919,7 +1095,10 @@
         pfx='aai.vlan-tag' local-only='false'
 >
                                                                                 <outcome value='failure'>
-                                                                                    <block>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name="error-message" value="Error getting vlan-tag object from AAI" />
+                                                                                        </set>
                                                                                         <block atomic="true">
                                                                                             <set>
                                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -927,12 +1106,13 @@
                                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                                             </set>
                                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                                            <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                                                            <return status='failure'>
+                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                <parameter name="error-code" value="500" />
+                                                                                                <parameter name="error-message" value="`$error-message`" />
+                                                                                            </return>
                                                                                         </block>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="Error getting vlan-tag object from AAI" />
-                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='success'>
@@ -984,7 +1164,11 @@
                             <outcome value=''>
                                 <switch test='`$db.vf-model.avail-zone-max-count &gt; 0`'>
                                     <outcome value='true'>
-                                        <block>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="`'No availability zones found in AAI for cloud region '
+       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
+                                            </set>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -992,13 +1176,13 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
                                             </block>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'No availability zones found in AAI for cloud region '
-       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
-                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='false'>
@@ -1027,7 +1211,10 @@
                                     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-key" value="availability-zone.availability-zone-name" />
                                     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-value" value="`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`" />
                                     <outcome value='failure'>
-                                        <block>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
+                                            </set>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1035,16 +1222,20 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
                                             </block>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
-                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </set>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1052,12 +1243,13 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
                                             </block>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1079,7 +1271,10 @@
                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />
                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-nw-index].network-id`" />
                                     <outcome value='failure'>
-                                        <block>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
+                                            </set>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1087,16 +1282,20 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
                                             </block>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
-                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </set>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1104,12 +1303,13 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
                                             </block>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1141,7 +1341,10 @@
                             <parameter name="in-maint" value="true" />
                             <parameter name="selflink" value="`$vnf-object-path`" />
                             <outcome value='failure'>
-                                <block>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="Error updating selflink in generic-vnf in AAI" />
+                                    </set>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1149,16 +1352,20 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
                                     </block>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error updating selflink in generic-vnf in AAI" />
-                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='not-found'>
-                                <block>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                    </set>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1166,12 +1373,13 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
                                     </block>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                    </return>
                                 </block>
                             </outcome>
                         </update>
@@ -1186,7 +1394,10 @@
       value="`'/aai/v$/network/instance-groups/instance-group/'
         + $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id`" />
                                     <outcome value='failure'>
-                                        <block>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="Error updating relationship in generic-vnf in AAI" />
+                                            </set>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1194,16 +1405,20 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
                                             </block>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="Error updating relationship in generic-vnf in AAI" />
-                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </set>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1211,12 +1426,13 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </return>
                                             </block>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1234,9 +1450,79 @@
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
                         </set>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                            <parameter name="source" value="`$prop.restapi.vnf-assign`"/>
+                            <parameter name="outputPath" value="tmp.part"/>
+                            <parameter name="target" value="{service-instance-id}"/>
+                            <parameter name="replacement" value="`$service-data.service-topology.service-topology-identifier.service-instance-id`"/>
+                        </execute>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                            <parameter name="source" value="`$tmp.part`"/>
+                            <parameter name="outputPath" value="tmp.vnf.url"/>
+                            <parameter name="target" value="{vnf-id}"/>
+                            <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
+                        </execute>
+                        <set>
+                            <parameter name='vnf-data.' value='service-data.vnfs.vnf[$vnf-index].vnf-data.' />
+                        </set>
+                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'vnf-data-assign.json'`" />
+                            <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.vnf.url`" />
+                            <parameter name='restapiUser' value='`$prop.controller.user`' />
+                            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                            <parameter name='format' value='json' />
+                            <parameter name='httpMethod' value='PUT' />
+                            <parameter name="responsePrefix" value="vnf-assign" />
+                            <outcome value='failure'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="Error doing PUT of vnf-data" />
+                                    </set>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
+                                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
+                                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
+                                        </set>
+                                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
+                                    </block>
+                                </block>
+                            </outcome>
+                            <outcome value='not-found'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name="error-message" value="Error doing PUT of vnf-data" />
+                                    </set>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
+                                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
+                                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
+                                        </set>
+                                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`$error-message`" />
+                                        </return>
+                                    </block>
+                                </block>
+                            </outcome>
+                        </execute>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                             <parameter name='filename' value='/var/tmp/bgb-vnf.log' />
                         </execute>
+                        <set>
+                            <parameter name="so.response-code" value="200" />
+                        </set>
+                        <call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' ></call>
                         <return status='success'>
                             <parameter name="ack-final-indicator" value="Y" />
                             <parameter name="error-code" value="200" />
-- 
cgit 1.2.3-korg