From 1d98b77f5794ce6f2ec457ae5cc73a5d4601491a Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 11 Nov 2020 16:01:57 +0000
Subject: - Changing POST operation to PATCH for OTN Tunnel creation. - Adding
 Transport Slicing DGs into graph.versions - Fixing template files for OTN
 tunnel creation

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

Former-commit-id: 97afd8c7495cf23e8819cb666be9ccbe4f968f68
---
 ...li-vnf-topology-operation-trans-slice-activate.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to '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 c3b48106..3af9347e 100644
--- 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
@@ -43,6 +43,9 @@
                                                                       pfx="tmp.aai.vpn-binding" >
                                                             <outcome value='success'>
                                                                 <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />
+                                                                    </set>
                                                                     <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
                                                                         <outcome value='Other'>
                                                                             <block atomic="true">
@@ -149,7 +152,7 @@
                                                                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
                                                                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
                                                                                     <parameter name="format" value="json"/>
-                                                                                    <parameter name="httpMethod" value="post"/>
+                                                                                    <parameter name="httpMethod" value="patch"/>
                                                                                     <parameter name="responsePrefix" value="otn-oof"/>
                                                                                     <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                                                                     <parameter name="trustStorePassword" value="adminadmin"/>
@@ -160,7 +163,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 Create OTN tunnel rest api" />
                                                                                         </return>
                                                                                     </outcome>
                                                                                     <outcome value='success'>
@@ -185,7 +188,7 @@
                                                                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
                                                                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
                                                                                     <parameter name="format" value="json"/>
-                                                                                    <parameter name="httpMethod" value="post"/>
+                                                                                    <parameter name="httpMethod" value="patch"/>
                                                                                     <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
                                                                                     <parameter name="responsePrefix" value="vpn-result"/>
                                                                                     <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
@@ -196,7 +199,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 Create ethernet service rest api" />
                                                                                         </return>
                                                                                     </outcome>
                                                                                     <outcome value='success'>
@@ -231,7 +234,7 @@
                                                                                             <parameter name='src-tpn-id' value='1' />
                                                                                             <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
                                                                                             <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                            <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                            <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
                                                                                             <parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
                                                                                             <parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
                                                                                             <parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
@@ -324,7 +327,7 @@
                                                                                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
                                                                                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
                                                                                             <parameter name="format" value="json"/>
-                                                                                            <parameter name="httpMethod" value="post"/>
+                                                                                            <parameter name="httpMethod" value="patch"/>
                                                                                             <parameter name="responsePrefix" value="otn-oof"/>
                                                                                             <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                                                                             <parameter name="trustStorePassword" value="adminadmin"/>
@@ -335,7 +338,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 Create OTN tunnel rest api" />
                                                                                                 </return>
                                                                                             </outcome>
                                                                                             <outcome value='success'>
@@ -371,7 +374,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 Create ethernet service rest api" />
                                                                                                 </return>
                                                                                             </outcome>
                                                                                             <outcome value='success'>
-- 
cgit 1.2.3-korg