diff options
author | 2021-04-16 20:54:28 +0000 | |
---|---|---|
committer | 2021-04-16 20:57:23 +0000 | |
commit | 579cc72f0f59480b12d2867c44ad14893c5c5c68 (patch) | |
tree | 0c8cd5d22b8ee4d41f260ea74b5208b067947c11 /platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml | |
parent | 222373146abac13750ccfc7faf4159508467698d (diff) |
Bug fixing required for integration testing with PCE.
Issue-ID: SDNC-1525
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I10f44c73b8d664ab124eff12f20eb3cc33c68b77
Former-commit-id: 681381546eefa95e48370575d7572d1b901e22d2
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.xml | 49 |
1 files changed, 30 insertions, 19 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 d61c494b..446a74a8 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 @@ -33,16 +33,26 @@ <outcome value='false'></outcome>
<outcome value='true'>
<block>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="pnfs"
+ key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"
+ local-only="false"
+ pfx="ccsdkTopopnfs" ></get-resource>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="logical-links"
+ key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"
+ local-only="false"
+ pfx="ccsdkTopologicalLinks" ></get-resource>
<set>
<parameter name='tmp.arr' value='' />
<parameter name='tmp.arridx' value='0' />
<parameter name='tmp.arr_length' value='0' />
<parameter name='otn-tunnel-slice' value='' />
<parameter name='otn-tunnel-slice_length' value='0' />
- <parameter name='tmp.slicevpns' value='' />
- <parameter name='tmp.slicevpns_length' value='0' />
- <parameter name='tmp.slicevpnuuids' value='' />
- <parameter name='tmp.slicevpnuuids.' value='' />
+ <!--<parameter name='tmp.slicevpns' value='' />-->
+ <!--<parameter name='tmp.slicevpns_length' value='0' />-->
+ <!--<parameter name='tmp.slicevpnuuids' value='' />-->
+ <!--<parameter name='tmp.slicevpnuuids.' value='' />-->
</set>
<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
<set>
@@ -721,6 +731,9 @@ <parameter name='prop.ethsrvType' value='`$network-route-A`' />
</set>
<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+ <parameter name="filename" value="`$filenamemm`" />
+ </execute>
<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
<block atomic='true'>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
@@ -828,18 +841,22 @@ </get-resource>
<switch test='`$otnidx == 0`'>
<outcome value='true'>
- <set>
- <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
- <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
- </set>
+ <block>
+ <set>
+ <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+ <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+ </set>
+ </block>
</outcome>
<outcome value='false'>
<switch test='`$otnidx == $tmp.otninfo_length - 1`'>
<outcome value='true'>
- <set>
- <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
- <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
- </set>
+ <block>
+ <set>
+ <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+ <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+ </set>
+ </block>
</outcome>
<outcome value='false'>
<set>
@@ -878,13 +895,7 @@ <!-- 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>
- <parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value="`$prop.vpn-binding-otnidx-uuid`" />
- <parameter name='tmp.slicevpns_length' value="`$tmp.slicevpns_length + 1`" />
- <parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value="`$prop.vpn-binding-otnidx-uuid`" />
- </set>
- </block>
+ <block></block>
</outcome>
</save>
<switch test='`$otnidx == 0`'>
|