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

diff --git a/ice_validator/app_tests/preload_tests/test_environment.py b/ice_validator/app_tests/preload_tests/test_environment.py
index c815bb2..1c965a0 100644
--- a/ice_validator/app_tests/preload_tests/test_environment.py
+++ b/ice_validator/app_tests/preload_tests/test_environment.py
@@ -56,27 +56,24 @@ 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"
-    )
+    assert 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("base_vIECCF") == "stark_vccf_svc/stark_vccf_vf"
+    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):
@@ -84,12 +81,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):
@@ -176,6 +173,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 == {