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/vid/create_service_instance.robot | 4 ++-- robot/resources/vid/create_vid_vnf.robot | 1 - robot/resources/vid/teardown_vid.robot | 1 - robot/resources/vid/vid_interface.robot | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'robot/resources/vid') diff --git a/robot/resources/vid/create_service_instance.robot b/robot/resources/vid/create_service_instance.robot index 112da109..458cae23 100644 --- a/robot/resources/vid/create_service_instance.robot +++ b/robot/resources/vid/create_service_instance.robot @@ -4,7 +4,7 @@ Documentation Creates VID Service Instance ... Creates VID Service Instance Library SeleniumLibrary -Library UUID +Library ONAPLibrary.Utilities Library String Library DateTime @@ -17,7 +17,7 @@ Create VID Service Instance [Arguments] ${customer_name} ${service_model_type} ${service_type} ${service_name} ${project_name} ${owning_entity} Wait Until Keyword Succeeds 180s 15s Wait For Model ${service_model_type} Press Key xpath=//tr[td/span/text() = '${service_model_type}']/td/button[text() = 'Deploy' and not(@disabled)] \\13 - ${uuid}= Generate UUID + ${uuid}= Generate UUID4 Wait Until Page Contains Element xpath=//input[@parameter-name='Instance Name'] ${GLOBAL_VID_UI_TIMEOUT_LONG} Wait Until Element Is Visible xpath=//input[@parameter-name='Instance Name'] ${GLOBAL_VID_UI_TIMEOUT_LONG} Click On Element When Visible //select[@prompt='Select Subscriber Name'] diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot index 3a484b63..a0110a2b 100644 --- a/robot/resources/vid/create_vid_vnf.robot +++ b/robot/resources/vid/create_vid_vnf.robot @@ -2,7 +2,6 @@ Documentation Creates VID VNF Instance Library SeleniumLibrary 60 -Library UUID Library String Library DateTime Library RequestsLibrary diff --git a/robot/resources/vid/teardown_vid.robot b/robot/resources/vid/teardown_vid.robot index 80365a32..ef65598b 100644 --- a/robot/resources/vid/teardown_vid.robot +++ b/robot/resources/vid/teardown_vid.robot @@ -4,7 +4,6 @@ Library SeleniumLibrary Library Collections Library String Library StringTemplater -Library UUID Resource vid_interface.robot Resource create_vid_vnf.robot Resource create_service_instance.robot diff --git a/robot/resources/vid/vid_interface.robot b/robot/resources/vid/vid_interface.robot index dd68ede8..2deef678 100644 --- a/robot/resources/vid/vid_interface.robot +++ b/robot/resources/vid/vid_interface.robot @@ -4,7 +4,7 @@ Library SeleniumLibrary Library Collections Library String Library RequestsLibrary -Library UUID +Library ONAPLibrary.Utilities Resource ../global_properties.robot Resource ../browser_setup.robot @@ -29,7 +29,7 @@ Run VID Get Request ${auth}= Create List ${GLOBAL_VID_HEALTH_USERNAME} ${GLOBAL_VID_HEALTH_PASSWORD} Log Creating session ${VID_ENDPOINT} ${session}= Create Session vid ${VID_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID + ${uuid}= Generate UUID4 ${headers}= Create Dictionary username=${GLOBAL_VID_HEALTH_USERNAME} password=${GLOBAL_VID_HEALTH_PASSWORD} Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Get Request vid ${data_path} headers=${headers} Log Received response from vid ${resp.text} -- cgit 1.2.3-korg