1 files changed, 32 insertions, 23 deletions
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 04cbb6e9..d70691bc 100644
--- 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">
                      <set>
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />
@@ -74,7 +73,6 @@
                               <parameter name="format" value="json" />
                               <parameter name="httpMethod" value="delete" />
                               <parameter name="responsePrefix" value="restapi-result" />
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                            </execute>
                         </outcome>
                         <outcome value="L2-DCI">
@@ -85,7 +83,6 @@
                               <parameter name="format" value="json" />
                               <parameter name="httpMethod" value="delete" />
                               <parameter name="responsePrefix" value="restapi-result" />
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                            </execute>
                         </outcome>
                      </switch>
@@ -110,7 +107,6 @@
                   <outcome value="success">
                      <set>
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />
@@ -157,7 +153,6 @@
                               <parameter name="format" value="json" />
                               <parameter name="httpMethod" value="delete" />
                               <parameter name="responsePrefix" value="restapi-result" />
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                            </execute>
                         </outcome>
                         <outcome value="L2-DCI">
@@ -168,7 +163,6 @@
                               <parameter name="format" value="json" />
                               <parameter name="httpMethod" value="delete" />
                               <parameter name="responsePrefix" value="restapi-result" />
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                            </execute>
                         </outcome>
                      </switch>
@@ -176,24 +170,39 @@
                </switch>
             </block>
          </block>
-         <block atomic="true">
-            <set>
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
-            </set>
-            <set>
-               <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
-            </set>
-            <set>
-               <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/'` " />
-            </set>
-            <set>
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status" value="Deleted" />
-               <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`" />
-               <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`" />
-            </set>
-         </block>
          <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $network-topology-operation-input.network-information.network-id" />
+         <switch test="`$service-data.networks.network_length`">
+            <outcome value="1">
+               <block atomic="true">
+                  <set>
+                     <parameter name="service-data.networks." value="" />
+                  </set>
+                  <set>
+                     <parameter name="service-data.networks.network_length" value="0" />
+                  </set>
+               </block>
+            </outcome>
+            <outcome value="Other">
+               <block atomic="true">
+                  <set>
+                     <parameter name="tmp.new_length" value="`$service-data.networks.network_length - 1`" />
+                  </set>
+                  <for silentFailure="true" index="snidx" start="`$tmp.nidx + 1`" end="`$service-data.networks.network_length`">
+                     <block atomic="true" />
+                  </for>
+                  <set>
+                     <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`" />
+                  </set>
+                  <set>
+                     <parameter name="service-data.networks.network[$tmp.new_length]." value="" />
+                  </set>
+               </block>
+            </outcome>
+         </switch>
+         <set>
+            <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
+            <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/'` " />
+         </set>
          <return status="success">
             <parameter name="ack-final-indicator" value="Y" />
             <parameter name="error-code" value="200" />