Use same name for OTN Tunnels and Ethernet Services in both domains.

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
index 3af9347..b94ac02 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
@@ -36,6 +36,9 @@
                                             <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\r
                                                 <outcome value='vpn-binding'>\r
                                                     <block atomic="true">\r
+                                                        <set>\r
+                                                            <parameter name='tmp.aai.vpn-binding.' value='' />\r
+                                                        </set>\r
                                                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
                                                                       resource="vpn-binding"\r
                                                                       key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"\r
@@ -171,7 +174,9 @@
                                                                                     </outcome>\r
                                                                                 </execute>\r
                                                                                 <set>\r
-                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\r
+                                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\r
+                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\r
+                                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\r
                                                                                     <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\r
                                                                                     <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\r
                                                                                     <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\r
@@ -180,6 +185,8 @@
                                                                                     <parameter name='index-number' value='0' />\r
                                                                                     <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\r
                                                                                     <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\r
+                                                                                    <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\r
+                                                                                    <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\r
                                                                                 </set>\r
                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />\r
@@ -346,7 +353,9 @@
                                                                                             </outcome>\r
                                                                                         </execute>\r
                                                                                         <set>\r
-                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\r
+                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\r
+                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\r
+                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\r
                                                                                             <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\r
                                                                                             <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\r
                                                                                             <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\r
@@ -355,6 +364,8 @@
                                                                                             <parameter name='index-number' value='0' />\r
                                                                                             <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\r
                                                                                             <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\r
+                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\r
+                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\r
                                                                                         </set>\r
                                                                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                             <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />\r