diff options
Diffstat (limited to 'robot/resources/openstack')
6 files changed, 9 insertions, 12 deletions
diff --git a/robot/resources/openstack/cinder_interface.robot b/robot/resources/openstack/cinder_interface.robot index 1b720359..7e11af3a 100644 --- a/robot/resources/openstack/cinder_interface.robot +++ b/robot/resources/openstack/cinder_interface.robot @@ -2,7 +2,7 @@ Documentation The main interface for interacting with Openstack. It handles low level stuff like managing the authtoken and Openstack required fields Library OpenstackLibrary Library RequestsLibrary -Library UUID +Library ONAPLibrary.Utilities Library OperatingSystem Resource ../global_properties.robot Resource ../json_templater.robot @@ -34,7 +34,7 @@ Add Openstack Volume [Documentation] Runs an Openstack Request to add a volume and returns that volume id of the created volume [Arguments] ${alias} ${name} ${size} ${data_template}= OperatingSystem.Get File ${OPENSTACK_CINDER_VOLUMES_ADD_BODY_FILE} - ${uuid}= Generate UUID + ${uuid}= Generate UUID4 ${arguments}= Create Dictionary name=${name} description=${GLOBAL_APPLICATION_ID}${uuid} size=${size} type=${OPENSTACK_CINDER_VOLUMES_TYPE} availability_zone=${OPENSTACK_CINDER_AVAILABILITY_ZONE} ${data}= Fill JSON Template ${data_template} ${arguments} ${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_CINDER_SERVICE_TYPE} ${OPENSTACK_CINDER_VOLUMES_PATH} data_path= data=${data} diff --git a/robot/resources/openstack/heat_interface.robot b/robot/resources/openstack/heat_interface.robot index b23cb758..e6ec504b 100644 --- a/robot/resources/openstack/heat_interface.robot +++ b/robot/resources/openstack/heat_interface.robot @@ -2,7 +2,6 @@ Documentation The interface for interacting with Openstack Heat API. Library OpenstackLibrary Library RequestsLibrary -Library UUID Library OperatingSystem Library HEATUtils Library StringTemplater diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot index 3fe13c71..c6d5eddd 100644 --- a/robot/resources/openstack/keystone_interface.robot +++ b/robot/resources/openstack/keystone_interface.robot @@ -3,7 +3,7 @@ Documentation The main interface for interacting with Openstack Keystone API Library OpenstackLibrary Library RequestsLibrary Library HTTPUtils -Library UUID +Library ONAPLibrary.Utilities Library Collections Library OperatingSystem Library String @@ -29,7 +29,7 @@ Run Openstack Auth Request ... ELSE Set Variable ${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION} ${url} ${path}= Get Keystone Url And Path ${keystone_api_version} ${session}= Create Session keystone ${url} verify=True - ${uuid}= Generate UUID + ${uuid}= Generate UUID4 ${data_path} ${data}= Run Keyword If '${keystone_api_version}'=='v2.0' Get KeyStoneAuthv2 Data ${username} ${password} ${path} ... ELSE Get KeyStoneAuthv3 Data ${username} ${password} ${path} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} @@ -48,7 +48,7 @@ Get KeystoneAPIVersion ${url}= Catenate ${pieces.scheme}://${pieces.netloc} Log Keystone URL is ${url} ${session}= Create Session keystone ${url} verify=True - ${uuid}= Generate UUID + ${uuid}= Generate UUID4 ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= Get Request keystone / headers=${headers} Log Received response from keystone ${resp.text} diff --git a/robot/resources/openstack/neutron_interface.robot b/robot/resources/openstack/neutron_interface.robot index 93563891..5fdbbf80 100644 --- a/robot/resources/openstack/neutron_interface.robot +++ b/robot/resources/openstack/neutron_interface.robot @@ -2,7 +2,6 @@ Documentation The main interface for interacting with Openstack. It handles low level stuff like managing the authtoken and Openstack required fields Library OpenstackLibrary Library RequestsLibrary -Library UUID Library OperatingSystem Library Collections Resource ../global_properties.robot diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot index 5958a6c3..e216a2f9 100644 --- a/robot/resources/openstack/nova_interface.robot +++ b/robot/resources/openstack/nova_interface.robot @@ -3,7 +3,6 @@ Documentation The main interface for interacting with Openstack. It handles Library OpenstackLibrary Library RequestsLibrary Library ONAPLibrary.JSON -Library UUID Library OperatingSystem Library Collections Resource ../global_properties.robot diff --git a/robot/resources/openstack/openstack_common.robot b/robot/resources/openstack/openstack_common.robot index 7783060c..a1ac04c5 100644 --- a/robot/resources/openstack/openstack_common.robot +++ b/robot/resources/openstack/openstack_common.robot @@ -4,7 +4,7 @@ Documentation The private interface for interacting with Openstack. It handl Library Collections Library OpenstackLibrary Library RequestsLibrary -Library UUID +Library ONAPLibrary.Utilities Resource ../global_properties.robot *** Variables *** @@ -24,7 +24,7 @@ Internal Get Openstack With Region [Arguments] ${alias} ${service_type} ${region} ${url_ext} ${data_path}= Log Internal Get Openstack values alias=${alias} service_type=${service_type} region=${region} url_ext=${url_ext} data_path=${data_path} ${url}= Get Openstack Service Url ${alias} ${service_type} ${region} - ${uuid}= Generate UUID + ${uuid}= Generate UUID4 ${session_alias}= Catenate openstack-${uuid} ${session}= Create Session ${session_alias} ${url}${url_ext} verify=True ${token}= Get Openstack Token ${alias} @@ -39,7 +39,7 @@ Internal Post Openstack ${region}= Get Openstack Region Log Internal Post Openstack values alias=${alias} service_type=${service_type} region=${region} url_ext=${url_ext} data_path=${data_path} ${url}= Get Openstack Service Url ${alias} ${service_type} ${region} - ${uuid}= Generate UUID + ${uuid}= Generate UUID4 ${session_alias}= Catenate openstack-${uuid} ${session}= Create Session ${session_alias} ${url}${url_ext} verify=True ${token}= Get Openstack Token ${alias} @@ -54,7 +54,7 @@ Internal Delete Openstack ${region}= Get Openstack Region Log Internal Post Openstack values alias=${alias} service_type=${service_type} region=${region} url_ext=${url_ext} data_path=${data_path} ${url}= Get Openstack Service Url ${alias} ${service_type} ${region} - ${uuid}= Generate UUID + ${uuid}= Generate UUID4 ${session_alias}= Catenate openstack-${uuid} ${session}= Create Session ${session_alias} ${url}${url_ext} verify=True ${token}= Get Openstack Token ${alias} |