Update underlay DG for delete flow

*Need to store vrf ids which are reuired during delete
*Add delete network from MDSAL data store

Change-Id: I411c01f90a2a186e2d72f570c30ae8ecdd8d5b15
Issue-Id: SDNC-188
Signed-off-by: Ramu N <ramu.n@huawei.com>

Former-commit-id: f28363f0fae83efa9cb09ddd61fd995ccdf8498c

1 files changed, 54 insertions, 82 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 1883baf8..04cbb6e9 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
@@ -30,6 +30,7 @@
                         <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 +63,32 @@
                   <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" />

+                              <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>

+                        </outcome>

+                     </switch>

                   </outcome>

                </switch>

             </block>

@@ -127,6 +113,7 @@
                         <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,47 +146,32 @@
                   <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" />

+                              <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>

+                        </outcome>

+                     </switch>

                   </outcome>

                </switch>

             </block>