From bc1bd4fa36e505263dcd3cd62c3a8e26dcd60743 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Thu, 10 Dec 2020 22:27:04 +0000
Subject: Use same name for OTN Tunnels and Ethernet Services in both domains.

Issue-ID: SDNC-1431
Change-Id: I5cc4d3c503d3b3e16e1223a50df654d19478b8cc
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>

Former-commit-id: b89b641bc03235f14409107dea771ae2f6db44d7
---
 ...-API_tsli-vnf-topology-operation-trans-slice-allocate.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
index 02312230..ff238661 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
@@ -162,6 +162,12 @@
                                                                                         </outcome>
                                                                                         <outcome value='success'>
                                                                                             <block>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                    <parameter name="ctx-destination" value="prop.ethernet-service-name"/>
+                                                                                                </execute>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                    <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
+                                                                                                </execute>
                                                                                                 <set>
                                                                                                     <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />
                                                                                                 </set>
@@ -339,6 +345,7 @@
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                               key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
                                                                                                                             <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
                                                                                                                             <parameter name='operational-status' value='Created' />
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
@@ -594,6 +601,7 @@
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                               key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
                                                                                                                             <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
                                                                                                                             <parameter name='operational-status' value='Created' />
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
@@ -702,7 +710,7 @@
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
                                                                                                     <parameter name='access-provider-id' value='`$domain-A.provider-id`' />
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
                                                                                                     <parameter name='access-client-id' value='`$domain-A.client-id`' />
@@ -738,7 +746,7 @@
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
                                                                                                     <parameter name='access-provider-id' value='`$domain-B.provider-id`' />
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
                                                                                                     <parameter name='access-client-id' value='`$domain-B.client-id`' />
-- 
cgit 1.2.3-korg