Update overlay DG for delete flow

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
index 04cbb6e..d70691b 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
@@ -27,7 +27,6 @@
                   <outcome value="success">\r
                      <set>\r
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />\r
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />\r
@@ -74,7 +73,6 @@
                               <parameter name="format" value="json" />\r
                               <parameter name="httpMethod" value="delete" />\r
                               <parameter name="responsePrefix" value="restapi-result" />\r
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                            </execute>\r
                         </outcome>\r
                         <outcome value="L2-DCI">\r
@@ -85,7 +83,6 @@
                               <parameter name="format" value="json" />\r
                               <parameter name="httpMethod" value="delete" />\r
                               <parameter name="responsePrefix" value="restapi-result" />\r
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                            </execute>\r
                         </outcome>\r
                      </switch>\r
@@ -110,7 +107,6 @@
                   <outcome value="success">\r
                      <set>\r
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />\r
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />\r
@@ -157,7 +153,6 @@
                               <parameter name="format" value="json" />\r
                               <parameter name="httpMethod" value="delete" />\r
                               <parameter name="responsePrefix" value="restapi-result" />\r
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                            </execute>\r
                         </outcome>\r
                         <outcome value="L2-DCI">\r
@@ -168,7 +163,6 @@
                               <parameter name="format" value="json" />\r
                               <parameter name="httpMethod" value="delete" />\r
                               <parameter name="responsePrefix" value="restapi-result" />\r
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                            </execute>\r
                         </outcome>\r
                      </switch>\r
@@ -176,24 +170,39 @@
                </switch>\r
             </block>\r
          </block>\r
-         <block atomic="true">\r
-            <set>\r
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />\r
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />\r
-            </set>\r
-            <set>\r
-               <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />\r
-            </set>\r
-            <set>\r
-               <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $networkId  + '/network-data/network-topology/'` " />\r
-            </set>\r
-            <set>\r
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status" value="Deleted" />\r
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action" value="`$network-topology-operation-input.sdnc-request-header.svc-action`" />\r
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action" value="`$network-topology-operation-input.request-information.request-action`" />\r
-            </set>\r
-         </block>\r
          <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $network-topology-operation-input.network-information.network-id" />\r
+         <switch test="`$service-data.networks.network_length`">\r
+            <outcome value="1">\r
+               <block atomic="true">\r
+                  <set>\r
+                     <parameter name="service-data.networks." value="" />\r
+                  </set>\r
+                  <set>\r
+                     <parameter name="service-data.networks.network_length" value="0" />\r
+                  </set>\r
+               </block>\r
+            </outcome>\r
+            <outcome value="Other">\r
+               <block atomic="true">\r
+                  <set>\r
+                     <parameter name="tmp.new_length" value="`$service-data.networks.network_length - 1`" />\r
+                  </set>\r
+                  <for silentFailure="true" index="snidx" start="`$tmp.nidx + 1`" end="`$service-data.networks.network_length`">\r
+                     <block atomic="true" />\r
+                  </for>\r
+                  <set>\r
+                     <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`" />\r
+                  </set>\r
+                  <set>\r
+                     <parameter name="service-data.networks.network[$tmp.new_length]." value="" />\r
+                  </set>\r
+               </block>\r
+            </outcome>\r
+         </switch>\r
+         <set>\r
+            <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />\r
+            <parameter name="service-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/service-topology/'` " />\r
+         </set>\r
          <return status="success">\r
             <parameter name="ack-final-indicator" value="Y" />\r
             <parameter name="error-code" value="200" />\r