move uuid to onaplib.utilities

Change-Id: I57860949ad4417bb080cf5269e8fcc555e089da6
Issue-ID: TEST-158
Signed-off-by: DR695H <dr695h@att.com>

32 files changed, 87 insertions, 92 deletions

diff --git a/red.xml b/red.xml
index 7c682bf4..be2f3823 100644
--- a/red.xml
+++ b/red.xml
@@ -3,7 +3,6 @@
     <configVersion>1.0</configVersion>
     <relativeTo>PROJECT</relativeTo>
     <referencedLibrary type="PYTHON" name="RequestsLibrary" path="testsuite/robot/library"/>
-    <referencedLibrary type="PYTHON" name="UUID" path="testsuite/robot/library/eteutils"/>
     <referencedLibrary type="PYTHON" name="SeleniumLibrary" path="testsuite/robot/library"/>
     <referencedLibrary type="PYTHON" name="AngularJSLibrary" path="testsuite/robot/library"/>
     <referencedLibrary type="PYTHON" name="SSHLibrary" path="testsuite/robot/library"/>
@@ -12,7 +11,6 @@
     <referencedLibrary type="PYTHON" name="OpenstackLibrary" path="testsuite/robot/library/eteutils"/>
     <referencedLibrary type="PYTHON" name="SoUtils" path="testsuite/robot/library/vcpeutils"/>
     <referencedLibrary type="PYTHON" name="HEATUtils" path="testsuite/robot/library/eteutils"/>
-    <referencedLibrary type="PYTHON" name="OSUtils" path="testsuite/robot/library/eteutils"/>
     <referencedLibrary type="PYTHON" name="ArchiveLibrary" path="testsuite/robot/library"/>
     <referencedLibrary type="PYTHON" name="HeatBridge" path="testsuite/robot/library/heatbridge"/>
     <referencedLibrary type="PYTHON" name="DateTime" path="testsuite/robot/library"/>
@@ -22,6 +20,7 @@
     <referencedLibrary type="PYTHON" name="ONAPLibrary.JSON" path="testsuite/robot/library"/>
     <referencedLibrary type="PYTHON" name="ONAPLibrary.Kafka" path="testsuite/robot/library"/>
     <referencedLibrary type="PYTHON" name="ONAPLibrary.Protobuf" path="testsuite/robot/library"/>
+    <referencedLibrary type="PYTHON" name="ONAPLibrary.Utilities" path="testsuite/robot/library"/>
     <pythonpath>
         <path location="robot/library"/>
     </pythonpath>
diff --git a/robot/resources/aaf_interface.robot b/robot/resources/aaf_interface.robot
index 50eea525..b1bb004d 100644
--- a/robot/resources/aaf_interface.robot
+++ b/robot/resources/aaf_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation	  The main interface for interacting with AAF. It handles low level stuff like managing the http request library and AAF required fields
 Library 	      RequestsLibrary
-Library	          UUID      
+Library	          ONAPLibrary.Utilities   
 
 Resource          global_properties.robot
 
@@ -20,7 +20,7 @@ Run AAF Get Request
      [Arguments]    ${data_path}
      ${auth}=  Create List  ${GLOBAL_AAF_USERNAME}    ${GLOBAL_AAF_PASSWORD}
      ${session}=    Create Session 	aaf	${GLOBAL_AAF_SERVER}    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 	aaf 	${data_path}     headers=${headers}
      Log    Received response from aaf ${resp.text}
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}
diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot
index 2415539c..f74ee1de 100644
--- a/robot/resources/appc_interface.robot
+++ b/robot/resources/appc_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     The main interface for interacting with APP-C. It handles low level stuff like managing the http request library and APP-C required fields
 Library 	      RequestsLibrary
-Library	          UUID
+Library	          ONAPLibrary.Utilities
 Library           OperatingSystem
 Library           SeleniumLibrary
 Library           StringTemplater
@@ -35,7 +35,7 @@ Run APPC Post Request
     ${auth}=  Create List  ${GLOBAL_APPC_USERNAME}    ${GLOBAL_APPC_PASSWORD}
     Log    Creating session ${APPC_ENDPOINT}
     ${session}=    Create Session 	appc 	${APPC_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=application/${content}    Content-Type=application/${content}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}= 	Post Request 	appc 	${data_path}     data=${data}    headers=${headers}
     Log    Received response from appc ${resp.text}
@@ -47,7 +47,7 @@ Run APPC Put Request
     ${auth}=  Create List  ${GLOBAL_APPC_USERNAME}    ${GLOBAL_APPC_PASSWORD}
     Log    Creating session ${APPC_ENDPOINT}
     ${session}=    Create Session 	appc 	${APPC_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=application/${content}    Content-Type=application/${content}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}= 	Put Request 	appc 	${data_path}     data=${data}    headers=${headers}
     Log    Received response from appc ${resp.text}
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index ad98261e..bef95843 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     The main interface for interacting with ASDC. It handles low level stuff like managing the http request library and DCAE required fields
 Library           RequestsLibrary
-Library           UUID
+Library           ONAPLibrary.Utilities
 Library           ONAPLibrary.JSON
 Library           OperatingSystem
 Library           Collections
@@ -150,7 +150,7 @@ Distribute vCPEResCust Model From ASDC
     [Arguments]    ${model_zip_path}   ${catalog_service_name}=    ${cds}=    ${service}=
     # For testing use random service name
     #${random}=    Get Current Date
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${random}=     Evaluate    str("${uuid}")[:4]
     ${catalog_service_id}=    Add ASDC Catalog Service    ${catalog_service_name}_${random}
     #   catalog_service_name already
@@ -448,7 +448,7 @@ Setup ASDC Catalog Resource CDS Properties
 
 Add ASDC License Model
     [Documentation]    Creates an ASDC License Model and returns its id
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:23]
     ${map}=    Create Dictionary    vendor_name=${shortened_uuid}
     ${data}=   Fill JSON Template File    ${ASDC_LICENSE_MODEL_TEMPLATE}    ${map}
@@ -522,7 +522,7 @@ Package ASDC Software Product
 Add ASDC Entitlement Pool
     [Documentation]    Creates an ASDC Entitlement Pool and returns its id
     [Arguments]    ${license_model_id}   ${version_id}=0.1     ${license_start_date}="01/01/1960"   ${license_end_date}="01/01/1961"
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:23]
     ${map}=    Create Dictionary    entitlement_pool_name=${shortened_uuid}  license_start_date=${license_start_date}  license_end_date=${license_end_date}
     ${data}=   Fill JSON Template File    ${ASDC_ENTITLEMENT_POOL_TEMPLATE}    ${map}
@@ -539,7 +539,7 @@ Get ASDC Entitlement Pool
 Add ASDC License Group
     [Documentation]    Creates an ASDC License Group and returns its id
     [Arguments]    ${license_model_id}   ${version_id}=1.0   ${license_start_date}="01/01/1960"   ${license_end_date}="01/01/1961"
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:23]
     ${map}=    Create Dictionary    key_group_name=${shortened_uuid}   license_start_date=${license_start_date}  license_end_date=${license_end_date}
     ${data}=   Fill JSON Template File    ${ASDC_KEY_GROUP_TEMPLATE}    ${map}
@@ -556,7 +556,7 @@ Get ASDC License Group
 Add ASDC Feature Group
     [Documentation]    Creates an ASDC Feature Group and returns its id
     [Arguments]    ${license_model_id}    ${key_group_id}    ${entitlement_pool_id}      ${version_id}=0.1
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:23]
     ${map}=    Create Dictionary    feature_group_name=${shortened_uuid}    key_group_id=${key_group_id}    entitlement_pool_id=${entitlement_pool_id}   manufacturer_reference_number=mrn${shortened_uuid}
     ${data}=   Fill JSON Template File    ${ASDC_FEATURE_GROUP_TEMPLATE}    ${map}
@@ -573,7 +573,7 @@ Get ASDC Feature Group
 Add ASDC License Agreement
     [Documentation]    Creates an ASDC License Agreement and returns its id
     [Arguments]    ${license_model_id}    ${feature_group_id}      ${version_id}=0.1
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:23]
     ${map}=    Create Dictionary    license_agreement_name=${shortened_uuid}    feature_group_id=${feature_group_id}
     ${data}=   Fill JSON Template File    ${ASDC_LICENSE_AGREEMENT_TEMPLATE}    ${map}
@@ -590,7 +590,7 @@ Get ASDC License Agreement
 Add ASDC Software Product
     [Documentation]    Creates an ASDC Software Product and returns its id
     [Arguments]    ${license_agreement_id}    ${feature_group_id}    ${license_model_name}    ${license_model_id}   ${license_model_version_id}  ${name_prefix}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:13]
     ${software_product_name}=  Catenate   ${name_prefix}   ${shortened_uuid}
     ${map}=    Create Dictionary    software_product_name=${software_product_name}    feature_group_id=${feature_group_id}    license_agreement_id=${license_agreement_id}    vendor_name=${license_model_name}    vendor_id=${license_model_id}    version_id=${license_model_version_id}
@@ -777,7 +777,7 @@ Upload ASDC Heat Package
 Add ASDC Catalog Service
     [Documentation]    Creates an ASDC Catalog Service and returns its id
     [Arguments]   ${catalog_service_name}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:23]
     ${catalog_service_name}=   Set Variable If   '${catalog_service_name}' ==''   ${shortened_uuid}   ${catalog_service_name}
     ${map}=    Create Dictionary    service_name=${catalog_service_name}
@@ -857,7 +857,7 @@ Distribute ASDC Catalog Service
 Add ASDC Resource Instance
     [Documentation]    Creates an ASDC Resource Instance and returns its id
     [Arguments]    ${catalog_service_id}    ${catalog_resource_id}    ${catalog_resource_name}  ${xoffset}=${0}   ${yoffset}=${0}   ${resourceType}=VF
-    ${milli_timestamp}=    Generate MilliTimestamp UUID
+    ${milli_timestamp}=    Generate Timestamp
     ${xoffset}=    Set Variable   ${xoffset+306}
     ${yoffset}=    Set Variable   ${yoffset+248}
     ${map}=    Create Dictionary    catalog_resource_id=${catalog_resource_id}    catalog_resource_name=${catalog_resource_name}    milli_timestamp=${milli_timestamp}   posX=${xoffset}    posY=${yoffset}    originType=${resourceType}
@@ -869,7 +869,7 @@ Add ASDC Resource Instance
 Add ASDC Resource Instance To Resource
     [Documentation]    Creates an ASDC Resource Instance in a Resource (VF) and returns its id
     [Arguments]    ${parent_catalog_resource_id}    ${catalog_resource_id}    ${catalog_resource_name}  ${xoffset}=${0}   ${yoffset}=${0}    ${resourceType}=VF
-    ${milli_timestamp}=    Generate MilliTimestamp UUID
+    ${milli_timestamp}=    Generate Timestamp
     ${xoffset}=    Set Variable   ${xoffset+306}
     ${yoffset}=    Set Variable   ${yoffset+248}
     ${map}=    Create Dictionary    catalog_resource_id=${catalog_resource_id}    catalog_resource_name=${catalog_resource_name}    milli_timestamp=${milli_timestamp}   posX=${xoffset}    posY=${yoffset}    originType=${resourceType}
@@ -915,7 +915,7 @@ Get Catalog Service Distribution Details
 Run ASDC Health Check
     [Documentation]    Runs a ASDC health check
     ${session}=    Create Session       asdc    ${ASDC_FE_ENDPOINT}
-    ${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     asdc    ${ASDC_HEALTH_CHECK_PATH}     headers=${headers}
     # only test for HTTP 200 to determine SDC Health. SDC_DE_HEALTH is informational
@@ -932,7 +932,7 @@ Run ASDC Get Request
     ${auth}=  Create List  ${GLOBAL_ASDC_BE_USERNAME}    ${GLOBAL_ASDC_BE_PASSWORD}
     Log    Creating session ${MY_ASDC_BE_ENDPOINT}
     ${session}=    Create Session       asdc    ${MY_ASDC_BE_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    USER_ID=${user}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}=    Get Request     asdc    ${data_path}     headers=${headers}
     Log    Received response from asdc ${resp.text}
@@ -943,7 +943,7 @@ Run ASDC Put Request
     ${auth}=  Create List  ${GLOBAL_ASDC_BE_USERNAME}    ${GLOBAL_ASDC_BE_PASSWORD}
     Log    Creating session ${MY_ASDC_BE_ENDPOINT}
     ${session}=    Create Session       asdc    ${MY_ASDC_BE_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    USER_ID=${user}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}=    Put Request     asdc    ${data_path}     data=${data}    headers=${headers}
     Log    Received response from asdc ${resp.text}
@@ -955,7 +955,7 @@ Run ASDC Post Files Request
     ${auth}=  Create List  ${GLOBAL_ASDC_BE_USERNAME}    ${GLOBAL_ASDC_BE_PASSWORD}
     Log    Creating session ${MY_ASDC_BE_ENDPOINT}
     ${session}=    Create Session       asdc    ${MY_ASDC_BE_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=multipart/form-data    USER_ID=${user}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}=    Post Request    asdc    ${data_path}     files=${files}    headers=${headers}
     Log    Received response from asdc ${resp.text}
@@ -967,7 +967,7 @@ Run ASDC MD5 Post Request
     ${auth}=  Create List  ${GLOBAL_ASDC_BE_USERNAME}    ${GLOBAL_ASDC_BE_PASSWORD}
     Log    Creating session ${MY_ASDC_BE_ENDPOINT}
     ${session}=    Create Session       asdc    ${MY_ASDC_BE_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${data_string}=   Evaluate    json.dumps(${data})     json
     ${md5checksum}=   Evaluate    md5.new('''${data_string}''').hexdigest()   modules=md5
     ${base64md5checksum}=  Evaluate     base64.b64encode("${md5checksum}")     modules=base64
@@ -982,7 +982,7 @@ Run ASDC Post Request
     ${auth}=  Create List  ${GLOBAL_ASDC_BE_USERNAME}    ${GLOBAL_ASDC_BE_PASSWORD}
     Log    Creating session ${MY_ASDC_BE_ENDPOINT}
     ${session}=    Create Session       asdc    ${MY_ASDC_BE_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    USER_ID=${user}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}=    Post Request    asdc    ${data_path}     data=${data}    headers=${headers}
     Log    Received response from asdc ${resp.text}
@@ -994,7 +994,7 @@ Run ASDC Delete Request
     ${auth}=  Create List  ${GLOBAL_ASDC_BE_USERNAME}    ${GLOBAL_ASDC_BE_PASSWORD}
     Log    Creating session ${MY_ASDC_BE_ENDPOINT}
     ${session}=    Create Session       asdc    ${MY_ASDC_BE_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    USER_ID=${user}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}=    Delete Request  asdc    ${data_path}        headers=${headers}
     Log    Received response from asdc ${resp.text}
diff --git a/robot/resources/bc_interface.robot b/robot/resources/bc_interface.robot
index 017041ec..a2276512 100644
--- a/robot/resources/bc_interface.robot
+++ b/robot/resources/bc_interface.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Documentation     The main interface for interacting with Bus Controller.
 Library           RequestsLibrary
-Library           UUID
 
 Resource          global_properties.robot
 
diff --git a/robot/resources/dcae_interface.robot b/robot/resources/dcae_interface.robot
index dd804503..7b1b4b24 100644
--- a/robot/resources/dcae_interface.robot
+++ b/robot/resources/dcae_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     The main interface for interacting with DCAE. It handles low level stuff like managing the http request library and DCAE required fields
 Library 	      RequestsLibrary
-Library	          UUID
+Library	          ONAPLibrary.Utilities
 Library           OperatingSystem
 Library           Collections
 Resource          global_properties.robot
@@ -16,7 +16,7 @@ Run DCAE Health Check
     ${auth}=  Create List  ${GLOBAL_DCAE_USERNAME}    ${GLOBAL_DCAE_PASSWORD}
     Log    Creating session ${DCAE_HEALTH_ENDPOINT}
     ${session}=    Create Session 	dcae 	${DCAE_HEALTH_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     X-ECOMP-Client-Version=ONAP-R2   action=getTable    Accept=application/json    Content-Type=application/json    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}= 	Get Request 	dcae 	${DCAE_HEALTH_CHECK_PATH}     headers=${headers}
     Log    Received response code from dcae ${resp}
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index faf25632..e00e36be 100644
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -10,7 +10,7 @@ Resource        vid/vid_interface.robot
 Resource	    policy_interface.robot
 Resource        aai/create_availability_zone.robot
 
-Library	        UUID
+Library	        ONAPLibrary.Utilities
 Library	        Collections
 Library         OperatingSystem
 Library         SeleniumLibrary
@@ -45,7 +45,7 @@ Load OwningEntity
     ${auth}=  Create List  ${GLOBAL_VID_USERNAME}    ${GLOBAL_VID_PASSWORD}
     Log    Creating session ${data_path}
     ${session}=    Create Session       vid    ${VID_ENDPOINT}${VID_ENV}     auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    USER_ID=${GLOBAL_VID_USERNAME}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}= 	Post Request 	vid 	${data_path}   data=${vid_data}    headers=${headers}
 	
diff --git a/robot/resources/heatbridge.robot b/robot/resources/heatbridge.robot
index e3202e07..3574b951 100644
--- a/robot/resources/heatbridge.robot
+++ b/robot/resources/heatbridge.robot
@@ -3,7 +3,6 @@ Library     HeatBridge
 Library     Collections
 Library     StringTemplater
 Library     OperatingSystem
-Library     UUID
 Library         ONAPLibrary.ServiceMapping
 
 Resource    openstack/keystone_interface.robot
diff --git a/robot/resources/mr_interface.robot b/robot/resources/mr_interface.robot
index efd4e423..85c5a614 100644
--- a/robot/resources/mr_interface.robot
+++ b/robot/resources/mr_interface.robot
@@ -1,10 +1,10 @@
 *** Settings ***
 Documentation     The main interface for interacting with Message router. It handles low level stuff like managing the http request library and message router required fields
 Library           RequestsLibrary
-Library           UUID
 Library           DateTime
 Library           Process
 Library           ONAPLibrary.JSON
+Library	          ONAPLibrary.Utilities
 
 Resource          global_properties.robot
 Resource          ../resources/json_templater.robot
@@ -99,7 +99,7 @@ Run MR Get Request
      [Documentation]    Runs MR Get request
      [Arguments]    ${data_path}
      ${session}=    Create Session      mr      ${MR_ENDPOINT}
-     ${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     mr      ${data_path}     headers=${headers}
      Log    Received response from message router ${resp.text}
@@ -112,7 +112,7 @@ Run MR Post Request
      ${timestamp}=   Get Current Date
      ${dict}=    Create Dictionary    timestamp=${timestamp}
      ${data}=   Fill JSON Template File    ${MR_PUBLISH_TEMPLATE}    ${dict}
-     ${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    mr      ${data_path}     data=${data}    headers=${headers}
      Log    Received response from message router ${resp.text}
diff --git a/robot/resources/music/music_interface.robot b/robot/resources/music/music_interface.robot
index 3251e56b..698ff0b2 100644
--- a/robot/resources/music/music_interface.robot
+++ b/robot/resources/music/music_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation	  The main interface for interacting with MUSIC. It handles low level stuff like managing the http request library and MUSIC required fields
 Library 	      RequestsLibrary
-Library	          UUID      
+Library	          ONAPLibrary.Utilities      
 
 Resource          ../global_properties.robot
 
@@ -29,7 +29,7 @@ Run MUSIC Get Request
      [Documentation]    Runs MUSIC Get request
      [Arguments]    ${data_path}
      ${session}=    Create Session 	music	${MUSIC_ENDPOINT}
-     ${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 	music 	${data_path}     headers=${headers}
      Log    Received response from music ${resp.text}
diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot
index 129f2963..7db08887 100644
--- a/robot/resources/oof_interface.robot
+++ b/robot/resources/oof_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     The main interface for interacting with OOF: SNIRO and Homing Service
 Library           RequestsLibrary
-Library	          UUID
+Library	          ONAPLibrary.Utilities
 Library           OperatingSystem
 Library	          String
 Library           DateTime
@@ -99,7 +99,7 @@ Run OOF-CMSO Post Scheduler
 Run OOF-CMSO Future Schedule
    [Documentation]   Runs CMSO Future Schedule ETE test. One VNF, One Change Window
    [Arguments]    ${request_file}=OneVnfOneChangeWindow.json.template   ${workflow}=Replace   ${minutesFromNow}=3
-   ${uuid}=   Generate UUID
+   ${uuid}=   Generate UUID4
    ${resp}=   OOF-CMSO Create Schedule   ${uuid}   ${request_file}   workflow=${workflow}   minutesFromNow=${minutesFromNow}
    Should Be Equal as Strings    ${resp.status_code}    202
    Wait Until Keyword Succeeds    600s    30s    OOF-CMSO Wait For Pending Approval   ${uuid}
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}
diff --git a/robot/resources/portal-sdk/portalDef.robot b/robot/resources/portal-sdk/portalDef.robot
index df85bfae..59808357 100644
--- a/robot/resources/portal-sdk/portalDef.robot
+++ b/robot/resources/portal-sdk/portalDef.robot
@@ -3,7 +3,6 @@ Documentation    This is RobotFrame work script
 Library		SeleniumLibrary
 Library		OperatingSystem
 Library		RequestsLibrary
-Library		UUID
 Library		DateTime
 Library		Collections
 Library		StringTemplater
@@ -33,9 +32,16 @@ ${jira}    jira
 ${RESOURCE_PATH}    ${PORTAL_URL}/auxapi/ticketevent
 ${portal_Template}    ${CURDIR}/portal.template
 
-
 ${download_link_id}    0
 
+${Test_LoginID}
+${App_LoginID}
+${Sta_LoginID}
+${App_Email_Address}
+${Test_Email_Address}
+${Sta_Email_Address}
+${AppUserName}
+${AppPassword}
 
 *** Keywords ***
 
diff --git a/robot/resources/portal_interface.robot b/robot/resources/portal_interface.robot
index bc925012..6c1cb5d9 100644
--- a/robot/resources/portal_interface.robot
+++ b/robot/resources/portal_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation	  The main interface for interacting with Portal. It handles low level stuff like managing the http request library and Portal required fields
 Library 	RequestsLibrary
-Library	        UUID      
+Library	          ONAPLibrary.Utilities
 Library 	SeleniumLibrary
 Library         Collections
 Library         String
@@ -28,7 +28,7 @@ Run Portal Get Request
      [Documentation]    Runs Portal Get request
      [Arguments]    ${data_path}
      ${session}=    Create Session 	portal	${PORTAL_ENDPOINT}
-     ${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/robot/resources/sdngc_interface.robot b/robot/resources/sdngc_interface.robot
index d4a16ac9..f1100a68 100644
--- a/robot/resources/sdngc_interface.robot
+++ b/robot/resources/sdngc_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     The main interface for interacting with SDN-GC. It handles low level stuff like managing the http request library and SDN-GC required fields
 Library 	      RequestsLibrary
-Library	          UUID
+Library	          ONAPLibrary.Utilities
 Library    OperatingSystem
 Library 	    SeleniumLibrary
 Library         Collections
@@ -39,7 +39,7 @@ Run SDNGC Get Request
     ${auth}=  Create List  ${GLOBAL_SDNGC_USERNAME}    ${GLOBAL_SDNGC_PASSWORD}
     Log    Creating session ${SDNGC_REST_ENDPOINT}
     ${session}=    Create Session 	sdngc 	${SDNGC_REST_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 	sdngc 	${data_path}     headers=${headers}
     Log    Received response from sdngc ${resp.text}
@@ -51,7 +51,7 @@ Run SDNGC Put Request
     ${auth}=  Create List  ${GLOBAL_SDNGC_USERNAME}    ${GLOBAL_SDNGC_PASSWORD}
     Log    Creating session ${SDNGC_REST_ENDPOINT}
     ${session}=    Create Session 	sdngc 	${SDNGC_REST_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 	sdngc 	${data_path}     data=${data}    headers=${headers}
     Log    Received response from sdngc ${resp.text}
@@ -63,7 +63,7 @@ Run SDNGC Post Request
     ${auth}=  Create List  ${GLOBAL_SDNGC_USERNAME}    ${GLOBAL_SDNGC_PASSWORD}
     Log    Creating session ${SDNGC_REST_ENDPOINT}
     ${session}=    Create Session 	sdngc 	${SDNGC_REST_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 	sdngc 	${data_path}     data=${data}    headers=${headers}
     Log    Received response from sdngc ${resp.text}
@@ -75,7 +75,7 @@ Run SDNGC Delete Request
     ${auth}=  Create List  ${GLOBAL_SDNGC_USERNAME}    ${GLOBAL_SDNGC_PASSWORD}
     Log    Creating session ${SDNGC_REST_ENDPOINT}
     ${session}=    Create Session 	sdngc 	${SDNGC_REST_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 	sdngc 	${data_path}        headers=${headers}
     Log    Received response from sdngc ${resp.text}
@@ -245,7 +245,7 @@ Login To SDNGC Admin GUI
     Log    Logging in to ${SDNGC_ADMIN_LOGIN_URL}
     Handle Proxy Warning
     Title Should Be    AdminPortal
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:12]
     ${email}=        Catenate    ${shortened_uuid}@robotete.com
     Input Text    xpath=//input[@id='nf_email']    ${email}
diff --git a/robot/resources/sms_interface.robot b/robot/resources/sms_interface.robot
index 81d728f8..10cba192 100644
--- a/robot/resources/sms_interface.robot
+++ b/robot/resources/sms_interface.robot
@@ -1,8 +1,6 @@
 *** Settings ***
 Documentation	  The main interface for interacting with SMS.
 Library 	      RequestsLibrary
-Library	          UUID
-
 Resource          global_properties.robot
 
 *** Variables ***
diff --git a/robot/resources/so_interface.robot b/robot/resources/so_interface.robot
index 0bb4f49a..6c4fd26e 100644
--- a/robot/resources/so_interface.robot
+++ b/robot/resources/so_interface.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     The main interface for interacting with MSO. It handles low level stuff like managing the http request library and MSO required fields
 Library 	      RequestsLibrary
-Library	          UUID
+Library	          ONAPLibrary.Utilities
 Library           OperatingSystem
 Library           Collections
 Resource          global_properties.robot
@@ -37,7 +37,7 @@ Run SO Container Health Check
     [Arguments]    ${so_endpoint_label}    ${so_endpoint}
     ${auth}=  Create List  ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     ${session}=    Create Session 	mso 	${so_endpoint}
-    ${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 	mso 	${MSO_HEALTH_CHECK_PATH}     headers=${headers}
     Should Be Equal As Strings 	${resp.status_code} 	200
@@ -66,7 +66,7 @@ Run MSO Get Request
     ${auth}=  Create List  ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     Log    Creating session ${MSO_ENDPOINT}
     ${session}=    Create Session 	mso 	${MSO_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=${accept}    Content-Type=application/json    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}= 	Get Request 	mso 	${data_path}     headers=${headers}
     Log    Received response from mso ${resp.text}
@@ -78,7 +78,7 @@ Run MSO Catalog Get Request
     ${auth}=  Create List  ${GLOBAL_MSO_CATDB_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     Log    Creating session ${SO_CATDB_ENDPOINT}
     ${session}=    Create Session 	so_catdb   ${SO_CATDB_ENDPOINT}    auth=${auth}
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     ${headers}=  Create Dictionary     Accept=${accept}    Content-Type=application/json    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
     ${resp}= 	Get Request 	so_catdb  	${data_path}     headers=${headers}
     Log    Received response from so_catdb ${resp.text}
@@ -91,7 +91,7 @@ Poll MSO Get Request
     ${auth}=  Create List  ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     Log    Creating session ${MSO_ENDPOINT}
     ${session}=    Create Session 	mso 	${MSO_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}
     #do this until it is done
     :FOR    ${i}    IN RANGE    20
@@ -110,7 +110,7 @@ Run MSO Post request
     ${auth}=  Create List  ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     Log    Creating session ${MSO_ENDPOINT}
     ${session}=    Create Session 	mso 	${MSO_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 	mso 	${data_path}     data=${data}   headers=${headers}
 	Log    Received response from mso ${resp.text}
@@ -122,7 +122,7 @@ Run SO Catalog Post request
     ${auth}=  Create List  ${GLOBAL_MSO_CATDB_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     Log    Creating session ${SO_CATDB_ENDPOINT}
     ${session}=    Create Session       so_catdb     ${SO_CATDB_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    so_catdb     ${data_path}     data=${data}   headers=${headers}
     Log    Received response from so_catdb ${resp.text}
@@ -134,7 +134,7 @@ Run SO Catalog Put request
     ${auth}=  Create List  ${GLOBAL_MSO_CATDB_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     Log    Creating session ${SO_CATDB_ENDPOINT}
     ${session}=    Create Session       so_catdb     ${SO_CATDB_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    so_catdb     ${data_path}     data=${data}   headers=${headers}
     Log    Received response from so_catdb ${resp.text}
@@ -146,7 +146,7 @@ Run MSO Delete request
     ${auth}=    Create List    ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     Log    Creating session ${MSO_ENDPOINT}
     ${session}=    Create Session    mso    ${MSO_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    mso    ${data_path}    ${data}    headers=${headers}
     Log    Received response from mso ${resp.text}
diff --git a/robot/resources/stack_validation/packet_generator_interface.robot b/robot/resources/stack_validation/packet_generator_interface.robot
index 62ac91d2..2a30ba2a 100644
--- a/robot/resources/stack_validation/packet_generator_interface.robot
+++ b/robot/resources/stack_validation/packet_generator_interface.robot
@@ -2,7 +2,7 @@
 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           StringTemplater
-Library	          UUID
+Library	          ONAPLibrary.Utilities
 Library	          OperatingSystem
 Resource          ../global_properties.robot
 Resource          ../json_templater.robot
@@ -118,6 +118,6 @@ Get List Of Enabled Streams V2
     [Return]    ${resp.json()}
 
 Create Headers
-    ${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}
     [Return]    ${headers}
diff --git a/robot/resources/test_templates/pnf_registration_without_SO_template.robot b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
index cd901094..12510f70 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -6,7 +6,6 @@ Resource        ../json_templater.robot
 Library         OpenstackLibrary
 Library         OperatingSystem
 Library         RequestsLibrary
-Library         UUID
 Library         Collections
 Library         ONAPLibrary.JSON
 Library         HTTPUtils
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index a2ecfeae..86595975 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -20,8 +20,8 @@ Resource        ../heatbridge.robot
 
 Library         OpenstackLibrary
 Library 	    SeleniumLibrary
-Library	        UUID
 Library	        Collections
+Library	        ONAPLibrary.Utilities
 Library         ONAPLibrary.JSON
 Library         ONAPLibrary.ServiceMapping
 
@@ -51,7 +51,7 @@ Orchestrate VNF
     [Documentation]   Use openECOMP to Orchestrate a service.
     [Arguments]    ${customer_name}    ${service}    ${product_family}    ${tenant}  ${project_name}=Project-Demonstration   ${owning_entity}=OE-Demonstration
     ${lcp_region}=   Get Openstack Region
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     Set Test Variable    ${CUSTOMER_NAME}    ${customer_name}_${uuid}
     Set Test Variable    ${SERVICE}    ${service}
     ${list}=    Create List
@@ -103,7 +103,7 @@ Orchestrate Demo VNF
     ...                      '${service}'=='vFW'       demoVFW
     ...                      '${service}'=='vLB'       demoVLB
     ${lcp_region}=   Get Openstack Region
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     Set Test Variable    ${CUSTOMER_NAME}    ${customer_name}_${uuid}
     Set Test Variable    ${SERVICE}    ${service}
     ${list}=    Create List
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index db968e31..f6c33c1b 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -22,7 +22,7 @@ Resource    	../json_templater.robot
 Resource    	../so_interface.robot
 
 Library         OpenstackLibrary
-Library	        UUID
+Library	          ONAPLibrary.Utilities
 Library	        Collections
 Library         String
 Library         ONAPLibrary.JSON
@@ -63,7 +63,7 @@ Orchestrate VNF With CDS
     [Documentation]   Use openECOMP to Orchestrate a service.
     [Arguments]    ${customer_name}    ${service}    ${product_family}    ${tenant}  	${project_name}=Project-Demonstration   ${owning_entity}=OE-Demonstration
     ${lcp_region}=   Get Openstack Region
-    ${uuid}=    Generate UUID
+    ${uuid}=    Generate UUID4
     Set Test Variable    ${CUSTOMER_NAME}    ${customer_name}_${uuid}
     Set Test Variable    ${SERVICE}    ${service}
     ${list}=    Create List
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}