From: Amir Skalka <amir.skalka@intl.att.com>
Date: Tue, 17 Dec 2019 17:39:04 +0000 (+0200)
Subject: Fix e2e test of upgrade VFM
X-Git-Tag: 6.0.1~58^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dddb192559b146eda4aa8ac011a1d0a2b60c45cd;p=vid.git

Fix e2e test of upgrade VFM

Issue-ID: VID-603
Signed-off-by: Amir Skalka <amir.skalka@intl.att.com>
Change-Id: I678a0f30da8236952def96c582863c8200857d45
---

diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json
index 748b5f267..b1c9d9b9a 100644
--- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json
@@ -34,7 +34,6 @@
           "b0732bed-3ddf-43cc-b193-7f18db84e476": {
             "action": "None_Upgrade",
             "retainAssignments" : false,
-            "retainVolumeGroups" : false,
             "sdncPreLoad" : true,
             "instanceName": "PST-VfMod-Replace-5-Vfmod",
             "instanceId": "b0732bed-3ddf-43cc-b193-7f18db84e476",
@@ -60,7 +59,7 @@
             "platformName": null,
             "trackById": "b0732bed-3ddf-43cc-b193-7f18db84e476",
             "isBase": true,
-            "volumeGroupName": null,
+            "volumeGroupName": "xbitestmodulereplace0..XbiTestModuleReplace..base_ocg..module-0_vol",
             "supplementaryFile": null,
             "supplementaryFile_hidden": null,
             "supplementaryFile_hidden_content" : null
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
index 45b89f730..91f80e9f1 100644
--- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
@@ -34,7 +34,6 @@
     ],
     "requestParameters": {
       "retainAssignments": false,
-      "rebuildVolumeGroups":true,
       "usePreload" : true,
       "userParams": [],
       "testApi": "VNF_API"