summaryrefslogtreecommitdiffstats
path: root/robot/resources/aai
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-06-13 16:16:52 -0400
committerDR695H <dr695h@att.com>2019-06-13 16:18:11 -0400
commit18872bc32103112ea6e1582dbb1c2764f99442f1 (patch)
tree3b87443f10657bb7c956cee67eb6c4caccf2d085 /robot/resources/aai
parente65d7fec679cc393c08f0d32f1ad61bbd71a35f8 (diff)
move uuid to onaplib.utilities
Change-Id: I57860949ad4417bb080cf5269e8fcc555e089da6 Issue-ID: TEST-158 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/aai')
-rw-r--r--robot/resources/aai/aai_interface.robot10
-rw-r--r--robot/resources/aai/create_service.robot4
2 files changed, 7 insertions, 7 deletions
diff --git a/robot/resources/aai/aai_interface.robot b/robot/resources/aai/aai_interface.robot
index c0600064..16853268 100644
--- a/robot/resources/aai/aai_interface.robot
+++ b/robot/resources/aai/aai_interface.robot
@@ -1,7 +1,7 @@
*** Settings ***
Documentation The main interface for interacting with A&AI. It handles low level stuff like managing the http request library and A&AI required fields
Library RequestsLibrary
-Library UUID
+Library ONAPLibrary.Utilities
Library HTTPUtils
Resource ../global_properties.robot
@@ -23,7 +23,7 @@ Run A&AI Get Request
Disable Warnings
${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD}
${session}= Create Session aai ${AAI_FRONTEND_ENDPOINT} auth=${auth}
- ${uuid}= Generate UUID
+ ${uuid}= Generate UUID4
${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID}
${resp}= Get Request aai ${data_path} headers=${headers}
Log Received response from aai ${resp.text}
@@ -35,7 +35,7 @@ Run A&AI Put Request
Disable Warnings
${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD}
${session}= Create Session aai ${AAI_FRONTEND_ENDPOINT} auth=${auth}
- ${uuid}= Generate UUID
+ ${uuid}= Generate UUID4
${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID}
${resp}= Put Request aai ${data_path} data=${data} headers=${headers}
Log Received response from aai ${resp.text}
@@ -47,7 +47,7 @@ Run A&AI Post Request
Disable Warnings
${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD}
${session}= Create Session aai ${AAI_FRONTEND_ENDPOINT} auth=${auth}
- ${uuid}= Generate UUID
+ ${uuid}= Generate UUID4
${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID}
${resp}= Post Request aai ${data_path} data=${data} headers=${headers}
Log Received response from aai ${resp.text}
@@ -59,7 +59,7 @@ Run A&AI Delete Request
Disable Warnings
${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD}
${session}= Create Session aai ${AAI_FRONTEND_ENDPOINT} auth=${auth}
- ${uuid}= Generate UUID
+ ${uuid}= Generate UUID4
${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID}
${resp}= Delete Request aai ${data_path}?resource-version=${resource_version} headers=${headers}
Log Received response from aai ${resp.text}
diff --git a/robot/resources/aai/create_service.robot b/robot/resources/aai/create_service.robot
index 49864b89..f4f2b27c 100644
--- a/robot/resources/aai/create_service.robot
+++ b/robot/resources/aai/create_service.robot
@@ -7,7 +7,7 @@ Resource ../json_templater.robot
Resource aai_interface.robot
Library OperatingSystem
Library Collections
-Library UUID
+Library ONAPLibrary.Utilities
@@ -29,7 +29,7 @@ Create Service If Not Exists
Create Service
[Documentation] Creates a service in A&AI
[Arguments] ${service_type}
- ${uuid}= Generate UUID
+ ${uuid}= Generate UUID4
${data_template}= OperatingSystem.Get File ${AAI_ADD_SERVICE_BODY}
${arguments}= Create Dictionary service_type=${service_type} UUID=${uuid}
${data}= Fill JSON Template ${data_template} ${arguments}