X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=blobdiff_plain;f=ice_validator%2Fapp_tests%2Fpreload_tests%2Ftest_environment.py;h=c815bb26cb3ebc35a7157d1a7be32e288dcf4523;hp=b627b4b172f83369592c32fdd37726b7857b306a;hb=d7f6c7ca8191822cf437997337129d087a6533f6;hpb=083e8d0575d80d5d539a4ef83d8f4800074b7bcd

diff --git a/ice_validator/app_tests/preload_tests/test_environment.py b/ice_validator/app_tests/preload_tests/test_environment.py
index b627b4b..c815bb2 100644
--- 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
 
@@ -74,6 +75,10 @@ def test_csar_get_vf_module_resource_name(csar):
     assert csar.get_vf_module_resource_name("base_vIECCF") == "stark_vccf_vf"
 
 
+def test_csar_get_vnf_type(csar):
+    assert csar.get_vnf_type("base_vIECCF") == "stark_vccf_svc/stark_vccf_vf"
+
+
 def test_csar_get_vf_module_resource_name_not_found(csar):
     assert csar.get_vf_module_resource_name("unknown") is None
 
@@ -178,3 +183,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"