added API version header in http requests - SOL002 v3.3.1 VNFConf, VNFInd (c901ab37) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL002/VNFConfiguration-API/ApiVersion.robot

+20 −10

Original line number	Diff line number	Diff line
		@@ -131,6 +131,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
		* Keywords *
		POST API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -138,6 +139,7 @@ POST API Version

		GET API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Get ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -145,6 +147,7 @@ GET API Version

		PUT API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Put ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -152,6 +155,7 @@ PUT API Version

		PATCH API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Patch ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -159,6 +163,7 @@ PATCH API Version

		DELETE API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Delete ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -166,6 +171,7 @@ DELETE API Version

		POST API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		@@ -173,6 +179,7 @@ POST API Version with apiMajorVersion

		GET API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Get ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		@@ -180,6 +187,7 @@ GET API Version with apiMajorVersion

		PUT API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Put ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		@@ -187,6 +195,7 @@ PUT API Version with apiMajorVersion

		PATCH API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Patch ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		@@ -194,6 +203,7 @@ PATCH API Version with apiMajorVersion

		DELETE API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Delete ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response

SOL002/VNFConfiguration-API/Configuration.robot

+12 −6

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ DELETE VNF Configuration - Method not implemented
		Get VNF configuration
		Log Query VNF The GET method queries information about a configuration.
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Log Execute Query and validate response
		@@ -116,6 +117,7 @@ Get VNF configuration
		Send VNF configuration
		log Trying to perform a PATCH. This method modifies the configuration
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		${body}= Get File jsons/vnfConfigModifications.json
		@@ -157,6 +159,7 @@ Send Duplicated VNF configuration
		Depends On Test Send VNF configuration # If the previous test scceeded, it means that Etag has been modified
		log Trying to perform a PATCH. This method modifies an individual alarm resource
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Set Headers {"If-Match": "${etag}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		@@ -168,6 +171,7 @@ Send Duplicated VNF configuration
		Send POST Request for VNF Configuration
		log Trying to perform a POST. This method should not be implemented
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
		${output}= Output response
		@@ -176,6 +180,7 @@ Send POST Request for VNF Configuration
		Send PUT Request for VNF Configuration
		log Trying to perform a POST. This method should not be implemented
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Put ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
		${output}= Output response
		@@ -184,6 +189,7 @@ Send PUT Request for VNF Configuration
		Send DELETE Request for VNF Configuration
		log Trying to perform a POST. This method should not be implemented
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Delete ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
		${output}= Output response

SOL002/VNFConfiguration-API/environment/variables.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ ${EM-VNF_PORT} 8081 # Listening port of the NFVO
		${EM-VNF_SCHEMA} https

		${ACCEPT} application/json
		${API_VERSION} 1.2.0
		${AUTH_USAGE} 1
		${AUTHORIZATION_HEADER} Authorization
		${AUTHORIZATION_TOKEN} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42

SOL002/VNFFaultManagement-API/ApiVersion.robot

+20 −10

Original line number	Diff line number	Diff line
		@@ -133,6 +133,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
		* Keywords *
		POST API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -140,6 +141,7 @@ POST API Version

		GET API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Get ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -147,6 +149,7 @@ GET API Version

		PUT API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Put ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -154,6 +157,7 @@ PUT API Version

		PATCH API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Patch ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -161,6 +165,7 @@ PATCH API Version

		DELETE API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Delete ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		@@ -168,6 +173,7 @@ DELETE API Version

		POST API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		@@ -175,6 +181,7 @@ POST API Version with apiMajorVersion

		GET API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Get ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		@@ -182,6 +189,7 @@ GET API Version with apiMajorVersion

		PUT API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Put ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		@@ -189,6 +197,7 @@ PUT API Version with apiMajorVersion

		PATCH API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Patch ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		@@ -196,6 +205,7 @@ PATCH API Version with apiMajorVersion

		DELETE API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Delete ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response

SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot

+2 −1

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ Check resource existence
		POST escalate severity
		Log escalate the perceived severity of an alarm with the VNFM
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Version": "${API_VERSION}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}/escalate ${PerceivedSeverity}

Admin message