updated tests on 412 for SOL003 (214eee4b) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -10,9 +10,6 @@ Library MockServerLibrary

	Library Process		Library Process

	* Variables *
	${original_etag} 1234

	* Keywords *		* Keywords *
	Create Sessions		Create Sessions
	Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance		Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
	@@ -209,8 +206,6 @@ GET Fault Management Individual Alarm
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
	Log Execute Query and validate response		Log Execute Query and validate response
	Get ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}		Get ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId}
	${etag} Output response headers ETag
	Set Suite Variable &{original_etag} ${etag}
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable ${response} ${outputResponse}		Set Global Variable ${response} ${outputResponse}

	@@ -234,11 +229,11 @@ PATCH Fault Management Individual Alarm
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable ${response} ${outputResponse}		Set Global Variable ${response} ${outputResponse}

	PATCH Fault Management Individual Alarm - precondition failed		PATCH Fault Management Individual Alarm - Etag mismatch
	log Trying to perform a PATCH. This method modifies an individual alarm resource		log Trying to perform a PATCH. This method modifies an individual alarm resource
	Set Headers {"Accept":"${ACCEPT}"}		Set Headers {"Accept":"${ACCEPT}"}
	Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}		Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
	Set Headers {"If-Match": "${original_etag[0]}"}		Set Headers {"If-Match": "${invalid_etag}"}
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
	${body}= Get File jsons/alarmModifications.json		${body}= Get File jsons/alarmModifications.json
	Patch ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId} ${body}		Patch ${apiRoot}/${apiName}/${apiMajorVersion}/alarms/${alarmId} ${body}

SOL003/VNFFaultManagement-API/IndividualAlarm.robot

+6 −9

SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -65,13 +65,13 @@ PATCH Individual VNFInstance
	PATCH Individual VNFInstance Precondition failed		PATCH Individual VNFInstance Precondition failed
	[Documentation] Test ID: 7.3.1.2.5		[Documentation] Test ID: 7.3.1.2.5
	... Test title: PATCH Individual VNFInstance Precondition failed		... Test title: PATCH Individual VNFInstance Precondition failed
	... Test objective: The objective is to create a new VNF instance resource		... Test objective: The objective is to test that modification of a VNF instance resource fails when a precondition given in an HTTP request header is not fulfilled due to an ETag mismatch
	... Pre-conditions: ETag mismatch		... Pre-conditions: an existing VNF instance resource
	... Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1		... Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
	... Config ID: Config_prod_VNFM		... Config ID: Config_prod_VNFM
	... Applicability: none		... Applicability: none
	... Post-Conditions: VNFInstance not modified		... Post-Conditions: none
	PATCH individual vnfInstance		PATCH individual vnfInstance - Etag mismatch
	Check HTTP Response Status Code Is 412		Check HTTP Response Status Code Is 412
	Check HTTP Response Body Json Schema Is ProblemDetails		Check HTTP Response Body Json Schema Is ProblemDetails

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -571,6 +571,20 @@ PATCH individual vnfInstance
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable ${response} ${outputResponse}		Set Global Variable ${response} ${outputResponse}

			PATCH individual vnfInstance - Etag mismatch
			log Trying to modify an individual VNF instance
			Set Headers {"Accept":"${ACCEPT}"}
			Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
			Set Headers {"If-Match": "${invalid_etag}"}
			Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
			Run Keyword If ${check_descriptors} == 1 PARSE the Descriptor File
			${template}= Get File jsons/patchBodyRequest.json
			${body}= Format String ${template} vnfdId=${Descriptor_ID} vnfdVersion= ${Descriptor_Version}
			Patch ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} ${body}
			${outputResponse}= Output response
			Set Global Variable ${response} ${outputResponse}


	DELETE individual vnfInstance		DELETE individual vnfInstance
	log Trying to delete an individual VNF instance		log Trying to delete an individual VNF instance
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

SOL003/VNFLifecycleManagement-API/environment/variables.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,8 @@ ${apiMajorVersion} v2
	${CancelMode} GRACEFUL		${CancelMode} GRACEFUL
	${VNFM_DUPLICATION} 0		${VNFM_DUPLICATION} 0

			${invalid_etag} invalid etag

	${NFVO_HOST} localhost # Hostname of the NFVO		${NFVO_HOST} localhost # Hostname of the NFVO
	${NFVO_PORT} 8081 # Listening port of the NFVO		${NFVO_PORT} 8081 # Listening port of the NFVO
	${NFVO_SCHEMA} https		${NFVO_SCHEMA} https

Admin message