From f93614f8b95498058eba70fe17b6dbfe314f4f6f Mon Sep 17 00:00:00 2001 From: krishnaa96 Date: Thu, 17 Jun 2021 20:05:13 +0530 Subject: [OOF] Remove CMSO related test cases CMSO related test cases and healthcheck testcase is being removed from the testsuite since CMSO is being deprecated Issue-ID: OPTFRA-969 Signed-off-by: krishnaa96 Change-Id: I97351511c776ba5b7e1361227afcb9df229cb56f --- robot/resources/oof_interface.robot | 99 +------------------------------------ robot/testsuites/health-check.robot | 4 -- robot/testsuites/oof/oof-cmso.robot | 10 ---- 3 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 robot/testsuites/oof/oof-cmso.robot diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot index ec67a267..cd235e5a 100644 --- a/robot/resources/oof_interface.robot +++ b/robot/resources/oof_interface.robot @@ -14,16 +14,12 @@ Resource global_properties.robot *** Variables *** ${OOF_HOMING_HEALTH_CHECK_PATH} /v1/plans/healthcheck ${OOF_OSDF_HEALTH_CHECK_PATH} /api/oof/v1/healthcheck -${OOF_CMSO_HEALTH_CHECK_PATH} /cmso/v1/health?checkInterfaces=true -${OOF_CMSO_TEMPLATE_FOLDER} cmso -${OOF_CMSO_UTC} %Y-%m-%dT%H:%M:%SZ ${OOF_HOMING_PLAN_FOLDER} robot/assets/oof/optf-has ${OOF_OSDF_TEMPLATE_FOLDER} robot/assets/oof/optf-osdf ${OOF_HOMING_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT} ${OOF_OSDF_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT} -${OOF_CMSO_ENDPOINT} ${GLOBAL_OOF_CMSO_PROTOCOL}://${GLOBAL_INJECTED_OOF_CMSO_IP_ADDR}:${GLOBAL_OOF_CMSO_SERVER_PORT} ${OOF_OSDF_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT} @@ -47,7 +43,7 @@ RUN OOF-Homing SendPlanWithWrongVersion ${session}= Create Session optf-cond ${OOF_HOMING_ENDPOINT} ${data}= Get Binary File ${OOF_HOMING_PLAN_FOLDER}${/}plan_with_wrong_version.json ${auth}= Create List ${GLOBAL_OOF_HOMING_USERNAME} ${GLOBAL_OOF_HOMING_PASSWORD} - ${session}= Create Session session ${OOF_CMSO_ENDPOINT} auth=${auth} + ${session}= Create Session session ${OOF_HOMING_ENDPOINT} auth=${auth} &{headers}= Create Dictionary Content-Type=application/json Accept=application/json ${resp}= Post Request optf-cond /v1/plans data=${data} headers=${headers} Log ********************* @@ -73,99 +69,6 @@ Run OOF-OSDF Get Request Log Received response from OOF-OSDF ${resp.text} [Return] ${resp} -Run OOF-CMSO Health Check - [Documentation] Runs OOF-CMSO Health check - ${resp}= Run OOF-CMSO Get Request ${OOF_CMSO_HEALTH_CHECK_PATH} - Should Be Equal As Integers ${resp.status_code} 200 - -Run OOF-CMSO Get Request - [Documentation] Runs OOF-CMSO Get request - [Arguments] ${data_path} - ${auth}= Create List ${GLOBAL_OOF_CMSO_USERNAME} ${GLOBAL_OOF_CMSO_PASSWORD} - ${session}= Create Session session ${OOF_CMSO_ENDPOINT} auth=${auth} - ${resp}= Get Request session ${data_path} - Should Be Equal As Integers ${resp.status_code} 200 - Log Received response from OOF-CMSO ${resp.text} - [Return] ${resp} - -Run OOF-CMSO Post Scheduler - [Documentation] Runs a scheduler POST request - [Arguments] ${data_path} ${data}={} - ${auth}= Create List ${GLOBAL_OOF_CMSO_USERNAME} ${GLOBAL_OOF_CMSO_PASSWORD} - ${session}= Create Session session ${OOF_CMSO_ENDPOINT} auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Post Request session ${data_path} headers=${headers} data=${data} - Log Received response from scheduler ${resp.text} - [Return] ${resp} - -Run OOF-CMSO Future Schedule - [Documentation] Runs CMSO Future Schedule ETE test. One VNF, One Change Window - [Arguments] ${request_file}=OneVnfOneChangeWindow.jinja ${workflow}=Replace ${minutesFromNow}=3 - ${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} - OOF-CMSO Send Tier2 Approval ${uuid} jf9860 Accepted - Wait Until Keyword Succeeds 600s 30s OOF-CMSO Wait for Schedule to Complete Completed ${uuid} - - -OOF-CMSO Create Schedule - [Documentation] Creates a CMSO future schedule request for the passed template. - [Arguments] ${uuid} ${request_file} ${workflow} ${minutesFromNow}=5 - ${testid}= Catenate ${uuid} - ${testid}= Get Substring ${testid} -4 - ${dict}= Create Dictionary serviceInstanceId=${uuid} parent_service_model_name=${uuid} - ${map}= Create Dictionary uuid=${uuid} callbackUrl=http://localhost:8080 testid=${testid} workflow=${workflow} userId=oof@oof.onap.org - ${nodelist}= Create List node1 node2 node3 node4 - ${nn}= Catenate 1 - # Support up to 4 ChangeWindows - :FOR ${i} IN RANGE 1 4 - \ ${today}= Evaluate ((${i}-1)*1440)+${minutesFromNow} - \ ${tomorrow} Evaluate ${today}+1440 - \ ${last_time} Evaluate ${today}+30 - \ ${start_time}= Get Current Date UTC + ${today} minutes result_format=${OOF_CMSO_UTC} - \ ${end_time}= Get Current Date UTC + ${tomorrow} minutes result_format=${OOF_CMSO_UTC} - \ Set To Dictionary ${map} start_time${i}=${start_time} end_time${i}=${end_time} - ${requestList}= Create List - Templating.Create Environment oof ${GLOBAL_TEMPLATE_FOLDER} - :FOR ${vnf} IN @{nodelist} - \ Set To Dictionary ${map} node${nn} ${vnf} - \ ${nn}= Evaluate ${nn}+1 - \ Set To DIctionary ${dict} vnfName=${vnf} - \ ${requestInfo}= Templating.Apply Template oof ${OOF_CMSO_TEMPLATE_FOLDER}/VidCallbackData.jinja ${dict} - \ Append To List ${requestList} ${requestInfo} - ${callBackDataMap}= Create Dictionary requestType=Update requestDetails=${requestList} - ${callbackDataString}= OOF-CMSO Json Escape ${callbackDataMap} - Set To Dictionary ${map} callbackData=${callbackDataString} - ${data}= Templating.Apply Template oof ${OOF_CMSO_TEMPLATE_FOLDER}/${request_file} ${map} - ${resp}= Run OOF-CMSO Post Scheduler cmso/v1/schedules/${uuid} data=${data} - [Return] ${resp} - -OOF-CMSO Wait For Pending Approval - [Documentation] Gets the schedule identified by the uuid and checks if it is in the Pending Approval state - [Arguments] ${uuid} ${status}=Pending Approval - ${resp}= Run OOF-CMSO Get Request cmso/v1/schedules/${uuid} - ${json}= Catenate ${resp.json()} - Dictionary Should Contain Item ${resp.json()} status ${status} - -OOF-CMSO Send Tier2 Approval - [Documentation] Sends an approval post request for the given schedule using the UUID and User given and checks that request worked - [Arguments] ${uuid} ${user} ${status} - ${approval}= Create Dictionary approvalUserId=${user} approvalType=Tier 2 approvalStatus=${status} - ${resp}= Run OOF-CMSO Post Scheduler cmso/v1/schedules/${uuid}/approvals data=${approval} - Should Be Equal As Strings ${resp.status_code} 204 - -OOF-CMSO Wait for Schedule to Complete - [Arguments] ${status} ${uuid} - ${resp}= Run OOF-CMSO Get Request cmso/v1/schedules/${uuid} - Dictionary Should Contain Item ${resp.json()} status Completed - -OOF-CMSO Json Escape - [Arguments] ${json} - ${json_string}= Evaluate json.dumps(${json}) json - ${escaped}= Replace String ${json_string} " \\" - [Return] ${escaped} - Run OOF-OSDF Post Request [Documentation] Runs a scheduler POST request [Arguments] ${data_path} ${auth} ${data}={} diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index 976d2445..8160dae2 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -139,10 +139,6 @@ Basic OOF-OSDF Health Check [Tags] health medium health-oof Run OOF-OSDF Health Check -Basic OOF-CMSO Health Check - [Tags] health medium health-oof - Run OOF-CMSO Health Check - Basic Policy Health Check [Tags] health medium health-policy Run Policy Health Check diff --git a/robot/testsuites/oof/oof-cmso.robot b/robot/testsuites/oof/oof-cmso.robot deleted file mode 100644 index e7d2aaee..00000000 --- a/robot/testsuites/oof/oof-cmso.robot +++ /dev/null @@ -1,10 +0,0 @@ -*** Settings *** -Documentation Testing OOF-CMSO -... -... Testing OOF-CMSO Future Schedule ETE -Resource ../../resources/oof_interface.robot - -*** Test Cases *** -Basic OOF-CMSO CSIT - [Tags] cmso - Run OOF-CMSO Future Schedule \ No newline at end of file -- cgit 1.2.3-korg