diff options
author | 2021-11-10 15:18:04 +0000 | |
---|---|---|
committer | 2021-11-10 15:18:04 +0000 | |
commit | 0a1a40c657d27608bbad79c0a00355212d94c5e5 (patch) | |
tree | 4af2635ef3af622493e9ddc360435987235e7ee1 /platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml | |
parent | e5d8813e686c981a2e5a2572bc198984bbf3acaa (diff) | |
parent | 22d596935f2edeefbe3f0d5acc72cf39e27e17aa (diff) |
Merge "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."
Former-commit-id: 1e0e6fc0a578b7359c7aa2a069924802e2a7a300
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml')
-rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.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-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml index dcc3d696..de311094 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.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> <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" @@ -973,19 +973,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='`$tmp.aai.the-vpn-binding.vpn-name`' /> - <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' /> - <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' /> - <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='`$tmp.aai.the-vpn-binding.vpn-name`' /> + <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' /> + <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' /> + <parameter name='operational-status' value='Modified' /> + </update> + </block> + </outcome> + </switch> </block> </outcome> <outcome value='false'></outcome> |