X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml;h=d70691bcbb06096b6bca9379cf031706cc834d26;hb=refs%2Fheads%2Fmaster;hp=1883baf85a16aeb18aadfa8e39de8f1c28f72098;hpb=bbc2c4acd22b12cb1fe3fc31bb71e7bc7a6d7e19;p=sdnc%2Foam.git

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 1883baf8..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,9 +27,9 @@
                   <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`" />
                      </set>
                   </outcome>
                   <outcome value="not-found">
@@ -62,47 +62,30 @@
                   <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
                   <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
                </record>
-               <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                  <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
-                  <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
-                  <parameter name="format" value="json" />
-                  <parameter name="httpMethod" value="post" />
-                  <parameter name="responsePrefix" value="token-result" />
-                  <outcome value="success">
-                     <set>
-                        <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
-                     </set>
-                  </outcome>
-                  <outcome value="failure">
-                     <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error executing get token rest api" />
-                     </return>
-                  </outcome>
-               </execute>
-               <switch test="`$prop.dci-connects.tunnelType`">
-                  <outcome value="L3-DCI">
-                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <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">
-                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <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>
+               <switch test="`$prop.sdncRestApi.thirdpartySdnc.vendor`">
+                  <outcome value="SPTN">
+                     <switch test="`$prop.dci-connects.tunnelType`">
+                        <outcome value="L3-DCI">
+                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                              <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
+                              <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                              <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                              <parameter name="format" value="json" />
+                              <parameter name="httpMethod" value="delete" />
+                              <parameter name="responsePrefix" value="restapi-result" />
+                           </execute>
+                        </outcome>
+                        <outcome value="L2-DCI">
+                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                              <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
+                              <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                              <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                              <parameter name="format" value="json" />
+                              <parameter name="httpMethod" value="delete" />
+                              <parameter name="responsePrefix" value="restapi-result" />
+                           </execute>
+                        </outcome>
+                     </switch>
                   </outcome>
                </switch>
             </block>
@@ -124,9 +107,9 @@
                   <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`" />
                      </set>
                   </outcome>
                   <outcome value="not-found">
@@ -159,69 +142,67 @@
                   <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
                   <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
                </record>
-               <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                  <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
-                  <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
-                  <parameter name="format" value="json" />
-                  <parameter name="httpMethod" value="post" />
-                  <parameter name="responsePrefix" value="token-result" />
-                  <outcome value="success">
-                     <set>
-                        <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
-                     </set>
-                  </outcome>
-                  <outcome value="failure">
-                     <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error executing get token rest api" />
-                     </return>
-                  </outcome>
-               </execute>
-               <switch test="`$prop.dci-connects.tunnelType`">
-                  <outcome value="L3-DCI">
-                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <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">
-                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <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>
+               <switch test="`$prop.sdncRestApi.thirdpartySdnc.vendor`">
+                  <outcome value="SPTN">
+                     <switch test="`$prop.dci-connects.tunnelType`">
+                        <outcome value="L3-DCI">
+                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                              <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
+                              <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                              <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                              <parameter name="format" value="json" />
+                              <parameter name="httpMethod" value="delete" />
+                              <parameter name="responsePrefix" value="restapi-result" />
+                           </execute>
+                        </outcome>
+                        <outcome value="L2-DCI">
+                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                              <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
+                              <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                              <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                              <parameter name="format" value="json" />
+                              <parameter name="httpMethod" value="delete" />
+                              <parameter name="responsePrefix" value="restapi-result" />
+                           </execute>
+                        </outcome>
+                     </switch>
                   </outcome>
                </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" />