diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2021-11-04 11:44:51 -0400 |
|---|---|---|
| committer | Hesam Rahimi <hesam.rahimi@huawei.com> | 2021-11-04 11:56:17 -0400 |
| commit | 22d596935f2edeefbe3f0d5acc72cf39e27e17aa (patch) | |
| tree | b453f48841b2e5d8b48578084a2e3c2a5f799bf7 /platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml | |
| parent | b7cd528f9b720b4f820ac5eb38f01df2b16c9817 (diff) | |
Adding support for connecting a single ONU port to multiple clouds with different vlan-id's.
Also fixing a few bugs in cll creation and deletion.
Issue-ID: SDNC-1594
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I5e1b117104ef32f5dbb9b83e2c19ba3727789fe5
Former-commit-id: af17de2185bc8e0d1a7f0cb6f965df157c893412
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml index 0fc5dcd4..b928dba4 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml @@ -492,7 +492,7 @@ $param-prefix-domainA-pnfName[8]`" />
<!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
<parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
- <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+ <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />
<parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
@@ -693,7 +693,7 @@ $param-prefix-domainB-pnfName[8]`" />
<!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
<parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
- <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+ <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
<parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
</set>
<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
@@ -1342,19 +1342,29 @@ <outcome value='true'>
<block atomic='true'>
<set>
- <parameter name='tmp.aai.the-vpn-binding.' value="" />
+ <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
</set>
- <set>
- <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
- </set>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
- key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
- <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
- <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
- <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
- <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
- <parameter name='operational-status' value='Modified' />
- </update>
+ <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+ <switch test="`$foundVpnName`">
+ <outcome value='true'>
+ <block atomic='true'>
+ <set>
+ <parameter name='tmp.aai.the-vpn-binding.' value="" />
+ </set>
+ <set>
+ <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+ </set>
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+ key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+ <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+ <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
+ <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+ <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
+ <parameter name='operational-status' value='Modified' />
+ </update>
+ </block>
+ </outcome>
+ </switch>
</block>
</outcome>
<outcome value='false'></outcome>
|