fixed issue #149 on all SOL003ù subscriptions - v2.6.1 (546fb82e) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot

+44 −10

Original line number	Original line	Diff line number	Diff line
	@@ -5,13 +5,19 @@ Library JSONLibrary
	Library JSONSchemaLibrary schemas/		Library JSONSchemaLibrary schemas/
	Library OperatingSystem		Library OperatingSystem
	#Suite Teardown Terminate All Processes kill=true		#Suite Teardown Terminate All Processes kill=true

	Library Process		Library Process
			Library MockServerLibrary
			Library String

	* Variables *		* Variables *
	${original_etag} 1234		${original_etag} 1234

	* Keywords *		* Keywords *
			Create Sessions
			Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
			Wait For Process handle=mockInstance timeout=5s on_timeout=continue
			Create Mock Session ${callback_uri}:${callback_port}

	Check created Subscription existence		Check created Subscription existence
	Set Headers {"Accept":"${ACCEPT}"}		Set Headers {"Accept":"${ACCEPT}"}
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
	@@ -261,9 +267,19 @@ POST Subscription
	Set Headers {"Content-Type": "${CONTENT_TYPE}"}		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
	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/fmSubscriptionRequest.json		${body}= Get File jsons/fmSubscriptionRequest.json
			${body}= Replace String ${body} \${callback_uri} ${callback_uri}
			${body}= Replace String ${body} \${callback_port} ${callback_port}
			${body}= Replace String ${body} \${callback_endpoint} ${callback_endpoint}
			Log Creating mock request and response to handle GET operation on notification endpoint
			&{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
			&{notification_response}= Create Mock Response status_code=204
			Log Issue the subscription request
			Create Mock Expectation ${notification_request} ${notification_response}
	Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}		Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable ${response} ${outputResponse}		Set Global Variable ${response} ${outputResponse}
			Clear Requests ${callback_endpoint}


	Send POST Request for duplicated subscription		Send POST Request for duplicated subscription
	Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions		Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
	@@ -272,9 +288,18 @@ Send POST Request for duplicated subscription
	Set Headers {"Content-Type": "${CONTENT_TYPE}"}		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
	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/fmSubscriptionRequest.json		${body}= Get File jsons/fmSubscriptionRequest.json
			${body}= Replace String ${body} \${callback_uri} ${callback_uri}
			${body}= Replace String ${body} \${callback_port} ${callback_port}
			${body}= Replace String ${body} \${callback_endpoint} ${callback_endpoint}
			Log Creating mock request and response to handle GET operation on notification endpoint
			&{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
			&{notification_response}= Create Mock Response status_code=204
			Log Issue the subscription request
			Create Mock Expectation ${notification_request} ${notification_response}
	Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}		Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable ${response} ${outputResponse}		Set Global Variable ${response} ${outputResponse}
			Clear Requests ${callback_endpoint}

	Send POST Request for duplicated subscription not permitted		Send POST Request for duplicated subscription not permitted
	Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions		Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
	@@ -283,9 +308,18 @@ Send POST Request for duplicated subscription not permitted
	Set Headers {"Content-Type": "${CONTENT_TYPE}"}		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
	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/fmSubscriptionRequest.json		${body}= Get File jsons/fmSubscriptionRequest.json
			${body}= Replace String ${body} \${callback_uri} ${callback_uri}
			${body}= Replace String ${body} \${callback_port} ${callback_port}
			${body}= Replace String ${body} \${callback_endpoint} ${callback_endpoint}
			Log Creating mock request and response to handle GET operation on notification endpoint
			&{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
			&{notification_response}= Create Mock Response status_code=204
			Log Issue the subscription request
			Create Mock Expectation ${notification_request} ${notification_response}
	Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}		Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
	${outputResponse}= Output response		${outputResponse}= Output response
	Set Global Variable ${response} ${outputResponse}		Set Global Variable ${response} ${outputResponse}
			Clear Requests ${callback_endpoint}

	GET Subscriptions		GET Subscriptions
	Log Get the list of active subscriptions		Log Get the list of active subscriptions

SOL003/VNFFaultManagement-API/Subscriptions.robot

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,9 @@ Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ssl_verify=fal
	Library OperatingSystem		Library OperatingSystem
	Library JSONLibrary		Library JSONLibrary
	Library JSONSchemaLibrary schemas/		Library JSONSchemaLibrary schemas/
			Library Process
			Suite Setup Create Sessions
			Suite Teardown Terminate All Processes kill=true

	* Test Cases *		* Test Cases *
	Create a new Fault Management alarm subscription		Create a new Fault Management alarm subscription

SOL003/VNFFaultManagement-API/environment/variables.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,3 +53,9 @@ ${invalid_alarm_filter} badFilter
	${invalidAlarmId} invalidIdAlarm		${invalidAlarmId} invalidIdAlarm

	${fields} criteria,objectInstanceIds		${fields} criteria,objectInstanceIds

			${callback_endpoint} /notification
			${callback_port} 9091
			${callback_uri} http://localhost

			${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar

SOL003/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,5 +6,5 @@
	]		]
	}		}
	},		},
	"callbackUri": "http://127.0.0.1/subscribe"		"callbackUri": "${callback_uri}:${callback_port}${callback_endpoint}"
	}		}
			No newline at end of file

SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot

+29 −26

Original line number	Original line	Diff line number	Diff line
	@@ -105,19 +105,20 @@ Send Post Request for VNF Indicator Subscription
	Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}		Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
	${body}= Get File jsons/subscriptions.json		${body}= Get File jsons/subscriptions.json
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
	POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}		${body}= Replace String ${body} \${callback_uri} ${callback_uri}
			${body}= Replace String ${body} \${callback_port} ${callback_port}
			${body}= Replace String ${body} \${callback_endpoint} ${callback_endpoint}
			Log Creating mock request and response to handle GET operation on notification endpoint
			&{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
			&{notification_response}= Create Mock Response status_code=204
			Log Issue the subscription request
			Create Mock Expectation ${notification_request} ${notification_response}
			Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
	${output}= Output response		${output}= Output response
	Set Suite Variable ${response} ${output}		Set Global Variable ${response} ${output}
	Run Keyword If ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1		Clear Requests ${callback_endpoint}
	... Check Notification Endpoint		#Run Keyword If ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1 #removed as the check of notif endpoint is done by NFVO while processing subscription reques
	# Integer response status 201		#... Check Notification Endpoint
	# Log Received 201 Created as expected
	# ${headers}= Output response headers
	# Should Contain ${headers} Location
	# Log Response has header Location
	# ${result}= Output response body
	# Validate Json VnfIndicatorSubscription.schema.json ${result}
	# Log Validation of VnfIndicatorSubscription OK



	@@ -127,17 +128,20 @@ Send Post Request for Duplicated VNF indicator Subscription
	Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}		Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
	${body}= Get File jsons/subscriptions.json		${body}= Get File jsons/subscriptions.json
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
	POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}		${body}= Replace String ${body} \${callback_uri} ${callback_uri}
			${body}= Replace String ${body} \${callback_port} ${callback_port}
			${body}= Replace String ${body} \${callback_endpoint} ${callback_endpoint}
			Log Creating mock request and response to handle GET operation on notification endpoint
			&{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
			&{notification_response}= Create Mock Response status_code=204
			Log Issue the subscription request
			Create Mock Expectation ${notification_request} ${notification_response}
			Post ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
	${output}= Output response		${output}= Output response
	Set Suite Variable ${response} ${output}		Set Global Variable ${response} ${output}
	# Integer response status 201		Clear Requests ${callback_endpoint}
	# Log Received 201 Created as expected		#Run Keyword If ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1 #removed as the check of notif endpoint is done by NFVO while processing subscription reques
	# ${headers}= Output response headers		#... Check Notification Endpoint
	# Should Contain ${headers} Location
	# Log Response has header Location
	# ${result}= Output response body
	# Validate Json VnfIndicatorSubscription.schema.json ${result}
	# Log Validation of VnfIndicatorSubscription OK


	Send Put Request for VNF Indicator Subscriptions		Send Put Request for VNF Indicator Subscriptions
	@@ -555,7 +559,6 @@ Check Postcondition VNF indicator subscription is not created
	Check HTTP Response Status Code Is 404		Check HTTP Response Status Code Is 404

	Create Sessions		Create Sessions
	Pass Execution If ${VNFM_CHECKS_NOTIF_ENDPOINT} == 0 MockServer not necessary to run
	Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance		Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
	Wait For Process handle=mockInstance timeout=5s on_timeout=continue		Wait For Process handle=mockInstance timeout=5s on_timeout=continue
	Create Mock Session ${callback_uri}:${callback_port}		Create Mock Session ${callback_uri}:${callback_port}

Admin message