From 7f3b8aae571dcc83a55779cb14c9ee9d5b18e2d0 Mon Sep 17 00:00:00 2001 From: "stark, steven" Date: Wed, 15 Jul 2020 12:35:52 -0700 Subject: [VVP] preload generation enhancements Add "0" digit to end of VNF type If "module" has file extension, remove extension before parsing CSAR for module information. Issue-ID: VVP-440 Signed-off-by: stark, steven Change-Id: I9dae8643e4c602867cbbbfec1416ca67a0a1ad4f --- ice_validator/app_tests/preload_tests/test_environment.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ice_validator/app_tests/preload_tests') 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 --- 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): - 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): @@ -176,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 == { -- cgit 1.2.3-korg