X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml;h=3997add7bfea329d8e7f4a32361690540d56bbf4;hb=2a546f93ac1c3686f099549fc88cd8bf2d39bd20;hp=2517645dd24e01495aaeb01d2a9919bf939f0118;hpb=c84a5266fc2ab31cb2bb68927457f6cdbb40c0b3;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
index 2517645d..3997add7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
@@ -128,9 +128,9 @@
                                                                     </get-resource>
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                         <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
                                                                         <parameter name="format" value="json"/>
                                                                         <parameter name="httpMethod" value="delete"/>
                                                                         <parameter name="responsePrefix" value="otn-oof"/>
@@ -143,50 +143,62 @@
                                                                             <return status='failure'>
                                                                                 <parameter name='ack-final' value='Y'/>
                                                                                 <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                                <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
                                                                             </return>
                                                                         </outcome>
                                                                         <outcome value='success'>
                                                                             <block atomic="true"></block>
                                                                         </outcome>
                                                                     </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/eth-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />
-                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
-                                                                        <parameter name="format" value="json"/>
-                                                                        <parameter name="httpMethod" value="delete"/>
-                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.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='failure'>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                        <outcome value='success'>
-                                                                            <block atomic="true">
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
-                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                    <parameter name='operational-status' value='Deactivated' />
-                                                                                </update>
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
-                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
-                                                                                    <parameter name='operational-status' value='Deactivated' />
-                                                                                </update>
-                                                                            </block>
+                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                        <outcome value='Other'>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="delete"/>
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.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='failure'>
+                                                                                    <return status='failure'>
+                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                        <parameter name="error-code" value="500" />
+                                                                                        <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                                <outcome value='success'>
+                                                                                    <block atomic="true">
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                            <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                            <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                            <parameter name='operational-status' value='Deactivated' />
+                                                                                        </update>
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                                            <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                                            <parameter name='operational-status' value='Deactivated' />
+                                                                                        </update>
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>
+                                                                                            <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                            <parameter name='orchestration-status' value='Deactivated' />
+                                                                                        </update>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </execute>
                                                                         </outcome>
-                                                                    </execute>
+                                                                        <outcome value=''></outcome>
+                                                                    </switch>
                                                                 </block>
                                                             </outcome>
                                                             <outcome value='not-found'>