Passing a correct OTN tunnel ID and a correct Ethernet Service ID for deletion.

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml

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 3fe3802..214debf 100644 (file)
--- 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,7 +128,7 @@
                                                                     </get-resource>\r
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                         <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->\r
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />\r
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />\r
                                                                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
                                                                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
                                                                         <parameter name="format" value="json"/>\r
@@ -151,7 +151,7 @@
                                                                         </outcome>\r
                                                                     </execute>\r
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />\r
+                                                                        <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`" />\r
                                                                         <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->\r
                                                                         <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->\r
                                                                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
@@ -176,7 +176,7 @@
                                                                                 <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                         key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\r
                                                                                     <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\r
-                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />\r
+                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\r
                                                                                     <parameter name='operational-status' value='Deactivated' />\r
                                                                                 </update>\r
                                                                                 <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r