Merge "integration test issues fix for sdwan and sotn"

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
index 1dd02a9..2d723a7 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
@@ -4,7 +4,7 @@
     <method rpc='sotn-attachment-topology-operation-delete' mode='sync'>\r
         <block atomic="true">\r
             <set>\r
-                <parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\r
+                <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\r
                 <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\r
             </set>\r
             <set>\r
@@ -64,7 +64,6 @@
                                         <set>\r
                                             <parameter name='tmp.cidx' value='`$cidx`' />\r
                                         </set>\r
-                                        <break></break>\r
                                     </block>\r
                                 </outcome>\r
                             </switch>\r
@@ -88,7 +87,19 @@
             <set>\r
                 <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />\r
             </set>\r
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+                <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>\r
+                <parameter name="outputPath" value="tmp.ar-url-psd"/>\r
+                <parameter name="target" value="{service-instance-id}"/>\r
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>\r
+            </execute>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\r
+                <parameter name='restapiUser' value='`$prop.controller.user`' />\r
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
+                <parameter name='format' value='json' />\r
+                <parameter name='httpMethod' value='GET' />\r
+                <parameter name="responsePrefix" value="mdsal-psd" />\r
                 <outcome value='success'>\r
                     <block></block>\r
                 </outcome>\r
@@ -99,8 +110,8 @@
                         <parameter name="error-message" value="Error: SOTN resource not found" />\r
                     </return>\r
                 </outcome>\r
-            </get-resource>\r
-            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>\r
+            </execute>\r
+            <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\r
                 <outcome value=''>\r
                     <return status='failure'>\r
                         <parameter name='ack-final' value='Y'/>\r
@@ -110,14 +121,13 @@
                 </outcome>\r
                 <outcome value='Other'>\r
                     <block atomic="true">\r
-                        <for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >\r
-                            <switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">\r
+                        <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\r
+                            <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">\r
                                 <outcome value='true'>\r
                                     <block atomic="true">\r
                                         <set>\r
                                             <parameter name='tmp.pidx' value='`$pidx`' />\r
                                         </set>\r
-                                        <break></break>\r
                                     </block>\r
                                 </outcome>\r
                             </switch>\r
@@ -134,10 +144,14 @@
                     </block>\r
                 </outcome>\r
             </switch>\r
-            <set>\r
-                <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource[$pidx]." value="" />\r
-                <parameter name='service-data.provided-allotted-resources.consumed-allotted-resource_length' value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />\r
-            </set>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.ar-url-psd + '/provided-allotted-resources/provided-allotted-resource/' + $tmp.ar.allotted-resource-id`" />\r
+                <parameter name='restapiUser' value='`$prop.controller.user`' />\r
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
+                <parameter name='format' value='json' />\r
+                <parameter name='httpMethod' value='DELETE' />\r
+                <parameter name="responsePrefix" value="mdsal-psd-delete" />\r
+            </execute>\r
             <set>\r
                 <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\r
                 <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>\r
@@ -145,8 +159,8 @@
  + $connection-attachment-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'\r
-                key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\r
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'  \r
+               key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\r
                        service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\r
                        service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\r
                        allotted-resource.id = $tmp.ar.allotted-resource-id">\r
@@ -172,4 +186,4 @@
             </return>\r
         </block>\r
     </method>\r
-</service-logic>
\ No newline at end of file
+</service-logic>\r