diff options
author | steven stark <steven.stark@att.com> | 2019-09-18 17:07:27 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-09-18 17:07:27 +0000 |
commit | 6202d9d300e76d6684c1ee77d31646737f64374e (patch) | |
tree | a2a97c37648d27e2f3c2279e8d91e1dd29e3b562 /ice_validator/app_tests/preload_tests | |
parent | c4bec47386b0df6c88d766f9d694ba5e77e43b0b (diff) | |
parent | 3c68447c6146b045064d51eba3d024dcbc0b684f (diff) |
Merge "[VVP] Replaced test.csar in preload_tests"
Diffstat (limited to 'ice_validator/app_tests/preload_tests')
-rw-r--r-- | ice_validator/app_tests/preload_tests/preload_envs/test.csar | bin | 117854 -> 125096 bytes | |||
-rw-r--r-- | ice_validator/app_tests/preload_tests/test_environment.py | 18 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ice_validator/app_tests/preload_tests/preload_envs/test.csar b/ice_validator/app_tests/preload_tests/preload_envs/test.csar Binary files differindex d23a746..9876d2e 100644 --- a/ice_validator/app_tests/preload_tests/preload_envs/test.csar +++ b/ice_validator/app_tests/preload_tests/preload_envs/test.csar diff --git a/ice_validator/app_tests/preload_tests/test_environment.py b/ice_validator/app_tests/preload_tests/test_environment.py index c815bb2..8d06a92 100644 --- a/ice_validator/app_tests/preload_tests/test_environment.py +++ b/ice_validator/app_tests/preload_tests/test_environment.py @@ -56,27 +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("base_vIECCF") == "stark_vccf_svc/stark_vccf_vf" + assert csar.get_vnf_type("vdns") == "stark_0917_vlb_svc/stark_0917_vlb_vf" def test_csar_get_vf_module_resource_name_not_found(csar): @@ -84,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): |