From 028e185fb811edc50832241bbe9cda13c04c97e5 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Thu, 16 Mar 2017 16:44:17 -0400 Subject: Switch from using GLOBAL_VM_PROPERTIES hash to GLOBAL_INJECTED_ variables Change-Id: Ibbb28f3eaaa1cbad9b6df64d3b2edf8876c24d51 Signed-off-by: Jerry Flood --- robot/resources/openstack/keystone_interface.robot | 3 +-- robot/resources/openstack/openstack_common.robot | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'robot/resources/openstack') diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot index 6c48e120..63f72451 100644 --- a/robot/resources/openstack/keystone_interface.robot +++ b/robot/resources/openstack/keystone_interface.robot @@ -51,5 +51,4 @@ Set Openstack Credentials [Return] ${user} ${pass} Get Openstack Credentials - Dictionary Should Contain Key ${GLOBAL_VM_PROPERTIES} openstack_username - [Return] ${GLOBAL_VM_PROPERTIES['openstack_username']} ${GLOBAL_VM_PROPERTIES['openstack_password']} \ No newline at end of file + [Return] ${GLOBAL_INJECTED_OPENSTACK_USERNAME} ${GLOBAL_INJECTED_OPENSTACK_PASSWORD} \ No newline at end of file diff --git a/robot/resources/openstack/openstack_common.robot b/robot/resources/openstack/openstack_common.robot index ef370c66..7783060c 100644 --- a/robot/resources/openstack/openstack_common.robot +++ b/robot/resources/openstack/openstack_common.robot @@ -67,8 +67,7 @@ Get Openstack Region [Documentation] Returns the current openstack region test variable ... Defaults to the openstack region of the Robot VM Return From Keyword If len('${OPENSTACK_SERVICE_REGION}') > 0 ${OPENSTACK_SERVICE_REGION} - Dictionary Should Contain Key ${GLOBAL_VM_PROPERTIES} region - Set Test Variable ${OPENSTACK_SERVICE_REGION} ${GLOBAL_VM_PROPERTIES['region']} + Set Test Variable ${OPENSTACK_SERVICE_REGION} ${GLOBAL_INJECTED_REGION} Log Setting OPENSTACK_SERVICE_REGION=${OPENSTACK_SERVICE_REGION} [Return] ${OPENSTACK_SERVICE_REGION} -- cgit 1.2.3-korg