[VVP] Misc tweaks and fixes to preload generation

[vvp/validation-scripts.git] / ice_validator / app_tests / preload_tests / test_vnfapi.py

diff --git a/ice_validator/app_tests/preload_tests/test_vnfapi.py b/ice_validator/app_tests/preload_tests/test_vnfapi.py
index 5732335..a49043f 100644 (file)
--- a/ice_validator/app_tests/preload_tests/test_vnfapi.py
+++ b/ice_validator/app_tests/preload_tests/test_vnfapi.py
@@ -82,12 +82,12 @@ def preload(pytestconfig, session_dir):
 
 @pytest.fixture(scope="session")
 def base(preload):
-    return load_module(preload, "base.json")
+    return load_module(preload, "base_incomplete.json")
 
 
 @pytest.fixture(scope="session")
 def incremental(preload):
-    return load_module(preload, "incremental.json")
+    return load_module(preload, "incremental_incomplete.json")
 
 
 def test_base_azs(base):
@@ -163,8 +163,14 @@ def test_base_vm_types(base):
 def test_base_parameters(base):
     params = base["input"]["vnf-topology-information"]["vnf-parameters"]
     assert params == [
-        {"vnf-parameter-name": "svc_image_name", "vnf-parameter-value": "svc_image"},
-        {"vnf-parameter-name": "svc_flavor_name", "vnf-parameter-value": "svc_flavor"},
+        {
+            "vnf-parameter-name": "db_vol0_id",
+            "vnf-parameter-value": "VALUE FOR: db_vol0_id",
+        },
+        {
+            "vnf-parameter-name": "db_vol1_id",
+            "vnf-parameter-value": "VALUE FOR: db_vol1_id",
+        },
     ]
 
 
@@ -187,7 +193,7 @@ def test_incremental_networks(incremental):
 
 
 def test_preload_env_population(preload):
-    base_path = THIS_DIR / "sample_env/preloads/vnfapi/base.json"
+    base_path = THIS_DIR / "sample_env/preloads/vnfapi/base_incomplete.json"
     data = load_json(base_path)
     azs = data["input"]["vnf-topology-information"]["vnf-assignments"][
         "availability-zones"