diff options
| author |   Daniel Rose <dr695h@att.com> | 2019-05-06 14:51:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-06 14:51:34 +0000 |
| commit | cd7670d3ee90c8388fa2a44d22de47c49fff06ad (patch) | |
| tree | 49ebcb61f6bf595eeaa672a7afa8a2e3e2fa4bbb | |
| parent | 2e2486252a4d48220db5c28d7fc83ca2a8264a04 (diff) | |
| parent | ecd3860897c78e8d6320cf7a4383878fbc441c1b (diff) | |
Merge "Fixes from SoUtil and Pairwise test"
| -rw-r--r-- | robot/resources/demo_preload.robot | 3 | ||||
| -rw-r--r-- | robot/resources/so/direct_instantiate.robot | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index 74ee63ba..25575e17 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -179,7 +179,8 @@ Instantiate VNF ${vf_module_name_list} ${service} ${generic_vnfs}= Orchestrate VNF DemoCust ${service} ${service} ${TENANT_NAME} Save For Delete Log to Console Customer Name=${CUSTOMER_NAME} - Log to Console VNF Module Name=${vf_module_name} + :FOR ${vf_module_name} IN @{vf_module_name_list} + \ Log To Console VNF Module Name=${vf_module_name} # Don't get from MSO for now due to SO-1186 # ${model_invariant_id}= Run MSO Get ModelInvariantId ${SUITE_SERVICE_MODEL_NAME} ${vf_module_label} ${model_invariant_id}= Set Variable ${EMPTY} diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot index 6e8ba136..5548c937 100644 --- a/robot/resources/so/direct_instantiate.robot +++ b/robot/resources/so/direct_instantiate.robot @@ -20,7 +20,6 @@ Instantiate Service Direct To SO ${name_suffix}= Get Current Date exclude_millis=True ${name_suffix}= Evaluate '${name_suffix}'.replace(' ','') ${name_suffix}= Evaluate '${name_suffix}'.replace(':','') - ${heatbridge}= Set Variable false ${preload_dict}= Copy Dictionary ${GLOBAL_PRELOAD_PARAMETERS['defaults']} ${template}= Create Dictionary @{keys}= Get Dictionary Keys ${preload_dict} @@ -47,7 +46,7 @@ Instantiate Service Direct To SO Log ${preload_dict} Log ${template} - ${service_instance_id}= Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} ${heatbridge} + ${service_instance_id}= Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} Log To Console ServiceInstanceId:${service_instance_id} Should Not Be Equal As Strings ${service_instance_id} None |