1 files changed, 10 insertions, 6 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}}