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=e9766c5ccf5f7f6a6cbe69e8db88cd283541f7a2;hb=180d53b78636fa60ee37376da7de9289b6ebf31c;hp=3af9347e1747bc35c29e2c04c7738882b4003b10;hpb=ee97c448a56c2a0ee4eebbfecb10b92d3755fb76;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 3af9347e..e9766c5c 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"
@@ -171,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`' />
@@ -180,6 +185,9 @@
                                                                                     <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`' />
+                                                                                    <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
                                                                                 </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`" />
@@ -207,7 +215,7 @@
                                                                                             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                     key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
                                                                                                 <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
-                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
                                                                                                 <parameter name='operational-status' value='Activated' />
                                                                                             </update>
                                                                                             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
@@ -346,7 +354,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`' />
@@ -355,6 +365,9 @@
                                                                                             <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`' />
+                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />
                                                                                         </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`" />
@@ -382,7 +395,7 @@
                                                                                                     <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                             key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >
                                                                                                         <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
-                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
+                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
                                                                                                         <parameter name='operational-status' value='Activated' />
                                                                                                     </update>
                                                                                                     <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'