diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-03-29 11:18:44 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-03-29 11:18:44 -0700 |
| commit | 157f13c50159daf87ad544415b71ba6e1006f99d (patch) | |
| tree | 88af3c15824bee988753a0852ff8eb2c4364f01a /robot/resources | |
| parent | 25bce945a15c340c20e776623c24131723c5987b (diff) | |
Change to support two explicit ubuntu versions
Change-Id: Ia9a1018f08e2980e5c2149d4d880a4c73efffcad
Issue-ID: INT-407
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'robot/resources')
| -rw-r--r-- | robot/resources/sdngc_interface.robot | 2 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/robot/resources/sdngc_interface.robot b/robot/resources/sdngc_interface.robot index 794c0772..c5cdcfb1 100644 --- a/robot/resources/sdngc_interface.robot +++ b/robot/resources/sdngc_interface.robot @@ -154,7 +154,7 @@ Get Template Parameters Set To Dictionary ${valuemap} public_net_id=${GLOBAL_INJECTED_PUBLIC_NET_ID} Set To Dictionary ${valuemap} cloud_env=${GLOBAL_INJECTED_CLOUD_ENV} Set To Dictionary ${valuemap} install_script_version=${GLOBAL_INJECTED_SCRIPT_VERSION} - Set To Dictionary ${valuemap} vm_image_name=${GLOBAL_INJECTED_VM_IMAGE_NAME} + Set To Dictionary ${valuemap} vm_image_name=${GLOBAL_INJECTED_UBUNTU_1404_IMAGE} Set To Dictionary ${valuemap} vm_flavor_name=${GLOBAL_INJECTED_VM_FLAVOR} Set To Dictionary ${valuemap} dcae_collector_ip=${dcae_collector_ip} diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 09ef4460..9ef4f351 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -182,7 +182,7 @@ Create VVG Server [Arguments] ${uuid} Run Openstack Auth Request auth ${vvg_server_name}= Catenate vVG_${uuid} - ${server}= Add Server For Image Name auth ${vvg_server_name} ${GLOBAL_INJECTED_VM_IMAGE_NAME} ${GLOBAL_INJECTED_VM_FLAVOR} ${GLOBAL_INJECTED_PUBLIC_NET_ID} + ${server}= Add Server For Image Name auth ${vvg_server_name} ${GLOBAL_INJECTED_UBUNTU_1404_IMAGE} ${GLOBAL_INJECTED_VM_FLAVOR} ${GLOBAL_INJECTED_PUBLIC_NET_ID} ${server}= Get From Dictionary ${server} server ${server_id}= Get From Dictionary ${server} id Set Test Variable ${VVG_SERVER_ID} ${server_id} |