X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml;h=b94ac02388962e97dd1a5f907088a8046789fafe;hb=bc1bd4fa36e505263dcd3cd62c3a8e26dcd60743;hp=c3b48106186d3e658dc6b7e0f19f0437868e5c21;hpb=c84a5266fc2ab31cb2bb68927457f6cdbb40c0b3;p=sdnc%2Foam.git

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..b94ac023 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
@@ -36,6 +36,9 @@
                                             <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
                                                 <outcome value='vpn-binding'>
                                                     <block atomic="true">
+                                                        <set>
+                                                            <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                        </set>
                                                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                                                       resource="vpn-binding"
                                                                       key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
@@ -43,6 +46,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 +155,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 +166,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'>
@@ -168,7 +174,9 @@
                                                                                     </outcome>
                                                                                 </execute>
                                                                                 <set>
-                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
+                                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
                                                                                     <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
                                                                                     <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
                                                                                     <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
@@ -177,6 +185,8 @@
                                                                                     <parameter name='index-number' value='0' />
                                                                                     <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
                                                                                     <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
+                                                                                    <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                    <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
                                                                                 </set>
                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
@@ -185,7 +195,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 +206,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 +241,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 +334,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 +345,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'>
@@ -343,7 +353,9 @@
                                                                                             </outcome>
                                                                                         </execute>
                                                                                         <set>
-                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->
+                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />
+                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
                                                                                             <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />
                                                                                             <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />
                                                                                             <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />
@@ -352,6 +364,8 @@
                                                                                             <parameter name='index-number' value='0' />
                                                                                             <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />
                                                                                             <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />
+                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
+                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
                                                                                         </set>
                                                                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                                             <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
@@ -371,7 +385,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'>