Inter domain DG'S modified

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

diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
index 24b52fb..0d17afd 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
@@ -3,16 +3,30 @@
     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-tapi' mode='sync'>\r
         <block atomic="true">\r
+            <set>\r
+                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />\r
+            </set>\r
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
                 <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />\r
                 <parameter name="level" value="info" />\r
                 <parameter name="field1" value="Inside optical service delete tapi"/>\r
             </record>\r
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
+key='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '\r
+pfx='output'></get-resource>\r
             <set>\r
-                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />\r
+                <parameter name='esr-id' value='`$output.controller-id`' />\r
+            </set>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                <parameter name="original_string" value='`$esr-id`'/>\r
+                <parameter name="regex" value="_"/>\r
+                <parameter name="ctx_memory_result_key" value="new-esr"/>\r
+            </execute>\r
+            <set>\r
+                <parameter name='service-name' value="`$optical-service-delete-input.payload.service-name +  $new-esr[2]`" />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $optical-service-delete-input.payload.service-name`" />\r
+                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $service-name`" />\r
                 <parameter name="restapiUser" value="admin"/>\r
                 <parameter name="restapiPassword" value="admin"/>\r
                 <parameter name="httpMethod" value="GET"/>\r
@@ -43,7 +57,7 @@ from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
 WHERE interface_name = $zend-nep'\r
 pfx='db-zend'></get-resource>\r
                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $optical-service-delete-input.payload.service-name`" />\r
+                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $service-name`" />\r
                             <parameter name="restapiUser" value="admin"/>\r
                             <parameter name="restapiPassword" value="admin"/>\r
                             <parameter name="httpMethod" value="DELETE"/>\r
@@ -125,9 +139,6 @@ pfx='zend'      local-only='false'></get-resource>
 resource='SQL' \r
 key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'\r
 force='true' pfx='save-result'></save>\r
-                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
-key='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '\r
-pfx='output'></get-resource>\r
                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
 resource="service-instance"\r
 key='customer.global-customer-id = $output.global-customer-id AND\r