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 | |
| 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>
4 files changed, 8 insertions, 5 deletions
diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template index 40ad5083..6441ef3b 100644 --- a/robot/assets/templates/web/index.html.template +++ b/robot/assets/templates/web/index.html.template @@ -101,7 +101,8 @@ GLOBAL_INJECTED_VID_IP_ADDR = "${vid}" GLOBAL_INJECTED_OPENO_IP_ADDR = "${openo}" GLOBAL_INJECTED_CLAMP_IP_ADDR = "${clamp}" GLOBAL_INJECTED_VM_FLAVOR = "${GLOBAL_INJECTED_VM_FLAVOR}" -GLOBAL_INJECTED_VM_IMAGE_NAME = "${GLOBAL_INJECTED_VM_IMAGE_NAME}" +GLOBAL_INJECTED_UBUNTU_1404_IMAGE = "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}" +GLOBAL_INJECTED_UBUNTU_1604_IMAGE = "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}" GLOBAL_INJECTED_PUBLIC_NET_ID = "${GLOBAL_INJECTED_PUBLIC_NET_ID}" GLOBAL_INJECTED_CLOUD_ENV = "${GLOBAL_INJECTED_CLOUD_ENV}" GLOBAL_INJECTED_SCRIPT_VERSION = "${GLOBAL_INJECTED_SCRIPT_VERSION}" @@ -136,7 +137,8 @@ GLOBAL_INJECTED_PROPERTIES={ "GLOBAL_INJECTED_OPENO_IP_ADDR" : "${openo}", "GLOBAL_INJECTED_CLAMP_IP_ADDR" : "${clamp}", "GLOBAL_INJECTED_VM_FLAVOR" : "${GLOBAL_INJECTED_VM_FLAVOR}", -"GLOBAL_INJECTED_VM_IMAGE_NAME" : "${GLOBAL_INJECTED_VM_IMAGE_NAME}", +"GLOBAL_INJECTED_UBUNTU_1404_IMAGE" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", +"GLOBAL_INJECTED_UBUNTU_1604_IMAGE" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", "GLOBAL_INJECTED_PUBLIC_NET_ID" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}", "GLOBAL_INJECTED_CLOUD_ENV" : "${GLOBAL_INJECTED_CLOUD_ENV}", "GLOBAL_INJECTED_SCRIPT_VERSION" : "${GLOBAL_INJECTED_SCRIPT_VERSION}" 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} diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot index 6a879710..2781c2c2 100644 --- a/robot/testsuites/update_onap_page.robot +++ b/robot/testsuites/update_onap_page.robot @@ -61,7 +61,8 @@ Update ONAP Page Set To Dictionary ${values} GLOBAL_INJECTED_REGION=${GLOBAL_INJECTED_REGION} Set To Dictionary ${values} GLOBAL_INJECTED_KEYSTONE=${GLOBAL_INJECTED_KEYSTONE} Set To Dictionary ${values} GLOBAL_INJECTED_VM_FLAVOR=${GLOBAL_INJECTED_VM_FLAVOR} - Set To Dictionary ${values} GLOBAL_INJECTED_VM_IMAGE_NAME=${GLOBAL_INJECTED_VM_IMAGE_NAME} + Set To Dictionary ${values} GLOBAL_INJECTED_UBUNTU_1404_IMAGE=${GLOBAL_INJECTED_UBUNTU_1404_IMAGE} + Set To Dictionary ${values} GLOBAL_INJECTED_UBUNTU_1604_IMAGE=${GLOBAL_INJECTED_UBUNTU_1604_IMAGE} Set To Dictionary ${values} GLOBAL_INJECTED_PUBLIC_NET_ID=${GLOBAL_INJECTED_PUBLIC_NET_ID} Set To Dictionary ${values} prefix=${HOSTS_PREFIX} Create File From Template ${URLS_HTML_TEMPLATE} ${URLS_HTML} ${values} |