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=214debf86cd347339b8720ac8ea52f9175a77a8d;hb=c8167f18f2f62c31a84c934325c5d0ca4d721b05;hp=2517645dd24e01495aaeb01d2a9919bf939f0118;hpb=550fe5b30603ff6da993acc5aeea83d1096433eb;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..214debf8 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,7 +143,7 @@
                                                                             <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'>
@@ -151,7 +151,7 @@
                                                                         </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.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`" />
@@ -168,7 +168,7 @@
                                                                             <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 ethernet service rest api" />
                                                                             </return>
                                                                         </outcome>
                                                                         <outcome value='success'>
@@ -176,7 +176,7 @@
                                                                                 <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='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'