Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[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
8d06a92
..
dacbd37
100644
(file)
--- a/
ice_validator/app_tests/preload_tests/test_environment.py
+++ b/
ice_validator/app_tests/preload_tests/test_environment.py
@@
-76,7
+76,7
@@
def test_csar_get_vf_module_resource_name(csar):
def test_csar_get_vnf_type(csar):
def test_csar_get_vnf_type(csar):
- assert csar.get_vnf_type("vdns") == "stark_0917_vlb_svc/stark_0917_vlb_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):
def test_csar_get_vf_module_resource_name_not_found(csar):
@@
-176,6
+176,8
@@
def test_preload_environment_defaults_in_module_env(env):
"common": "ABC",
"custom_env_3": "default",
"my_ip": "default",
"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 == {
}
mod = env.get_environment("env_one").get_module("base")
assert mod == {