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-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 0231223..ff23866 100644 (file)
--- 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>\r
                                                                                         <outcome value='success'>\r
                                                                                             <block>\r
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                    <parameter name="ctx-destination" value="prop.ethernet-service-name"/>\r
+                                                                                                </execute>\r
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                    <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>\r
+                                                                                                </execute>\r
                                                                                                 <set>\r
                                                                                                     <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />\r
                                                                                                 </set>\r
@@ -339,6 +345,7 @@
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
                                                                                                                               key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\r
                                                                                                                             <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\r
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\r
                                                                                                                             <parameter name='operational-status' value='Created' />\r
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\r
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\r
@@ -594,6 +601,7 @@
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
                                                                                                                               key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\r
                                                                                                                             <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\r
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\r
                                                                                                                             <parameter name='operational-status' value='Created' />\r
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\r
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\r
@@ -702,7 +710,7 @@
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\r
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\r
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />\r
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
                                                                                                     <parameter name='access-provider-id' value='`$domain-A.provider-id`' />\r
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\r
                                                                                                     <parameter name='access-client-id' value='`$domain-A.client-id`' />\r
@@ -738,7 +746,7 @@
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\r
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\r
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />\r
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
                                                                                                     <parameter name='access-provider-id' value='`$domain-B.provider-id`' />\r
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\r
                                                                                                     <parameter name='access-client-id' value='`$domain-B.client-id`' />\r