aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
diff options
context:
space:
mode:
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml')
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml45
1 files changed, 25 insertions, 20 deletions
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 b2bf06ce..d61c494b 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
@@ -178,11 +178,12 @@
<parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
</execute>
<set>
- <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />
+ <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
+ <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
</set>
<set>
- <!--<parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />-->
- <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-id`" />
+ <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />
+ <!--<parameter name='network-route-A' value="`$tmp.aai.logical-link.link-id`" />-->
</set>
<set>
<parameter name='network-route-B' value="`$tmp.aai.logical-link.link-name2`" />
@@ -366,12 +367,12 @@
<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='`$tmp.aai.network-route-A.logical-interface-id`' />
- <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+ <parameter name='bandwidth-profile-name' value='`$gfp`' />
<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
- <parameter name='CIR' value='`$prop.sotn.cir`' />
- <parameter name='EIR' value='`$prop.sotn.eir`' />
- <parameter name='CBS' value='`$prop.sotn.cbs`' />
- <parameter name='EBS' value='`$prop.sotn.ebs`' />
+ <parameter name='cir' value='`$gfp *1000000`' />
+ <parameter name='eir' value='`$gfp *1000000`' />
+ <parameter name='cbs' value='`$prop.sotn.cbs`' />
+ <parameter name='ebs' value='`$prop.sotn.ebs`' />
<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
@@ -622,12 +623,12 @@
<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='`$tmp.aai.network-route-B.logical-interface-id`' />
- <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+ <parameter name='bandwidth-profile-name' value='`$gfp`' />
<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
- <parameter name='CIR' value='`$prop.sotn.cir`' />
- <parameter name='EIR' value='`$prop.sotn.eir`' />
- <parameter name='CBS' value='`$prop.sotn.cbs`' />
- <parameter name='EBS' value='`$prop.sotn.ebs`' />
+ <parameter name='cir' value='`$gfp *1000000`' />
+ <parameter name='eir' value='`$gfp *1000000`' />
+ <parameter name='cbs' value='`$prop.sotn.cbs`' />
+ <parameter name='ebs' value='`$prop.sotn.ebs`' />
<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
@@ -867,7 +868,6 @@
<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />
<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
<parameter name='route-distinguisher' value='`$gfp`' />
- <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
<parameter name='operational-status' value='Created' />
<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
@@ -875,6 +875,8 @@
<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
+ <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
+ <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />
<outcome value='success'>
<block>
<set>
@@ -986,12 +988,13 @@
<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
<!--<parameter name='access-ltp-id' 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='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->
+ <parameter name='bandwidth-profile-name' value='`$gfp`' />
<parameter name='vpn-type' value='dummy' />
- <!--<parameter name='CIR' value='`$prop.sotn.cir`' />-->
- <!--<parameter name='EIR' value='`$prop.sotn.eir`' />-->
- <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->
- <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->
+ <parameter name='cir' value='`$gfp *1000000`' />
+ <parameter name='eir' value='`$gfp *1000000`' />
+ <!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->
+ <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->
<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
@@ -1096,7 +1099,9 @@
<block atomic="true">
<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
<block atomic='true'>
- <switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">
+ <!--<switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">-->
+ <!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->
+ <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `">
<outcome value='true'>
<block atomic='true'>
<set>