summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main/xml
diff options
context:
space:
mode:
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml6
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml4
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml6
3 files changed, 9 insertions, 7 deletions
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 b94ac023..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
@@ -187,6 +187,7 @@
<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`" />
@@ -214,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'
@@ -366,6 +367,7 @@
<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`" />
@@ -393,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'
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 ff238661..4c6b84b0 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
@@ -352,7 +352,7 @@
<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
- <parameter name='cvlan' value='' />
+ <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
<parameter name='CIR' value='`$prop.sotn.cir`' />
@@ -608,7 +608,7 @@
<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
- <parameter name='cvlan' value='' />
+ <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
<parameter name='CIR' value='`$prop.sotn.cir`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
index 3fe38029..214debf8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
@@ -128,7 +128,7 @@
</get-resource>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
<parameter name="format" value="json"/>
@@ -151,7 +151,7 @@
</outcome>
</execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
<!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
<!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
@@ -176,7 +176,7 @@
<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
- <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />
+ <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
<parameter name='operational-status' value='Deactivated' />
</update>
<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'