From 288e86f420d6646aa1b88241827a1883b096b058 Mon Sep 17 00:00:00 2001 From: DR695H Date: Mon, 17 Jun 2019 15:19:58 -0400 Subject: moving to python based music libs Issue-ID: TEST-158 Change-Id: I53fd874206294410f7701d6f0f5946c0f8aa8734 Signed-off-by: DR695H --- robot/resources/music/music_interface.robot | 29 +---------------------------- robot/testsuites/health-check.robot | 4 +--- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/robot/resources/music/music_interface.robot b/robot/resources/music/music_interface.robot index 698ff0b2..2bce5363 100644 --- a/robot/resources/music/music_interface.robot +++ b/robot/resources/music/music_interface.robot @@ -3,34 +3,7 @@ Documentation The main interface for interacting with MUSIC. It handles low le Library RequestsLibrary Library ONAPLibrary.Utilities -Resource ../global_properties.robot - *** Variables *** ${MUSIC_HEALTH_CHECK_PATH} /MUSIC/rest/v2/version ${MUSIC_CASSA_HEALTH_CHECK_PATH} /MUSIC/rest/v2/service/musicHealthCheck -${MUSIC_ENDPOINT} ${GLOBAL_MUSIC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MUSIC_IP_ADDR}:${GLOBAL_MUSIC_SERVER_PORT} - -*** Keywords *** -Run MUSIC Health Check - [Documentation] Runs MUSIC Health check - ${resp}= Run MUSIC Get Request ${MUSIC_HEALTH_CHECK_PATH} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be Equal As Strings ${resp.json()['status']} SUCCESS - - -Run MUSIC Cassandra Connection Check - [Documentation] Confirm MUSIC's connection to Cassandra in active - ${resp}= Run MUSIC Get Request ${MUSIC_CASSA_HEALTH_CHECK_PATH} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be Equal As Strings ${resp.json()['Cassandra']} Active - - -Run MUSIC Get Request - [Documentation] Runs MUSIC Get request - [Arguments] ${data_path} - ${session}= Create Session music ${MUSIC_ENDPOINT} - ${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} - [Return] ${resp} +${MUSIC_ENDPOINT} ${GLOBAL_MUSIC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MUSIC_IP_ADDR}:${GLOBAL_MUSIC_SERVER_PORT} \ No newline at end of file diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index 6851edfc..ca4f084f 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -17,7 +17,6 @@ Resource ../resources/bc_interface.robot Resource ../resources/aaf_interface.robot Resource ../resources/msb_interface.robot Resource ../resources/clamp_interface.robot -Resource ../resources/music/music_interface.robot Resource ../resources/test_templates/model_test_template.robot Resource ../resources/nbi_interface.robot Resource ../resources/cli_interface.robot @@ -28,8 +27,7 @@ Resource ../resources/sms_interface.robot Resource ../resources/dr_interface.robot Resource ../resources/pomba_interface.robot Resource ../resources/holmes_interface.robot -# Remove other references after a soak period -#Resource ../resources/vvp_interface.robot + *** Test Cases *** Basic A&AI Health Check -- cgit 1.2.3-korg