From 7625de0fd263142c2a676c9424cb2936622ed029 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 4 May 2022 15:20:28 -0400
Subject: Make sure to set dst topology id when hasSecondary flag is empty.
 This is required for CCVPN Transport Slicing use-case.

Issue-ID: SDNC-1694
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I3d99ee179007b582f798312e6fe84907ebf36a8a

Former-commit-id: 5e8b777e8b5d878a41411966475d5a1bfd339751
---
 ...f-topology-operation-get-otn-tunnel-path-from-oof.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/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 2f2e4d96..9313ff60 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
@@ -31,11 +31,6 @@
                                         <outcome value='true'>
                                             <block>
                                                 <switch test='`$hasSecondary`'>
-                                                    <outcome value='false'>
-                                                        <set>
-                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
-                                                        </set>
-                                                    </outcome>
                                                     <outcome value='true'>
                                                         <block>
                                                             <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
@@ -60,6 +55,11 @@
                                                             </switch>
                                                         </block>
                                                     </outcome>
+                                                    <outcome value='Other'>
+                                                        <set>
+                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                        </set>
+                                                    </outcome>
                                                 </switch>
                                             </block>
                                         </outcome>
@@ -71,7 +71,11 @@
                                             <block>
                                                 <switch test='`$hasSecondary`'>
                                                     <outcome value='true'>
-                                                        <block></block>
+                                                        <block>
+                                                            <set>
+                                                                <parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                            </set>
+                                                        </block>
                                                     </outcome>
                                                 </switch>
                                             </block>
-- 
cgit 1.2.3-korg