Merge branch 'master' into 'master' (bc497e8e) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL002/VNFFaultManagement-API/Alarms.robot

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -232,3 +232,16 @@ Check HTTP Response Status Code Is
	[Arguments] ${expected_status}		[Arguments] ${expected_status}
	Should Be Equal ${response.status_code} ${expected_status}		Should Be Equal ${response.status_code} ${expected_status}
	Log Status code validated		Log Status code validated

			Check HTTP Response Header Contains
			[Arguments] ${CONTENT_TYPE}
			Log ${response['headers']}
			Should Contain ${response['headers']} ${CONTENT_TYPE}
			Log Header is present

			Check HTTP Response Body Json Schema Is
			[Arguments] ${input}
			Should Contain ${response['headers']['Content-Type']} application/json
			${schema} = Catenate SEPARATOR= ${input} .schema.json
			Validate Json ${schema} ${response['body']}
			Log Json Schema Validation OK

SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot

+15 −2

Original line number	Original line	Diff line number	Diff line
	* Settings *		* Settings *
	Resource environment/variables.txt		Resource environment/variables.txt
	Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}		Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
			Library JSONSchemaLibrary
	Suite Setup Check resource existance		Suite Setup Check resource existance

	* Test Cases *		* Test Cases *
	@@ -104,3 +105,15 @@ DELETE escalate severity
	Delete ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate		Delete ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable @{response} ${outputResponse}		Set Global Variable @{response} ${outputResponse}

			Check HTTP Response Status Code Is
			[Arguments] ${expected_status}
			Should Be Equal ${response.status_code} ${expected_status}
			Log Status code validated

			Check HTTP Response Body Json Schema Is
			[Arguments] ${input}
			Should Contain ${response['headers']['Content-Type']} application/json
			${schema} = Catenate SEPARATOR= ${input} .schema.json
			Validate Json ${schema} ${response['body']}
			Log Json Schema Validation OK
			No newline at end of file

SOL002/VNFFaultManagement-API/IndividualAlarm.robot

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -118,6 +118,7 @@ PUT Alarm Task
	log Trying to perform a PUT. This method should not be implemented		log Trying to perform a PUT. This method should not be implemented
	Set Headers {"Accept":"${ACCEPT}"}		Set Headers {"Accept":"${ACCEPT}"}
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
			${body}= Get File jsons/alarmModifications.json
	Put ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId} ${body}		Put ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId} ${body}
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable @{response} ${outputResponse}		Set Global Variable @{response} ${outputResponse}
	@@ -173,3 +174,14 @@ GET Alarm Task with invalid filter
	Get ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId}		Get ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId}
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable @{response} ${outputResponse}		Set Global Variable @{response} ${outputResponse}
			Check HTTP Response Status Code Is
			[Arguments] ${expected_status}
			Should Be Equal ${response.status_code} ${expected_status}
			Log Status code validated

			Check HTTP Response Body Json Schema Is
			[Arguments] ${input}
			Should Contain ${response['headers']['Content-Type']} application/json
			${schema} = Catenate SEPARATOR= ${input} .schema.json
			Validate Json ${schema} ${response['body']}
			Log Json Schema Validation OK
			No newline at end of file

SOL002/VNFFaultManagement-API/IndividualSubscription.robot

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -128,3 +128,15 @@ DELETE individual subscription
	Delete ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}		Delete ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable @{response} ${outputResponse}		Set Global Variable @{response} ${outputResponse}

			Check HTTP Response Status Code Is
			[Arguments] ${expected_status}
			Should Be Equal ${response.status_code} ${expected_status}
			Log Status code validated

			Check HTTP Response Body Json Schema Is
			[Arguments] ${input}
			Should Contain ${response['headers']['Content-Type']} application/json
			${schema} = Catenate SEPARATOR= ${input} .schema.json
			Validate Json ${schema} ${response['body']}
			Log Json Schema Validation OK
			No newline at end of file

SOL002/VNFFaultManagement-API/Subscriptions.robot

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -275,3 +275,15 @@ DELETE subscriptions
	Delete ${apiRoot}/${apiName}/${apiVersion}/subscriptions		Delete ${apiRoot}/${apiName}/${apiVersion}/subscriptions
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable @{response} ${outputResponse}		Set Global Variable @{response} ${outputResponse}

			Check HTTP Response Status Code Is
			[Arguments] ${expected_status}
			Should Be Equal ${response.status_code} ${expected_status}
			Log Status code validated

			Check HTTP Response Body Json Schema Is
			[Arguments] ${input}
			Should Contain ${response['headers']['Content-Type']} application/json
			${schema} = Catenate SEPARATOR= ${input} .schema.json
			Validate Json ${schema} ${response['body']}
			Log Json Schema Validation OK
			No newline at end of file

Admin message