From 284450cd6da9aabcb9817f22b606d6f149d3d8df Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 4 May 2022 15:20:28 -0400
Subject: [PATCH] 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: 50acc01f3c29efe1551dd16cc24b72aab87ce8e2
---
 ...ogy-operation-get-otn-tunnel-path-from-oof.json | 58 +++++++++++-----------
 ...logy-operation-get-otn-tunnel-path-from-oof.xml | 16 +++---
 2 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
index 1b156b99..15dc9087 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
@@ -1857,8 +1857,8 @@
         "name": "set otnTopoIdDst",
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3134.566650390625,
-        "y": 244.56666564941406,
+        "x": 3173.566650390625,
+        "y": 324.566650390625,
         "z": "67ca1183.dbac8",
         "wires": []
     },
@@ -1988,8 +1988,8 @@
         "name": "set otnTopoIdDstBackup",
         "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3224.566650390625,
-        "y": 495.5666961669922,
+        "x": 3289.566650390625,
+        "y": 495.56671142578125,
         "z": "67ca1183.dbac8",
         "wires": []
     },
@@ -3446,7 +3446,7 @@
         "wires": [
             [
                 "4aea8251.037e9c",
-                "52f89c33.605164"
+                "20a24c0d.297c6c"
             ]
         ]
     },
@@ -3457,8 +3457,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2978.7666015625,
-        "y": 332.6499938964844,
+        "x": 2936.7666015625,
+        "y": 225.6499786376953,
         "z": "67ca1183.dbac8",
         "wires": [
             [
@@ -3474,8 +3474,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3105.7666015625,
-        "y": 331.6499938964844,
+        "x": 3069.7666015625,
+        "y": 227.6499786376953,
         "z": "67ca1183.dbac8",
         "wires": [
             [
@@ -3490,8 +3490,8 @@
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3328.64990234375,
-        "y": 326.53330993652344,
+        "x": 3304.64990234375,
+        "y": 237.53334045410156,
         "z": "67ca1183.dbac8",
         "wires": [
             [
@@ -3584,22 +3584,6 @@
             ]
         ]
     },
-    {
-        "id": "52f89c33.605164",
-        "type": "outcomeTrue",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2983.5,
-        "y": 284.6499938964844,
-        "z": "67ca1183.dbac8",
-        "wires": [
-            [
-                "82fe228a.5ad828"
-            ]
-        ]
-    },
     {
         "id": "89b993df.07b78",
         "type": "set",
@@ -3694,7 +3678,9 @@
         "y": 406.4499816894531,
         "z": "67ca1183.dbac8",
         "wires": [
-            []
+            [
+                "c6b462ec.d5ec38"
+            ]
         ]
     },
     {
@@ -3840,5 +3826,21 @@
                 "1548db64.e4c295"
             ]
         ]
+    },
+    {
+        "id": "20a24c0d.297c6c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2982.566650390625,
+        "y": 329.566650390625,
+        "z": "67ca1183.dbac8",
+        "wires": [
+            [
+                "82fe228a.5ad828"
+            ]
+        ]
     }
 ]
\ No newline at end of file
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>
-- 
2.16.6