From 18872bc32103112ea6e1582dbb1c2764f99442f1 Mon Sep 17 00:00:00 2001 From: DR695H Date: Thu, 13 Jun 2019 16:16:52 -0400 Subject: move uuid to onaplib.utilities Change-Id: I57860949ad4417bb080cf5269e8fcc555e089da6 Issue-ID: TEST-158 Signed-off-by: DR695H --- robot/resources/openstack/keystone_interface.robot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'robot/resources/openstack/keystone_interface.robot') 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} -- cgit 1.2.3-korg