diff options
| author |   Jerry Flood <jf9860@att.com> | 2017-10-30 20:19:16 -0400 |
|---|---|---|
| committer | Jerry Flood <jf9860@att.com> | 2017-10-30 20:19:39 -0400 |
| commit | 339809a0a85a764e3b0b992214254d82950bf365 (patch) | |
| tree | 9db7c976b4093d5631f76fbc5a9affa809ccd03b /robot/resources | |
| parent | 8c6362901aed10107a37b76d96d0e62c6df2e94b (diff) | |
Fix up the vVG server heat template
Issue: TEST-14
Change-Id: I8304325c9c3b2abebd358f7d931d9d7490d33a5b
Signed-off-by: Jerry Flood <jf9860@att.com>
Diffstat (limited to 'robot/resources')
| -rw-r--r-- | robot/resources/openstack/nova_interface.robot | 4 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot index b36d09f1..2c9ec4c5 100644 --- a/robot/resources/openstack/nova_interface.robot +++ b/robot/resources/openstack/nova_interface.robot @@ -92,14 +92,14 @@ Add Server Add Server For Image Name [Documentation] Adds a server for the passed if - [Arguments] ${alias} ${name} ${imageName} ${flavorName} + [Arguments] ${alias} ${name} ${imageName} ${flavorName} ${public_net_id} ${images}= Get Openstack Images ${alias} ${flavors}= Get Openstack Flavors ${alias} ${images}= Get From Dictionary ${images} images ${flavors}= Get From Dictionary ${flavors} flavors ${imageRef}= Get Id For Name ${images} ${imageName} ${flavorRef}= Get Id For Name ${flavors} ${flavorName} - ${dict}= Create Dictionary name=${name} imageRef=${imageRef} flavorRef=${flavorRef} + ${dict}= Create Dictionary name=${name} imageRef=${imageRef} flavorRef=${flavorRef} public_net_id=${public_net_id} ${data}= Fill JSON Template File ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE} ${dict} ${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} ${OPENSTACK_NOVA_SERVERS_PATH} data_path= data=${data} ${status_string}= Convert To String ${resp.status_code} diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 7289fbd7..1d293ec5 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -113,7 +113,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_VVGSERVER_IMAGE} ${GLOBAL_VVGSERVER_FLAVOR} + ${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}= Get From Dictionary ${server} server ${server_id}= Get From Dictionary ${server} id Set Test Variable ${VVG_SERVER_ID} ${server_id} |