confilct resolved (ec9dff2a) · Commits · Miguel Angel Reina Ortega / api-tests

SOL002/VNFPerformanceManagement-API/IndividualReport.robot

+6 −6

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ DELETE Individual Performance Report - Method not implemented
		Get Individual Performance Report
		Log Trying to get a performance report present in the VNFM
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -95,21 +95,21 @@ Get Individual Performance Report
		Get Individual Performance Report with invalid resource endpoint
		Log Trying to get a performance report with invalid resource endpoint
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send Post request for Individual Performance Report
		Log Trying to create new performance report
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		POST ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send Put request for Individual Performance Report
		Log Trying to update performance report
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
		${origOutput}= Output response
		Set Suite Variable ${origResponse} ${origOutput}
		@@ -119,7 +119,7 @@ Send Put request for Individual Performance Report

		Send Patch request for Individual Performance Report
		Log Trying to update performance report
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
		${origOutput}= Output response
		Set Suite Variable ${origResponse} ${origOutput}
		@@ -129,7 +129,7 @@ Send Patch request for Individual Performance Report

		Send Delete request for Individual Performance Report
		Log Trying to delete performance report
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		DELETE ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
		${output}= Output response
		Set Suite Variable ${response} ${output}

SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot

+7 −7

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ PATCH Individual Threshold - Method not implemented
		GET Individual VNF Performance Threshold
		Log Trying to get a Threhsold present in the VNFM
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -109,28 +109,28 @@ GET Individual VNF Performance Threshold
		GET individual VNF Performance Threshold with invalid resource identifier
		Log Trying to get a Threhsold with invalid resource endpoint
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send Delete request for individual VNF Performance Threshold
		Log Trying to delete a Threhsold in the VNFM
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send Delete request for individual VNF Performance Threshold with invalid resource identifier
		Log Trying to delete a Threhsold in the VNFM with invalid id
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send Post request for individual VNF Performance Threshold
		Log Trying to create new threshold
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		POST ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -138,7 +138,7 @@ Send Post request for individual VNF Performance Threshold
		Send Put request for individual VNF Performance Threshold
		Log Trying to PUT threshold
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
		${origOutput}= Output response
		Set Suite Variable ${origResponse} ${origOutput}
		@@ -149,7 +149,7 @@ Send Put request for individual VNF Performance Threshold
		Send Patch request for individual VNF Performance Threshold
		Log Trying to PUT threshold
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
		${origOutput}= Output response
		Set Suite Variable ${origResponse} ${origOutput}

SOL002/VNFPerformanceManagement-API/Thresholds.robot

+8 −8

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ GET Performance Thresholds for Bad Request Response too big
		GET all Performance Thresholds
		Log Trying to get all thresholds present in the VNFM
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/thresholds
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -150,7 +150,7 @@ GET all Performance Thresholds
		GET Performance Thresholds with attribute-based filter
		Log Trying to get thresholds present in the VNFM with filter
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_OK}
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -158,7 +158,7 @@ GET Performance Thresholds with attribute-based filter
		GET Performance Thresholds with invalid attribute-based filter
		Log Trying to get thresholds present in the VNFM with invalid filter
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -166,14 +166,14 @@ GET Performance Thresholds with invalid attribute-based filter
		GET VNF Performance Thresholds with invalid resource endpoint
		Log Trying to get thresholds present in the VNFM with invalid resource endpoint
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/threshold
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send Post Request Create new Performance Threshold
		Log Creating a new THreshold
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
		${request}= Get File jsons/CreateThresholdRequest.json
		@@ -183,7 +183,7 @@ Send Post Request Create new Performance Threshold

		Send PUT Request for all Performance Thresholds
		Log PUT THresholds
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
		PUT ${apiRoot}/${apiName}/${apiVersion}/thresholds
		@@ -192,7 +192,7 @@ Send PUT Request for all Performance Thresholds

		Send PATCH Request for all Performance Thresholds
		Log PUT THresholds
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
		PATCH ${apiRoot}/${apiName}/${apiVersion}/thresholds
		@@ -201,7 +201,7 @@ Send PATCH Request for all Performance Thresholds

		Send DELETE Request for all Performance Thresholds
		Log DELETE THresholds
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds
		${output}= Output response
		Set Suite Variable ${response} ${output}

SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot

+5 −5

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ Get all VNF Performance Subscriptions
		... request and response data structures, and response codes.
		Set headers {"Accept": "application/json"}
		Set headers {"Content-Type": "application/json"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -38,7 +38,7 @@ Get all VNF Performance Subscriptions
		... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
		... request and response data structures, and response codes.
		Set headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -58,7 +58,7 @@ Get VNF Performance Subscriptions with invalid attribute-based filters
		... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
		... request and response data structures, and response codes.
		Set headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -77,7 +77,7 @@ Get VNF Performance Subscriptions with invalid resource endpoint
		... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
		... request and response data structures, and response codes.
		Set headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/subscription
		${output}= Output response
		Set Suite Variable ${response} ${output}
		@@ -103,7 +103,7 @@ Send Post Request for VNF Performance Subscription
		... the existing subscription resource with the same filter and callbackUri).
		Set headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
		Set headers {"Accept": "${ACCEPT_JSON}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		${body_request}= Get File jsons/subscriptions.json
		POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body_request}
		${output}= Output response

SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

+4 −5

Original line number	Diff line number	Diff line
		@@ -522,8 +522,7 @@ Send DELETE Request for VNFD in individual VNF Package

		Check Postcondition VNFD Exist
		Log Checking that vnf pacakge still exists
		Set Headers {"Accept": "${ACCEPT_PLAIN}"}
		Set Headers {"Accept": "${ACCEPT_ZIP}"}
		Set Headers {"Accept": "${ACCEPT_PLAIN}, ${ACCEPT_ZIP}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
		Check HTTP Response Status Code Is 200
		@@ -713,13 +712,13 @@ Send Delete request for individual VNF Package Subscription with invalid resourc
		Set Suite Variable ${response} ${output}

		Send Post request for individual VNF Package Subscription
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send Put request for individual VNF Package Subscription
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
		${origOutput}= Output response
		Set Suite Variable ${origResponse} ${origOutput}
		@@ -728,7 +727,7 @@ Send Put request for individual VNF Package Subscription
		Set Suite Variable ${response} ${output}

		Send Patch request for individual VNF Package Subscription
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
		GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
		${origOutput}= Output response
		Set Suite Variable ${origResponse} ${origOutput}

Admin message