Fixing a bug in calling path computation

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml

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 35853b8..2f2e4d9 100644 (file)
--- 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`" />\r
                 </set>\r
                 <switch test='`$hasSecondary`'>\r
-                    <outcome value='false'>\r
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >\r
-                            <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>\r
-                            <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>\r
-                            <parameter name="response-pfx" value="otn-oof"/>\r
-                            <parameter name="output-end-to-end-path" value="false"/>\r
-                            <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->\r
-                            <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->\r
-                            <parameter name="src-node" value="`$tmp.pce-src-node`"/>\r
-                            <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>\r
-                            <outcome value='success'></outcome>\r
-                            <outcome value='Other'></outcome>\r
-                            <outcome value='not-found'></outcome>\r
-                        </execute>\r
-                    </outcome>\r
                     <outcome value='true'>\r
                         <block>\r
                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >\r
@@ -221,6 +206,23 @@
                             </execute>\r
                         </block>\r
                     </outcome>\r
+                    <outcome value='Other'>\r
+                        <block>\r
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >\r
+                                <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>\r
+                                <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>\r
+                                <parameter name="response-pfx" value="otn-oof"/>\r
+                                <parameter name="output-end-to-end-path" value="false"/>\r
+                                <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->\r
+                                <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->\r
+                                <parameter name="src-node" value="`$tmp.pce-src-node`"/>\r
+                                <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>\r
+                                <outcome value='success'></outcome>\r
+                                <outcome value='Other'></outcome>\r
+                                <outcome value='not-found'></outcome>\r
+                            </execute>\r
+                        </block>\r
+                    </outcome>\r
                 </switch>\r
             </block>\r
             <set>\r