MSA delete services issues fixed for

[sdnc/oam.git] / platform-logic / optical-service / src / main / xml / optical-service_service-delete-msa.xml

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 562195a..a04cdba 100644 (file)
--- 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}'>\r
     <method rpc='service-delete-msa' mode='sync'>\r
         <block atomic="true">\r
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+key='SELECT controller_id\r
+from REQUEST_DETAILS\r
+WHERE request_id = $domain-service1'\r
+pfx='detail-db1'>\r
+                <outcome value='success'>\r
+                    <set>\r
+                        <parameter name='controller-id1' value='`$detail-db1.controller-id`' />\r
+                    </set>\r
+                </outcome>\r
+            </get-resource>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                <parameter name="original_string" value='`$controller-id1`'/>\r
+                <parameter name="regex" value="_"/>\r
+                <parameter name="ctx_memory_result_key" value="param-prefix"/>\r
+            </execute>\r
             <set>\r
-                <parameter name='optical-service-create-input.request-id' value="`$domain-service1`" />\r
-                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-MSA'`"/>\r
+                <parameter name='domain-type' value='`$param-prefix[0]`' />\r
+                <parameter name='controller-ip' value='`$param-prefix[1]`' />\r
+                <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />\r
+                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.service-name + $param-prefix[2]`"/>\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />\r
@@ -49,32 +67,15 @@
                                         <parameter name="level" value="info" />\r
                                         <parameter name="field1" value="Inside controller"/>\r
                                     </record>\r
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \r
-resource='SQL' \r
-key='UPDATE REQUEST_DETAILS SET status = "DELETING" WHERE request_id = $optical-service-delete-input.request-id' \r
-force='true' pfx='save-result'></save>\r
                                     <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
 key='SELECT *\r
 from REQUEST_DETAILS \r
 WHERE request_id = $optical-service-delete-input.request-id'\r
-pfx='db.request-details'>\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='instance-id' value='`$db.request-details.service-instance-id`' />\r
-                                                <parameter name='customer-id' value='`$db.request-details.global-customer-id`' />\r
-                                                <parameter name='service-id' value='`$db.request-details.service-type`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                    </get-resource>\r
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \r
-force='true' \r
-resource='service-instance' \r
-key = 'customer.global-customer-id = $customer-id AND\r
-     service-subscription.service-type = $service-id AND\r
-     service-instance.service-instance-id = $instance-id'\r
-local-only='false'>\r
-                                        <parameter name='orchestration-status' value='DELETING' />\r
-                                    </update>\r
+pfx='output'></get-resource>\r
+                                    <set>\r
+                                        <parameter name='request-id' value='`$optical-service-create-input.request-id`' />\r
+                                    </set>\r
+                                    <call module='optical-service' rpc='aai-delete-service-handling' mode='sync' ></call>\r
                                     <set>\r
                                         <parameter name='final-response-code' value="200" />\r
                                     </set>\r
@@ -86,4 +87,4 @@ local-only='false'>
             </execute>\r
         </block>\r
     </method>\r
-</service-logic>
\ No newline at end of file
+</service-logic>\r