X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=inline;f=platform-logic%2Foptical-service%2Fsrc%2Fmain%2Fxml%2Foptical-service_service-delete-msa.xml;h=2eb381644da181f14e664b38626b51117ab1f10d;hb=4e6241c456ca3fcb8ae93e08d7940b7c618b2f97;hp=562195a0dfcd89f194b752c3c39f8c9e0b0a2980;hpb=295f8fd6bd909b15d534134d334b62d9a1a4ab3c;p=sdnc%2Foam.git

diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
index 562195a0..2eb38164 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
@@ -3,9 +3,27 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>
     <method rpc='service-delete-msa' mode='sync'>
         <block atomic="true">
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT controller_id
+from REQUEST_DETAILS
+WHERE request_id = $domain-service1'
+pfx='detail-db1'>
+                <outcome value='success'>
+                    <set>
+                        <parameter name='controller-id1' value='`$detail-db1.controller-id`' />
+                    </set>
+                </outcome>
+            </get-resource>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$controller-id1`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="param-prefix"/>
+            </execute>
             <set>
-                <parameter name='optical-service-create-input.request-id' value="`$domain-service1`" />
-                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-MSA'`"/>
+                <parameter name='domain-type' value='`$param-prefix[0]`' />
+                <parameter name='controller-ip' value='`$param-prefix[1]`' />
+                <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />
+                <parameter name='optical-service-delete-input.payload.service-name' value="`$service-name + $param-prefix[2]`"/>
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />
@@ -49,32 +67,15 @@
                                         <parameter name="level" value="info" />
                                         <parameter name="field1" value="Inside controller"/>
                                     </record>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
-resource='SQL' 
-key='UPDATE REQUEST_DETAILS SET status = "DELETING" WHERE request_id = $optical-service-delete-input.request-id' 
-force='true' pfx='save-result'></save>
                                     <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
 key='SELECT *
 from REQUEST_DETAILS 
 WHERE request_id = $optical-service-delete-input.request-id'
-pfx='db.request-details'>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='instance-id' value='`$db.request-details.service-instance-id`' />
-                                                <parameter name='customer-id' value='`$db.request-details.global-customer-id`' />
-                                                <parameter name='service-id' value='`$db.request-details.service-type`' />
-                                            </set>
-                                        </outcome>
-                                    </get-resource>
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
-force='true' 
-resource='service-instance' 
-key = 'customer.global-customer-id = $customer-id AND
-     service-subscription.service-type = $service-id AND
-     service-instance.service-instance-id = $instance-id'
-local-only='false'>
-                                        <parameter name='orchestration-status' value='DELETING' />
-                                    </update>
+pfx='output'></get-resource>
+                                    <set>
+                                        <parameter name='request-id' value='`$optical-service-create-input.request-id`' />
+                                    </set>
+                                    <call module='optical-service' rpc='aai-delete-service-handling' mode='sync' ></call>
                                     <set>
                                         <parameter name='final-response-code' value="200" />
                                     </set>