From da5f32311fcaab3c7f992ef4fcbe4452c084b5f5 Mon Sep 17 00:00:00 2001
From: DR695H <dr695h@att.com>
Date: Mon, 17 Jun 2019 13:20:10 -0400
Subject: [PATCH] bumping robotframework-onap to 0.5

Issue-ID: TEST-158
Change-Id: I457203521765773e4f831bd1d151d8d80ca58ba7
Signed-off-by: DR695H <dr695h@att.com>
---
 run-csit.sh                              | 2 +-
 tests/integration/vCPE/test1.robot       | 4 ++--
 tests/portal/testsuites/portal_VID.robot | 4 ++--
 tests/portal/testsuites/test1.robot      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/run-csit.sh b/run-csit.sh
index eeb8d59f..0aa48632 100755
--- a/run-csit.sh
+++ b/run-csit.sh
@@ -97,7 +97,7 @@ pip install robotframework-selenium2library==1.8.0 robotframework-extendedseleni
 # install eteutils
 mkdir -p ${ROBOT_VENV}/src/onap
 rm -rf ${ROBOT_VENV}/src/onap/testsuite
-pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.4'
+pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5'
 
 pip freeze
 
diff --git a/tests/integration/vCPE/test1.robot b/tests/integration/vCPE/test1.robot
index 1dd7c1bb..d07bf6e4 100644
--- a/tests/integration/vCPE/test1.robot
+++ b/tests/integration/vCPE/test1.robot
@@ -4,7 +4,7 @@ Suite Teardown    Suite Teardown
 Library           OperatingSystem
 Library           RequestsLibrary
 Library           Process
-Library           eteutils/UUID.py
+Library           ONAPLibrary.Utilities
 
 *** Variables ***
 ${GLOBAL_APPLICATION_ID}    csit-vCPE
@@ -15,7 +15,7 @@ ${GLOBAL_MSO_PASSWORD}    password1$
 SO ServiceInstance health check
     ${auth}=    Create List    ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     ${session}=    Create Session    so    http://${SO_IP}:8080
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=    Create Dictionary    Accept=text/html    Content-Type=text/html    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}=    Get Request    so    /ecomp/mso/infra/globalhealthcheck    headers=${headers}
     &{headers}=    Create Dictionary    Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==    Content-Type=application/json    Accept=application/json
diff --git a/tests/portal/testsuites/portal_VID.robot b/tests/portal/testsuites/portal_VID.robot
index 473a0464..fdfa4e79 100644
--- a/tests/portal/testsuites/portal_VID.robot
+++ b/tests/portal/testsuites/portal_VID.robot
@@ -3,7 +3,7 @@ Documentation     The main interface for interacting with Portal. It handles low
 Library 	    ExtendedSelenium2Library
 Library	          RequestsClientCert
 Library 	      RequestsLibrary
-Library	          UUID 
+Library	          ONAPLibrary.Utilities 
 Library         DateTime  
 Resource        ../global_properties.robot
 Resource        ../browser_setup.robot
@@ -50,7 +50,7 @@ Run Portal Get Request
      [Documentation]    Runs Portal Get request
      [Arguments]    ${data_path}
      ${session}=    Create Session 	portal	${GLOBAL_PORTAL_URL}
-     ${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 	portal 	${data_path}     headers=${headers}
      Log    Received response from portal ${resp.text}
diff --git a/tests/portal/testsuites/test1.robot b/tests/portal/testsuites/test1.robot
index 516fb0d4..d3196f83 100644
--- a/tests/portal/testsuites/test1.robot
+++ b/tests/portal/testsuites/test1.robot
@@ -4,7 +4,7 @@ Library		ExtendedSelenium2Library
 Library		OperatingSystem
 Library		eteutils/RequestsClientCert.py
 Library		RequestsLibrary
-Library		eteutils/UUID.py 
+Library		ONAPLibrary.Utilities 
 Library		DateTime  
 Library		Collections
 Library		eteutils/StringTemplater.py
@@ -259,7 +259,7 @@ Run Portal Get Request
      [Documentation]    Runs Portal Get request
      [Arguments]    ${data_path}
      ${session}=    Create Session 	portal	${PORTAL_URL}
-     ${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 	portal 	${data_path}     headers=${headers}
      Log    Received response from portal ${resp.text}
-- 
2.16.6