fixed issue #154 on SOL002 v2.4.1 (e27df8a4) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL002/VNFFaultManagement-API/Subscriptions.robot

+46 −12

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

		* Test Cases *
		Create a new subscription
		@@ -174,35 +179,64 @@ DELETE subscriptions - Method not implemented
		Check HTTP Response Status Code Is 405

		* 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}

		Post Create subscription
		Log Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		${body}= Get File jsons/fmSubscriptionRequest.json
		${template}= Get File jsons/fmSubscriptionRequest.json
		${body}= Format String ${template} callback_uri=${callback_uri}:${callback_port} 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}
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}
		Clear Requests ${callback_endpoint}

		Post Create subscription - DUPLICATION
		Log Trying to create a subscription with an already created content
		Pass Execution If ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0 NVFO is not permitting duplication. Skipping the test
		Set Headers {"Accept": "${ACCEPT}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		${body}= Get File jsons/fmSubscriptionRequest.json
		${template}= Get File jsons/fmSubscriptionRequest.json
		${body}= Format String ${template} callback_uri=${callback_uri}:${callback_port} 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}
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}
		Clear Requests ${callback_endpoint}

		Post Create subscription - NO-DUPLICATION
		Log Trying to create a subscription with an already created content
		Pass Execution If ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1 VNFM permits duplication. Skipping the test
		Set Headers {"Accept": "${ACCEPT}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		${body}= Get File jsons/fmSubscriptionRequest.json
		${template}= Get File jsons/fmSubscriptionRequest.json
		${body}= Format String ${template} callback_uri=${callback_uri}:${callback_port} 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}
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}
		Clear Requests ${callback_endpoint}

		Get subscriptions
		Log Get the list of active subscriptions
		Set Headers {"Accept":"${ACCEPT}"}

SOL002/VNFFaultManagement-API/jsons/fmSubscriptionRequest.json

+1 −1

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

SOL002/VNFIndicator-API/Subscriptions.robot

+16 −9

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ Library OperatingSystem
		Library JSONLibrary
		Library Process
		Library MockServerLibrary
		Library String
		Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
		Suite Setup Create Sessions
		Suite Teardown Terminate All Processes kill=true
		@@ -151,13 +152,20 @@ Send Post Request for VNF Indicator Subscription
		Log Trying to create a new subscription
		Set Headers {"Accept": "${ACCEPT_JSON}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
		${body}= Get File jsons/subscriptions.json
		${template}= Get File jsons/subscriptions.json
		${body}= Format String ${template} callback_uri=${callback_uri}:${callback_port} callback_endpoint=${callback_endpoint}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
		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
		Set Suite Variable ${response} ${output}
		Run Keyword If ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
		... Check Notification Endpoint
		Set Global Variable ${response} ${output}
		Clear Requests ${callback_endpoint}
		#Run Keyword If ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1 #removed as the check of notif endpoint is done by NFVO while processing subscription reques
		#... Check Notification Endpoint

		Send Put Request for VNF Indicator Subscriptions
		Log Trying to create a new subscription
		@@ -224,7 +232,6 @@ Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filte


		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
		Wait For Process handle=mockInstance timeout=5s on_timeout=continue
		Create Mock Session ${callback_uri}:${callback_port}

SOL002/VNFIndicator-API/jsons/subscriptions.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"callbackUri": "http://127.0.0.1/subscribe"
		"callbackUri": "{callback_uri}{callback_endpoint}"
		}
		No newline at end of file

SOL002/VNFLifecycleManagement-API/Subscriptions.robot

+3 −0

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

		* Test Cases *
		POST Create a new subscription