diff options
Diffstat (limited to 'vnftest/test_config')
4 files changed, 19 insertions, 10 deletions
diff --git a/vnftest/test_config/onap/test_cases/onap_vnftest_instantiate-v1.yaml b/vnftest/test_config/onap/test_cases/onap_vnftest_instantiate-v1.yaml index addee64..c58659f 100644 --- a/vnftest/test_config/onap/test_cases/onap_vnftest_instantiate-v1.yaml +++ b/vnftest/test_config/onap/test_cases/onap_vnftest_instantiate-v1.yaml @@ -40,7 +40,11 @@ description: > {% set resource_model_customization_name = resource_model_customization_name or '\"\u007Bresource_model_customization_name\u007D\"' %} {% set distributed_service_id = distributed_service_id or '\"\u007Bdistributed_service_id\u007D\"' %} {% set resource_instance_model_name = resource_instance_model_name or '\"\u007Bresource_instance_model_name\u007D\"' %} +{% set vf_modules = vf_modules or {} %} {% set vf_modules_list = vf_modules_list or {}%} +{% set tenant_id = tenant_id or none %} +{% set tenant_name = tenant_name or none %} + steps: - @@ -53,10 +57,10 @@ steps: value: {{cloud_owner}} - parameter_name: "tenant_id" - value: "{context.creds.tenant_id}" + value: {{tenant_id}} - parameter_name: "tenant_name" - value: "{context.creds.tenant_name}" + value: {{tenant_name}} runner: type: Iteration run_step: "setup,run" @@ -82,7 +86,7 @@ steps: value: {{cloud_owner}} - parameter_name: "tenant_id" - value: "{context.creds.tenant_id}" + value: {{tenant_id}} - type: RestCall options: @@ -169,7 +173,7 @@ steps: value: {{resource_model_customization_name}} - parameter_name: "tenant_id" - value: "{context.creds.tenant_id}" + value: {{tenant_id}} - parameter_name: "service_model_name" value: {{service_model_name}} @@ -216,7 +220,7 @@ steps: type: Iteration run_step: "setup,run" -{% for vf_module_definition in vnf_descriptor.vf_modules %} +{% for vf_module_definition in vf_modules %} {% set vf_module = vf_modules_list[vf_module_definition.module_name] %} {% set vnf_name = ['test_vnf_', rnd, '_', vf_module_definition.module_name ]|join %} - @@ -284,7 +288,7 @@ steps: value: {{vf_module.customizationUUID}} - parameter_name: "tenant_id" - value: "{context.creds.tenant_id}" + value: {{tenant_id}} - parameter_name: "service_model_name" value: {{service_model_name}} diff --git a/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v1.yaml b/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v1.yaml index c0fcc84..421ee6e 100644 --- a/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v1.yaml +++ b/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v1.yaml @@ -23,6 +23,8 @@ description: > {% set service_name = service_name or ['test_service_', rnd ]|join %} {% set resource_instance_name = resource_instance_name or ["test_resource_instance_", rnd ]|join %} {% set resource_instance_unique_id = resource_instance_unique_id or ['\"\u007Bresource_version_id\u007D_', rnd, '\"']|join %} +{% set vnf_package_location = vnf_package_location or none %} + steps: - type: RestCall @@ -90,7 +92,7 @@ steps: value: "{vsp_id}" - parameter_name: "package_file_path" - value: "{context.vnf_descriptor.package_location}" + value: {{vnf_package_location}} runner: type: Iteration run_step: "setup,run" diff --git a/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v2.yaml b/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v2.yaml index 931974e..8891917 100644 --- a/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v2.yaml +++ b/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v2.yaml @@ -23,6 +23,7 @@ description: > {% set service_name = service_name or ['test_service_', rnd ]|join %} {% set resource_instance_name = resource_instance_name or ["test_resource_instance_", rnd ]|join %} {% set resource_instance_unique_id = resource_instance_unique_id or ['\"\u007Bresource_version_id\u007D_', rnd, '\"']|join %} +{% set vnf_package_location = vnf_package_location or none %} steps: - type: RestCall @@ -91,7 +92,7 @@ steps: value: "{vsp_version_id}" - parameter_name: "package_file_path" - value: "{context.vnf_descriptor.package_location}" + value: {{vnf_package_location}} runner: type: Iteration run_step: "setup,run" diff --git a/vnftest/test_config/onap/test_cases/onap_vnftest_terminate.yaml b/vnftest/test_config/onap/test_cases/onap_vnftest_terminate.yaml index 59aed7b..c930046 100644 --- a/vnftest/test_config/onap/test_cases/onap_vnftest_terminate.yaml +++ b/vnftest/test_config/onap/test_cases/onap_vnftest_terminate.yaml @@ -22,10 +22,12 @@ description: > {% set vnf_instance_id = vnf_instance_id or '\"\u007Bvnf_instance_id\u007D\"' %} {% set vf_module_instance_id = vf_module_instance_id or '\"\u007Bvf_module_instance_id\u007D\"' %} {% set service_model_customization_id = service_model_customization_id or '\"\u007Bservice_model_customization_id\u007D\"' %} +{% set vf_modules = vf_modules or {} %} {% set vf_modules_list = vf_modules_list or {}%} +{% set tenant_id = tenant_id or none %} steps: -{% for vf_module_definition in vnf_descriptor.vf_modules %} +{% for vf_module_definition in vf_modules %} {% set vf_module = vf_modules_list[vf_module_definition.module_name] %} - type: RestCall @@ -58,7 +60,7 @@ steps: value: {{service_model_customization_id}} - parameter_name: "tenant_id" - value: "{context|creds|tenant_id}" + value: {{tenant_id}} output: - |