summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main/xml
diff options
context:
space:
mode:
authorHesam Rahimi <hesam.rahimi@huawei.com>2022-04-29 09:50:05 -0400
committerHesam Rahimi <hesam.rahimi@huawei.com>2022-04-29 09:50:05 -0400
commit7bd484302cdc29bc758cd9285ea191c17138bbcd (patch)
tree2fb3a9af1a44873e240a76cc4403d9b5192dfb11 /platform-logic/generic-resource-api/src/main/xml
parentbc1efc898fb2cdf122e5239d8ae2da81cdec5e9e (diff)
Fixing a bug in calling path computation
(for transport slicing and cloud leased-line use cases) when secondary root is null. Issue-ID: SDNC-1694 Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com> Change-Id: I264029fde5b6e721f5670447e36d0d6e301b85a9 Former-commit-id: 6fe357efda5cede3705b08a0c1c321c42fb3129f
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml32
1 files changed, 17 insertions, 15 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
index 35853b85..2f2e4d96 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
@@ -187,21 +187,6 @@
<parameter name='filenamemm' value="`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`" />
</set>
<switch test='`$hasSecondary`'>
- <outcome value='false'>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >
- <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
- <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
- <parameter name="response-pfx" value="otn-oof"/>
- <parameter name="output-end-to-end-path" value="false"/>
- <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
- <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
- <parameter name="src-node" value="`$tmp.pce-src-node`"/>
- <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
- <outcome value='success'></outcome>
- <outcome value='Other'></outcome>
- <outcome value='not-found'></outcome>
- </execute>
- </outcome>
<outcome value='true'>
<block>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >
@@ -221,6 +206,23 @@
</execute>
</block>
</outcome>
+ <outcome value='Other'>
+ <block>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >
+ <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
+ <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
+ <parameter name="response-pfx" value="otn-oof"/>
+ <parameter name="output-end-to-end-path" value="false"/>
+ <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
+ <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
+ <parameter name="src-node" value="`$tmp.pce-src-node`"/>
+ <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
+ <outcome value='success'></outcome>
+ <outcome value='Other'></outcome>
+ <outcome value='not-found'></outcome>
+ </execute>
+ </block>
+ </outcome>
</switch>
</block>
<set>