From e1ac8d1da4aad2358d98b7649845e090d53a1157 Mon Sep 17 00:00:00 2001 From: kaihlavi Date: Thu, 1 Aug 2019 17:25:12 +0300 Subject: Take ONAPLibrary.SDC in use in DCAE-DS CSIT - Replace old SDC communication with new ONAPLibrary.SDC methods - Use ONAPLibrary also for Base64 encoding Issue-ID: TEST-186 Signed-off-by: kaihlavi Change-Id: I8f1b0898508fe3117a542c7ee3254beba2e50bb6 --- tests/sdc-dcae-d/dcaed/asdc_interface.robot | 64 ++++++++--------------------- 1 file changed, 18 insertions(+), 46 deletions(-) (limited to 'tests/sdc-dcae-d/dcaed') diff --git a/tests/sdc-dcae-d/dcaed/asdc_interface.robot b/tests/sdc-dcae-d/dcaed/asdc_interface.robot index c01dc097..2310522d 100644 --- a/tests/sdc-dcae-d/dcaed/asdc_interface.robot +++ b/tests/sdc-dcae-d/dcaed/asdc_interface.robot @@ -4,6 +4,8 @@ Library OperatingSystem Library RequestsLibrary Library ONAPLibrary.Utilities Library ONAPLibrary.Templating WITH NAME Templating +Library ONAPLibrary.SDC WITH NAME SDC + Resource common.robot ***Variables *** @@ -32,65 +34,35 @@ Create Catalog Resource Data ${data}= Templating.Apply Template sdc_catalog_resource ${SDC_CATALOG_RESOURCE_TEMPLATE} ${map} [Return] ${data} -# Based on testsuite/robot/resources/asdc_interface.robot's 'Post ASDC Resource Request' keyword Post ASDC Resource Request Unauthenticated [Documentation] Makes unauthenticated Post request for ASDC Catalog resource and returns its unique id [Arguments] ${data} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_RESOURCES_PATH} ${data} ${ASDC_DESIGNER_USER_ID} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_RESOURCES_PATH} ${data} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 201 [Return] ${resp.json()['uniqueId']} -# Based on testsuite/robot/resources/asdc_interface.robot's 'Run ASDC Post Request' keyword -Run ASDC Post Request Unauthenticated - [Documentation] Runs an ASDC Post request without authentication and returns the HTTP response - [Arguments] ${data_path} ${data} ${user}=${ASDC_DESIGNER_USER_ID} ${MY_ASDC_BE_ENDPOINT}=${ASDC_BE_ENDPOINT} - Log Creating session ${MY_ASDC_BE_ENDPOINT} - ${session}= Create Session asdc ${MY_ASDC_BE_ENDPOINT} - ${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} - [Return] ${resp} - -# Based on testsuite/robot/resources/asdc_interface.robot's 'Run ASDC MD5 Post Request' keyword -Run ASDC MD5 Post Request Unauthenticated - [Documentation] Runs an ASDC post request with MD5 Checksum header without authentication and returns the HTTP response - [Arguments] ${data_path} ${data} ${user}=${ASDC_DESIGNER_USER_ID} ${MY_ASDC_BE_ENDPOINT}=${ASDC_BE_ENDPOINT} - Log Creating session ${MY_ASDC_BE_ENDPOINT} - # This is needed to ensure that the data is in dict format - otherwise the checksum will not match - ${dict_data}= evaluate json.loads('''${data}''') json - ${session}= Create Session asdc ${MY_ASDC_BE_ENDPOINT} - ${uuid}= Generate UUID4 - ${data_string}= Evaluate json.dumps(${dict_data}) json - ${md5checksum}= Evaluate md5.new('''${data_string}''').hexdigest() modules=md5 - ${base64md5checksum}= Evaluate base64.b64encode("${md5checksum}") modules=base64 - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json USER_ID=${user} X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} Content-MD5=${base64md5checksum} - ${resp}= Post Request asdc ${data_path} data=${dict_data} headers=${headers} - Log Received response from asdc: ${resp.text} - [Return] ${resp} - -# Based on testsuite/robot/resources/asdc_interface.robot's 'Setup SDC Catalog Resource Deployment Artifact Properties' keyword +# Based on testsuite/robot/resources/sdc_interface.robot's 'Setup SDC Catalog Resource Deployment Artifact Properties' keyword Add Tosca Artifact To Resource [Documentation] Add Tosca artifacts to given resource id [Arguments] ${artifact} ${vf_id} ${blueprint_data} OperatingSystem.Get File ${ASSETS_DIR}${artifact}.yaml - ${payloadData}= Evaluate base64.b64encode('''${blueprint_data}'''.encode('utf-8')) modules=base64 + ${payloadData}= Base64 Encode ${blueprint_data} ${dict}= Create Dictionary artifactLabel=${artifact} artifactName=${artifact}.yaml artifactType=DCAE_TOSCA artifactGroupType=DEPLOYMENT description=${artifact}.yaml payloadData=${payloadData} Templating.Create Environment sdc_artifact_upload ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_artifact_upload ${SDC_ARTIFACT_UPLOAD_TEMPLATE} ${dict} # POST artifactUpload to resource - ${resp}= Run ASDC MD5 Post Request Unauthenticated ${ASDC_CATALOG_RESOURCES_PATH}/${vf_id}/artifacts ${data} ${ASDC_DESIGNER_USER_ID} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_RESOURCES_PATH}/${vf_id}/artifacts ${data} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp} -# Directly copied from testsuite/robot/resources/asdc_interface.robot +# Directly copied from testsuite/robot/resources/sdc_interface.robot Certify ASDC Catalog Resource [Documentation] Certifies an ASDC Catalog Resource by its id and returns the new id [Arguments] ${catalog_resource_id} ${user_id}=${ASDC_TESTER_USER_ID} ${map}= Create Dictionary user_remarks=Robot remarks Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_RESOURCES_PATH}/${catalog_resource_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify ${data} ${user_id} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_RESOURCES_PATH}/${catalog_resource_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify ${data} ${user_id} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()['uniqueId']} ${resp.json()['uuid']} @@ -100,11 +72,11 @@ Add Catalog Service For Monitoring Template ${map}= Create Dictionary service_name=${service_name} Templating.Create Environment sdc_catalog_service ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_catalog_service ${SDC_CATALOG_SERVICE_TEMPLATE} ${map} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_SERVICES_PATH} ${data} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_SERVICES_PATH} ${data} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 201 [Return] ${resp.json()['uniqueId']} ${resp.json()['uuid']} -# Based on testsuite/robot/resources/asdc_interface.robot's 'Add ASDC Resource Instance' keyword +# Based on testsuite/robot/resources/sdc_interface.robot's 'Add SDC Resource Instance' keyword 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 @@ -114,11 +86,11 @@ Add ASDC Resource Instance ${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} Templating.Create Environment sdc_resource_instance ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_resource_instance ${SDC_RESOURCE_INSTANCE_TEMPLATE} ${map} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_SERVICE_RESOURCE_INSTANCE_PATH} ${data} ${ASDC_DESIGNER_USER_ID} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_SERVICE_RESOURCE_INSTANCE_PATH} ${data} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 201 [Return] ${resp.json()['uniqueId']} ${resp.json()['name']} -# Adjusted from asdc_interface.robot +# All the following methods are adjusted from sdc_interface.robot Checkin ASDC Catalog Service [Documentation] Checks in an ASDC Catalog Service by its id @@ -126,7 +98,8 @@ Checkin ASDC Catalog Service ${map}= Create Dictionary user_remarks=Robot remarks Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/checkin ${data} ${ASDC_DESIGNER_USER_ID} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/checkin ${data} ${ASDC_DESIGNER_USER_ID} + Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()} @@ -136,14 +109,14 @@ Request Certify ASDC Catalog Service ${map}= Create Dictionary user_remarks=Robot remarks Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certificationRequest ${data} ${ASDC_DESIGNER_USER_ID} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certificationRequest ${data} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()} Start Certify ASDC Catalog Service [Documentation] Start certification of an ASDC Catalog Service by its id [Arguments] ${catalog_service_id} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/startCertification ${None} ${ASDC_TESTER_USER_ID} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/startCertification ${None} ${ASDC_TESTER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()} @@ -153,7 +126,7 @@ Certify ASDC Catalog Service ${map}= Create Dictionary user_remarks=Robot remarks Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify ${data} ${ASDC_TESTER_USER_ID} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify ${data} ${ASDC_TESTER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()['uniqueId']} @@ -163,7 +136,6 @@ Approve ASDC Catalog Service ${map}= Create Dictionary user_remarks=Robot remarks Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} - ${resp}= Run ASDC Post Request Unauthenticated ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_SERVICE_DISTRIBUTION_STATE_PATH}${ASDC_DISTRIBUTION_STATE_APPROVE_PATH} ${data} ${ASDC_GOVERNOR_USER_ID} + ${resp}= SDC.Run Post Request ${ASDC_BE_ENDPOINT} ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_SERVICE_DISTRIBUTION_STATE_PATH}${ASDC_DISTRIBUTION_STATE_APPROVE_PATH} ${data} ${ASDC_GOVERNOR_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()} - -- cgit 1.2.3-korg