X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_network-topology-operation-delete.xml;h=22952f506309dfa79c3c99c97b379dbc05072a7d;hb=42fb5723b7b11e94fc7d5ab901ae293b7fd67d7f;hp=87deaa5dd140e12d5f1974707777fa161b9d6d81;hpb=8211fe09e725a11a8a32c781866f71603f989872;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
index 87deaa5d..22952f50 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
@@ -4,6 +4,13 @@
         <block atomic="true">
             <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
             <switch test="`$service-data.networks.network_length`">
+                <outcome value="0">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+                    </return>
+                </outcome>
                 <outcome value="">
                     <return status="failure">
                         <parameter name="ack-final" value="Y" />
@@ -44,7 +51,7 @@
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`">
                         <outcome value="true">
                             <set>
                                 <parameter name="prop.l3vpn.service-type" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
@@ -58,6 +65,27 @@
                             </set>
                         </outcome>
                     </switch>
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_name'`">
+                        <outcome value="true">
+                            <set>
+                                <parameter name="prop.l3vpn.site1_name" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'vrf1_id'`">
+                        <outcome value="true">
+                            <set>
+                                <parameter name="prop.l3vpn.vrf1-id" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'vrf2_id'`">
+                        <outcome value="true">
+                            <set>
+                                <parameter name="prop.l3vpn.vrf2-id" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
+                            </set>
+                        </outcome>
+                    </switch>
                 </block>
             </for>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $prop.l3vpn.pe1_id AND         depth = '0'" pfx="tmp.aai.pnf" local-only="false">
@@ -117,9 +145,13 @@
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="post" />
                             <parameter name="responsePrefix" value="token-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
                             <outcome value="success">
                                 <set>
-                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
+                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.data.token_id" />
                                 </set>
                             </outcome>
                             <outcome value="failure">
@@ -131,44 +163,133 @@
                             </outcome>
                         </execute>
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smvpntemplate.json'`" />
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites/site=' + $prop.l3vpn.site1_name`" />
+                            <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="site-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <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 Delete Site rest api" />
+                                </return>
+                            </outcome>
+                            <outcome value="success">
+                                <block />
+                            </outcome>
+                        </execute>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes/vrf-attribute=' + $prop.l3vpn.vrf1-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="vrf1-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <outcome value="success">
+                                <block />
+                            </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 Delete VRF1 rest api" />
+                                </return>
+                            </outcome>
+                        </execute>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes/vrf-attribute=' + $prop.l3vpn.vrf2-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="vrf2-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <outcome value="success">
+                                <block />
+                            </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 Delete VRF2 rest api" />
+                                </return>
+                            </outcome>
+                        </execute>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`" />
                             <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="responsePrefix" value="vpn-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
                             <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                            <outcome value="success" />
+                            <outcome value="success">
+                                <block />
+                            </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 3rd party controller rest api" />
+                                    <parameter name="error-message" value="Error executing Delete VPN rest api" />
                                 </return>
                             </outcome>
                         </execute>
                     </block>
                 </outcome>
             </switch>
-            <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/'` " />
-                </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" />
+            <set>
+                <parameter name="tmp.nw-url" value="`'/restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'   + $network-topology-operation-input.network-information.network-id` " />
+            </set>
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.nw-url`" />
+                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                <parameter name="restapiPassword" value="`$prop.controller.pwd`" />
+                <parameter name="format" value="json" />
+                <parameter name="httpMethod" value="DELETE" />
+                <parameter name="responsePrefix" value="mdsal-nw" />
+                <outcome value="success">
+                    <block />
+                </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 updating md-sal for network-data" />
+                    </return>
+                </outcome>
+                <outcome value="not-found">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for network-data" />
+                    </return>
+                </outcome>
+            </execute>
+            <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" />