Switch from using GLOBAL_VM_PROPERTIES hash
to GLOBAL_INJECTED_<name> variables
Change-Id: Ibbb28f3eaaa1cbad9b6df64d3b2edf8876c24d51
Signed-off-by: Jerry Flood <jf9860@att.com>
diff --git a/red.xml b/red.xml
index 7a8e5f9..9a4b92c 100644
--- a/red.xml
+++ b/red.xml
@@ -23,9 +23,9 @@
<path location="robot/library"/>
</pythonpath>
<classpath/>
- <variableFiles path="../properties/integration_preload_parameters.py"/>
- <variableFiles path="../properties/integration_robot_properties.py"/>
- <variableFiles path="../properties/sample_vm_properties.py"/>
+ <variableFiles path="testsuite/properties/integration_preload_parameters.py"/>
+ <variableFiles path="testsuite/properties/dfw_robot_properties.py"/>
+ <variableFiles path="testsuite/properties/dfw_vm_properties.py"/>
<variableFiles path="testsuite/robot/assets/service_mappings.py"/>
<excludedForValidation/>
<isValidatedFileSizeCheckingEnabled>true</isValidatedFileSizeCheckingEnabled>
diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot
index 6c48e12..63f7245 100644
--- a/robot/resources/openstack/keystone_interface.robot
+++ b/robot/resources/openstack/keystone_interface.robot
@@ -51,5 +51,4 @@
[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 ef370c6..7783060 100644
--- a/robot/resources/openstack/openstack_common.robot
+++ b/robot/resources/openstack/openstack_common.robot
@@ -67,8 +67,7 @@
[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}
diff --git a/robot/resources/sdngc_interface.robot b/robot/resources/sdngc_interface.robot
index d413b6e..ee8d09e 100644
--- a/robot/resources/sdngc_interface.robot
+++ b/robot/resources/sdngc_interface.robot
@@ -133,7 +133,9 @@
${hostid}= Get Substring ${uuid} -4
${ecompnet}= Evaluate ${GLOBAL_BUILD_NUMBER}%255
# Initialize the value map with the properties generated from the Robot VM /opt/config folder
- ${valuemap}= Copy Dictionary ${GLOBAL_VM_PROPERTIES}
+ ${valuemap}= Create Dictionary
+ Set To Dictionary ${valuemap} artifacts_version=${GLOBAL_INJECTED_ARTIFACTS_VERSION}
+ Set To Dictionary ${valuemap} network=${GLOBAL_INJECTED_NETWORK}
# update the value map with unique values.
Set To Dictionary ${valuemap} uuid=${uuid} hostid=${hostid} ecompnet=${ecompnet}
${parameters}= Create Dictionary