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

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 1b156b9..15dc908 100644 (file)
--- 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",\r
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
-        "x": 3134.566650390625,\r
-        "y": 244.56666564941406,\r
+        "x": 3173.566650390625,\r
+        "y": 324.566650390625,\r
         "z": "67ca1183.dbac8",\r
         "wires": []\r
     },\r
@@ -1988,8 +1988,8 @@
         "name": "set otnTopoIdDstBackup",\r
         "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
-        "x": 3224.566650390625,\r
-        "y": 495.5666961669922,\r
+        "x": 3289.566650390625,\r
+        "y": 495.56671142578125,\r
         "z": "67ca1183.dbac8",\r
         "wires": []\r
     },\r
@@ -3446,7 +3446,7 @@
         "wires": [\r
             [\r
                 "4aea8251.037e9c",\r
-                "52f89c33.605164"\r
+                "20a24c0d.297c6c"\r
             ]\r
         ]\r
     },\r
@@ -3457,8 +3457,8 @@
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2978.7666015625,\r
-        "y": 332.6499938964844,\r
+        "x": 2936.7666015625,\r
+        "y": 225.6499786376953,\r
         "z": "67ca1183.dbac8",\r
         "wires": [\r
             [\r
@@ -3474,8 +3474,8 @@
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3105.7666015625,\r
-        "y": 331.6499938964844,\r
+        "x": 3069.7666015625,\r
+        "y": 227.6499786376953,\r
         "z": "67ca1183.dbac8",\r
         "wires": [\r
             [\r
@@ -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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3328.64990234375,\r
-        "y": 326.53330993652344,\r
+        "x": 3304.64990234375,\r
+        "y": 237.53334045410156,\r
         "z": "67ca1183.dbac8",\r
         "wires": [\r
             [\r
@@ -3584,22 +3584,6 @@
             ]\r
         ]\r
     },\r
-    {\r
-        "id": "52f89c33.605164",\r
-        "type": "outcomeTrue",\r
-        "name": "false",\r
-        "xml": "<outcome value='false'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2983.5,\r
-        "y": 284.6499938964844,\r
-        "z": "67ca1183.dbac8",\r
-        "wires": [\r
-            [\r
-                "82fe228a.5ad828"\r
-            ]\r
-        ]\r
-    },\r
     {\r
         "id": "89b993df.07b78",\r
         "type": "set",\r
@@ -3694,7 +3678,9 @@
         "y": 406.4499816894531,\r
         "z": "67ca1183.dbac8",\r
         "wires": [\r
-            []\r
+            [\r
+                "c6b462ec.d5ec38"\r
+            ]\r
         ]\r
     },\r
     {\r
@@ -3840,5 +3826,21 @@
                 "1548db64.e4c295"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "20a24c0d.297c6c",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2982.566650390625,\r
+        "y": 329.566650390625,\r
+        "z": "67ca1183.dbac8",\r
+        "wires": [\r
+            [\r
+                "82fe228a.5ad828"\r
+            ]\r
+        ]\r
     }\r
 ]
\ 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 2f2e4d9..9313ff6 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
@@ -31,11 +31,6 @@
                                         <outcome value='true'>\r
                                             <block>\r
                                                 <switch test='`$hasSecondary`'>\r
-                                                    <outcome value='false'>\r
-                                                        <set>\r
-                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\r
-                                                        </set>\r
-                                                    </outcome>\r
                                                     <outcome value='true'>\r
                                                         <block>\r
                                                             <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\r
@@ -60,6 +55,11 @@
                                                             </switch>\r
                                                         </block>\r
                                                     </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <set>\r
+                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\r
+                                                        </set>\r
+                                                    </outcome>\r
                                                 </switch>\r
                                             </block>\r
                                         </outcome>\r
@@ -71,7 +71,11 @@
                                             <block>\r
                                                 <switch test='`$hasSecondary`'>\r
                                                     <outcome value='true'>\r
-                                                        <block></block>\r
+                                                        <block>\r
+                                                            <set>\r
+                                                                <parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\r
+                                                            </set>\r
+                                                        </block>\r
                                                     </outcome>\r
                                                 </switch>\r
                                             </block>\r