[VVP] preload generation enhancements

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

diff --git a/ice_validator/app_tests/preload_tests/test_environment.py b/ice_validator/app_tests/preload_tests/test_environment.py
index b627b4b..dacbd37 100644 (file)
--- a/ice_validator/app_tests/preload_tests/test_environment.py
+++ b/ice_validator/app_tests/preload_tests/test_environment.py
@@ -37,6 +37,7 @@
 from pathlib import Path
 
 import pytest
+from mock import mock
 
 from preload.environment import CloudServiceArchive, PreloadEnvironment
 
@@ -55,23 +56,27 @@ def env():
 
 
 def test_csar_service_name(csar):
-    assert csar.service_name == "stark_vccf_svc"
+    assert csar.service_name == "stark_0917_vlb_svc"
 
 
 def test_csar_str_and_repr(csar):
-    assert str(csar) == "CSAR (path=test.csar, name=stark_vccf_svc)"
-    assert repr(csar) == "CSAR (path=test.csar, name=stark_vccf_svc)"
+    assert str(csar) == "CSAR (path=test.csar, name=stark_0917_vlb_svc)"
+    assert repr(csar) == "CSAR (path=test.csar, name=stark_0917_vlb_svc)"
 
 
 def test_csar_vf_module_model_name(csar):
     assert (
-        csar.get_vf_module_model_name("base_vIECCF")
-        == "StarkVccfVf..base_vIECCF..module-0"
+        csar.get_vf_module_model_name("vdns")
+        == "Stark0917VlbVf..vdns..module-3"
     )
 
 
 def test_csar_get_vf_module_resource_name(csar):
-    assert csar.get_vf_module_resource_name("base_vIECCF") == "stark_vccf_vf"
+    assert csar.get_vf_module_resource_name("vdns") == "stark_0917_vlb_vf"
+
+
+def test_csar_get_vnf_type(csar):
+    assert csar.get_vnf_type("vdns") == "stark_0917_vlb_svc/stark_0917_vlb_vf 0"
 
 
 def test_csar_get_vf_module_resource_name_not_found(csar):
@@ -79,12 +84,12 @@ def test_csar_get_vf_module_resource_name_not_found(csar):
 
 
 def test_preload_environment_global_csar(env):
-    assert env.csar.service_name == "stark_vccf_svc"
+    assert env.csar.service_name == "stark_0917_vlb_svc"
 
 
 def test_preload_environment_nest_env_csar_inherit(env):
     env_two = env.get_environment("env_two")
-    assert env_two.csar.service_name == "stark_vccf_svc"
+    assert env_two.csar.service_name == "stark_0917_vlb_svc"
 
 
 def test_preload_environment_nest_env_csar_override(env):
@@ -171,6 +176,8 @@ def test_preload_environment_defaults_in_module_env(env):
         "common": "ABC",
         "custom_env_3": "default",
         "my_ip": "default",
+        "vf-module-model-name": "Starkmultimodule2A9463fd82915..base..module-0",
+        "vnf-type": "StarkMultiModule2_43550/StarkMultiModule2 a9463fd8-2915 0"
     }
     mod = env.get_environment("env_one").get_module("base")
     assert mod == {
@@ -178,3 +185,14 @@ def test_preload_environment_defaults_in_module_env(env):
         "common": "ABC",
         "my_ip": "192.168.0.1",
     }
+
+
+def test_preload_environment_uses_csar(env, monkeypatch):
+    csar = mock.MagicMock(spec=CloudServiceArchive)
+    csar.get_vnf_type = mock.Mock(return_value="stark_vccf_svc/stark_vccf_vf")
+    csar.get_vf_module_model_name = mock.Mock(return_value="model_name")
+    env = env.get_environment("env_three")
+    monkeypatch.setattr(env, "csar", csar)
+    mod = env.get_module("base")
+    assert mod["vnf-type"] == "stark_vccf_svc/stark_vccf_vf"
+    assert mod["vf-module-model-name"] == "model_name"