diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2020-12-10 22:27:04 +0000 |
|---|---|---|
| committer | Hesam Rahimi <hesam.rahimi@huawei.com> | 2020-12-10 23:30:42 +0000 |
| commit | bc1bd4fa36e505263dcd3cd62c3a8e26dcd60743 (patch) | |
| tree | 7fde913467eeb2b0225ad7eefcc447281cd48893 /platform-logic/generic-resource-api/src/main/xml | |
| parent | c01c0defdd28081f120d79fd4f54ec2a9cd1c916 (diff) | |
Use same name for OTN Tunnels and Ethernet Services in both domains.
Issue-ID: SDNC-1431
Change-Id: I5cc4d3c503d3b3e16e1223a50df654d19478b8cc
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Former-commit-id: b89b641bc03235f14409107dea771ae2f6db44d7
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 20 insertions, 4 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 bb6d1ae1..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 @@ -174,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`' />
@@ -183,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`" />
@@ -349,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`' />
@@ -358,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`" />
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 02312230..ff238661 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 @@ -162,6 +162,12 @@ </outcome>
<outcome value='success'>
<block>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+ <parameter name="ctx-destination" value="prop.ethernet-service-name"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+ <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
+ </execute>
<set>
<parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />
</set>
@@ -339,6 +345,7 @@ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+ <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
<parameter name='operational-status' value='Created' />
<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
@@ -594,6 +601,7 @@ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+ <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
<parameter name='operational-status' value='Created' />
<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
@@ -702,7 +710,7 @@ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
- <parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />
+ <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
<parameter name='access-provider-id' value='`$domain-A.provider-id`' />
<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
<parameter name='access-client-id' value='`$domain-A.client-id`' />
@@ -738,7 +746,7 @@ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
- <parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />
+ <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
<parameter name='access-provider-id' value='`$domain-B.provider-id`' />
<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
<parameter name='access-client-id' value='`$domain-B.client-id`' />
|