From fd6c8fafba3be7a137787a01d6661d943c19c2c0 Mon Sep 17 00:00:00 2001 From: Aleksandra Maciaga Date: Wed, 6 Nov 2019 15:14:11 +0100 Subject: Remove certOnly and basicAuth from authentication methods CSIT VES Issue-ID: DCAEGEN2-1776 Signed-off-by: Aleksandra Maciaga Change-Id: I7e087f70d3458e8477b5cb35132b526bddbb7df2 --- .../testcases/resources/dcae_keywords.robot | 60 +++++++++++++++++----- 1 file changed, 46 insertions(+), 14 deletions(-) (limited to 'tests/dcaegen2/testcases/resources/dcae_keywords.robot') diff --git a/tests/dcaegen2/testcases/resources/dcae_keywords.robot b/tests/dcaegen2/testcases/resources/dcae_keywords.robot index 013f6f03..c4cdbb9c 100644 --- a/tests/dcaegen2/testcases/resources/dcae_keywords.robot +++ b/tests/dcaegen2/testcases/resources/dcae_keywords.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 DcaeLibrary +Library DcaeLibrary Library OperatingSystem Library Collections Variables ../resources/DcaeVariables.py @@ -10,6 +10,7 @@ Resource ../resources/dcae_properties.robot *** Variables *** ${DCAE_HEALTH_CHECK_BODY} %{WORKSPACE}/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json + *** Keywords *** Create sessions [Documentation] Create all required sessions @@ -18,6 +19,17 @@ Create sessions ${auth}= Create List ${VESC_HTTPS_USER} ${VESC_HTTPS_PD} Create Session dcae_vesc_url_https ${VESC_URL_HTTPS} auth=${auth} disable_warnings=1 Set Suite Variable ${suite_dcae_vesc_url_https_session} dcae_vesc_url_https + ${wrong_auth}= Create List ${VESC_HTTPS_WRONG_USER} ${VESC_HTTPS_WRONG_PD} + Create Session dcae_vesc_url_https_wrong_auth ${VESC_URL_HTTPS} auth=${wrong_auth} disable_warnings=1 + Set Suite Variable ${suite_dcae_vesc_url_https_wrong_auth_session} dcae_vesc_url_https_wrong_auth + ${certs}= Create List ${VESC_ROOTCA_CERT} ${VESC_ROOTCA_KEY} + Create Client Cert Session dcae_vesc_url_https_cert ${VESC_URL_HTTPS} client_certs=${certs} disable_warnings=1 + Set Suite Variable ${suite_dcae_vesc_url_https_cert_session} dcae_vesc_url_https_cert + ${wrong_certs}= Create List ${VESC_WRONG_CERT} ${VESC_WRONG_KEY} + Create Client Cert Session dcae_vesc_url_https_wrong_cert ${VESC_URL_HTTPS} client_certs=${wrong_certs} disable_warnings=1 verify=${False} + Set Suite Variable ${suite_dcae_vesc_url_https_wrong_cert_session} dcae_vesc_url_https_wrong_cert + Create Session dcae_vesc_url_https_wo_auth ${VESC_URL_HTTPS} disable_warnings=1 + Set Suite Variable ${suite_dcae_vesc_url_https_wo_auth_session} dcae_vesc_url_https_wo_auth Create header ${headers}= Create Dictionary Content-Type=application/json @@ -33,8 +45,8 @@ Get DCAE Nodes Log Received response from dcae consul: ${resp.json()} Should Be Equal As Strings ${resp.status_code} 200 ${NodeList}= Get Json Value List ${resp.text} Node - ${NodeListLength}= Get Length ${NodeList} - ${len}= Get Length ${NodeList} + ${NodeListLength}= Get Length ${NodeList} + ${len}= Get Length ${NodeList} Should Not Be Equal As Integers ${len} 0 [Return] ${NodeList} @@ -56,7 +68,7 @@ DCAE Node Health Check DCAE Check Health Status [Arguments] ${NodeName} ${ItemStatus} ${CheckType} - Should Be Equal As Strings ${ItemStatus} passing + Should Be Equal As Strings ${ItemStatus} passing Log Node: ${NodeName} ${CheckType} check pass ok VES Collector Suite Setup DMaaP @@ -76,11 +88,11 @@ Check DCAE Results @{headers}= Get From Dictionary ${json['returns']} columns # Retrieve column names from headers ${columns}= Create List - :for ${header} in @{headers} + :for ${header} IN @{headers} \ ${colName}= Get From Dictionary ${header} colName \ Append To List ${columns} ${colName} # Process each row making sure status=GREEN - :for ${row} in @{rows} + :for ${row} IN @{rows} \ ${cells}= Get From Dictionary ${row} cells \ ${dict}= Make A Dictionary ${cells} ${columns} \ Dictionary Should Contain Item ${dict} healthTestStatus GREEN @@ -91,15 +103,15 @@ Make A Dictionary ${dict}= Create Dictionary ${collength}= Get Length ${columns} ${namelength}= Get Length ${names} - :for ${index} in range 0 ${collength} + :for ${index} IN RANGE 0 ${collength} \ ${name}= Evaluate ${names}[${index}] \ ${valued}= Evaluate ${columns}[${index}] \ ${value}= Get From Dictionary ${valued} ${valueName} - \ Set To Dictionary ${dict} ${name} ${value} + \ Set To Dictionary ${dict} ${name} ${value} [Return] ${dict} Json String To Dictionary - [Arguments] ${json_string} + [Arguments] ${json_string} ${json_dict}= evaluate json.loads('''${json_string}''') json [Return] ${json_dict} @@ -110,7 +122,7 @@ Dictionary To Json String Get DCAE Service Component Status [Documentation] Get the status of a DCAE Service Component - [Arguments] ${url} ${urlpath} ${usr} ${passwd} + [Arguments] ${url} ${urlpath} ${usr} ${passwd} ${auth}= Create List ${usr} ${passwd} ${session}= Create Session dcae-service-component ${url} auth=${auth} ${resp}= Get Request dcae-service-component ${urlpath} @@ -120,26 +132,46 @@ Publish Event To VES Collector No Auth [Documentation] Send an event to VES Collector [Arguments] ${evtpath} ${evtdata} ${resp}= Post Request ${suite_dcae_vesc_url_session} ${evtpath} data=${evtdata} headers=${suite_headers} - #Log Received response from dcae ${resp.json()} [Return] ${resp} Publish Event To VES Collector [Documentation] Send an event to VES Collector [Arguments] ${evtpath} ${evtdata} ${resp}= Post Request ${suite_dcae_vesc_url_https_session} ${evtpath} data=${evtdata} headers=${suite_headers} - #Log Received response from dcae ${resp.json()} [Return] ${resp} Publish Event To VES Collector With Put Method [Documentation] Send an event to VES Collector [Arguments] ${evtpath} ${evtdata} ${resp}= Put Request ${suite_dcae_vesc_url_https_session} ${evtpath} data=${evtdata} headers=${suite_headers} - #Log Received response from dcae ${resp.json()} [Return] ${resp} Publish Event To VES Collector With Put Method No Auth [Documentation] Send an event to VES Collector [Arguments] ${evtpath} ${evtdata} ${resp}= Put Request ${suite_dcae_vesc_url_session} ${evtpath} data=${evtdata} headers=${suite_headers} - #Log Received response from dcae ${resp.json()} [Return] ${resp} + +Publish Event To VES Collector With Wrong Auth + [Documentation] Send an event to VES Collector by session with wrong auth + [Arguments] ${evtpath} ${evtdata} + ${resp}= Post Request ${suite_dcae_vesc_url_https_wrong_auth_session} ${evtpath} data=${evtdata} headers=${suite_headers} + [Return] ${resp} + +Publish Event To VES Collector With Cert + [Documentation] Send an event to VES Collector by session with certs + [Arguments] ${evtpath} ${evtdata} + ${resp}= Post Request ${suite_dcae_vesc_url_https_cert_session} ${evtpath} data=${evtdata} headers=${suite_headers} + [Return] ${resp} + +Publish Event To VES Collector With Wrong Cert + [Documentation] Send an event to VES Collector by session with wrong certs + [Arguments] ${evtpath} ${evtdata} + ${resp}= Post Request ${suite_dcae_vesc_url_https_wrong_cert_session} ${evtpath} data=${evtdata} headers=${suite_headers} + [Return] ${resp} + +Publish Event To VES Collector Without Auth And Cert + [Documentation] Send an event to VES Collector by session without Auth and Cert + [Arguments] ${evtpath} ${evtdata} + ${resp}= Post Request ${suite_dcae_vesc_url_https_wo_auth_session} ${evtpath} data=${evtdata} headers=${suite_headers} + [Return] ${resp} -- cgit 1.2.3-korg