From 3bd83a42221c4f5c0cbaf586657e5310c8516018 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Mon, 6 May 2019 12:03:42 +0530
Subject: Fix SDWAN peer wise integration testing issues

SDWAN lan-port-config create,activate DGs are
fixed with valid request-action and updated
service-data with response-id returned from
SDWAN controller

Change-Id: Ib4067d4de257c64f81b4e70584bcf26c87bbaa04
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: 08d1ca8e484cab832ce1f54cc36539888d77b08a
---
 ...CE-API_sdwan-vf-operation-lanport-activate.json | 86 +++++++++++++++++++---
 1 file changed, 75 insertions(+), 11 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json')

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
index 710748fc..722e5c12 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
@@ -557,8 +557,8 @@
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1243.008186340332,
-        "y": 773.003986954689,
+        "x": 1251.008171081543,
+        "y": 817.0040302276611,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -573,8 +573,8 @@
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 889.0080261230469,
-        "y": 740.0040270090103,
+        "x": 1256.0080871582031,
+        "y": 730.0041098594666,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -594,7 +594,7 @@
         "z": "8f678717.6ce918",
         "wires": [
             [
-                "752f257f.d5098c"
+                "f8bad303.dbe7d"
             ]
         ]
     },
@@ -605,8 +605,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1465.0081024169922,
-        "y": 773.0040684938431,
+        "x": 1501.0082206726074,
+        "y": 811.0041122436523,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -2086,8 +2086,8 @@
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1949.2583618164062,
-        "y": 755.5041704177856,
+        "x": 1961.2583961486816,
+        "y": 799.5041923522949,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -2119,8 +2119,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1663.5312805175781,
-        "y": 781.0312776565552,
+        "x": 1693.531337738037,
+        "y": 804.0312929153442,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -2241,5 +2241,69 @@
         "y": 2197.2225341796875,
         "z": "8f678717.6ce918",
         "wires": []
+    },
+    {
+        "id": "f8bad303.dbe7d",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 875,
+        "y": 666.6666870117188,
+        "z": "8f678717.6ce918",
+        "wires": [
+            [
+                "8c2d8bf6.5cda78"
+            ]
+        ]
+    },
+    {
+        "id": "8c2d8bf6.5cda78",
+        "type": "switchNode",
+        "name": "switch vf-modules.vf-module_length",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 708.7500152587891,
+        "y": 790.9167098999023,
+        "z": "8f678717.6ce918",
+        "wires": [
+            [
+                "fd56a113.86307"
+            ]
+        ]
+    },
+    {
+        "id": "fd56a113.86307",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 877,
+        "y": 734.6666870117188,
+        "z": "8f678717.6ce918",
+        "wires": [
+            [
+                "341d8e5.7253272"
+            ]
+        ]
+    },
+    {
+        "id": "341d8e5.7253272",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1024.2500305175781,
+        "y": 733.416708946228,
+        "z": "8f678717.6ce918",
+        "wires": [
+            [
+                "752f257f.d5098c"
+            ]
+        ]
     }
 ]
\ No newline at end of file
-- 
cgit 1.2.3-korg