Code Refactor of delete entities (123dcb2e) · Commits · OCF / capif

tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot

+1 −43

Original line number	Original line	Diff line number	Diff line
	@@ -23,13 +23,6 @@ Retrieve ACL
	# Register APF		# Register APF
	${register_user_info_provider}= Provider Default Registration		${register_user_info_provider}= Provider Default Registration

	Call Method
	... ${CAPIF_USERS}
	... update_capif_users_dicts
	... ${register_user_info_provider['resource_url'].path}
	... ${AMF_PROVIDER_USERNAME}


	${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api		${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
	... ${register_user_info_provider}		... ${register_user_info_provider}
	... service_1		... service_1
	@@ -50,9 +43,6 @@ Retrieve ACL
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	# Test		# Test
	${discover_response}= Get Request Capif		${discover_response}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
	@@ -97,12 +87,6 @@ Retrieve ACL with 2 Service APIs published
	# Register APF		# Register APF
	${register_user_info_provider}= Provider Default Registration		${register_user_info_provider}= Provider Default Registration

	Call Method
	... ${CAPIF_USERS}
	... update_capif_users_dicts
	... ${register_user_info_provider['resource_url'].path}
	... ${AMF_PROVIDER_USERNAME}

	${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api		${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
	... ${register_user_info_provider}		... ${register_user_info_provider}
	... service_1		... service_1
	@@ -117,8 +101,6 @@ Retrieve ACL with 2 Service APIs published
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}

	# Test		# Test
	${discover_response}= Get Request Capif		${discover_response}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
	@@ -177,12 +159,6 @@ Retrieve ACL with security context created by two different Invokers
	# Register APF		# Register APF
	${register_user_info_provider}= Provider Default Registration		${register_user_info_provider}= Provider Default Registration

	Call Method
	... ${CAPIF_USERS}
	... update_capif_users_dicts
	... ${register_user_info_provider['resource_url'].path}
	... ${AMF_PROVIDER_USERNAME}

	${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api		${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
	... ${register_user_info_provider}		... ${register_user_info_provider}
	... service_1		... service_1
	@@ -203,16 +179,12 @@ Retrieve ACL with security context created by two different Invokers
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}

	${INVOKER_USERNAME_2}= Set Variable ${INVOKER_USERNAME}_2		${INVOKER_USERNAME_2}= Set Variable ${INVOKER_USERNAME}_2

	# Register another invoker		# Register another invoker
	${register_user_info_invoker_2} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker_2} ${url} ${request_body}= Invoker Default Onboarding
	... ${INVOKER_USERNAME_2}		... ${INVOKER_USERNAME_2}

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME_2}

	# Get Published APIs		# Get Published APIs
	${discover_response}= Get Request Capif		${discover_response}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
	@@ -291,13 +263,6 @@ Retrieve ACL filtered by api-invoker-id
	# Register APF		# Register APF
	${register_user_info_provider}= Provider Default Registration		${register_user_info_provider}= Provider Default Registration

	Call Method
	... ${CAPIF_USERS}
	... update_capif_users_dicts
	... ${register_user_info_provider['resource_url'].path}
	... ${AMF_PROVIDER_USERNAME}


	${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api		${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
	... ${register_user_info_provider}		... ${register_user_info_provider}
	... service_1		... service_1
	@@ -318,18 +283,12 @@ Retrieve ACL filtered by api-invoker-id
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${INVOKER_USERNAME_2}= Set Variable ${INVOKER_USERNAME}_2		${INVOKER_USERNAME_2}= Set Variable ${INVOKER_USERNAME}_2

	# Register another invoker		# Register another invoker
	${register_user_info_invoker_2} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker_2} ${url} ${request_body}= Invoker Default Onboarding
	... ${INVOKER_USERNAME_2}		... ${INVOKER_USERNAME_2}

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME_2}


	# Get Published APIs		# Get Published APIs
	${discover_response}= Get Request Capif		${discover_response}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
	@@ -619,4 +578,3 @@ No ACL for invoker after be removed
	... title=Not Found		... title=Not Found
	... detail=No ACLs found for the requested service: ${service_api_description_published['apiId']}, aef_id: ${register_user_info_provider['aef_id']}, invoker: None and supportedFeatures: None		... detail=No ACLs found for the requested service: ${service_api_description_published['apiId']}, aef_id: ${register_user_info_provider['aef_id']}, invoker: None and supportedFeatures: None
	... cause=Wrong id		... cause=Wrong id

tests/features/CAPIF Api Auditing Service/capif_auditing_api.robot

+54 −79

Original line number	Original line	Diff line number	Diff line
	@@ -5,8 +5,9 @@ Library Collections
	Resource /opt/robot-tests/tests/resources/common/basicRequests.robot		Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
	Resource ../../resources/common.resource		Resource ../../resources/common.resource

	Test Setup Reset Testing Environment
	Suite Teardown Reset Testing Environment		Suite Teardown Reset Testing Environment
			Test Setup Reset Testing Environment


	* Variables *		* Variables *
	${AEF_ID_NOT_VALID} aef-example		${AEF_ID_NOT_VALID} aef-example
	@@ -16,24 +17,19 @@ ${NOTIFICATION_DESTINATION} http://robot.testing:1080
	${API_VERSION_VALID} v1		${API_VERSION_VALID} v1
	${API_VERSION_NOT_VALID} v58		${API_VERSION_NOT_VALID} v58


	* Test Cases *		* Test Cases *
	Get Log Entry		Get Log Entry
	[Tags] capif_api_auditing_service-1		[Tags] capif_api_auditing_service-1
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	# Publish one api		# Publish one api
	Publish Service Api ${register_user_info}		Publish Service Api ${register_user_info}

	# Register INVOKER		# Register INVOKER
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${discover_response}= Get Request Capif		${discover_response}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -43,7 +39,11 @@ Get Log Entry
	${api_ids} ${api_names}= Get Api Ids And Names From Discover Response ${discover_response}		${api_ids} ${api_names}= Get Api Ids And Names From Discover Response ${discover_response}

	# Create Log Entry		# Create Log Entry
	${request_body}= Create Log Entry ${register_user_info['aef_id']} ${register_user_info_invoker['api_invoker_id']} ${api_ids} ${api_names}		${request_body}= Create Log Entry
			... ${register_user_info['aef_id']}
			... ${register_user_info_invoker['api_invoker_id']}
			... ${api_ids}
			... ${api_names}
	${resp_1}= Post Request Capif		${resp_1}= Post Request Capif
	... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs		... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
	... json=${request_body}		... json=${request_body}
	@@ -51,7 +51,6 @@ Get Log Entry
	... verify=ca.crt		... verify=ca.crt
	... username=${AEF_PROVIDER_USERNAME}		... username=${AEF_PROVIDER_USERNAME}


	${resp_2}= Get Request Capif		${resp_2}= Get Request Capif
	... /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}		... /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -67,19 +66,11 @@ Get a log entry without entry created
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	# Publish one api		# Publish one api
	Publish Service Api ${register_user_info}		Publish Service Api ${register_user_info}

	# Register INVOKER		# Register INVOKER
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}



	${resp_1}= Get Request Capif		${resp_1}= Get Request Capif
	... /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}		... /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -93,24 +84,17 @@ Get a log entry without entry created
	... detail=aefId or/and apiInvokerId do not match any InvocationLogs		... detail=aefId or/and apiInvokerId do not match any InvocationLogs
	... cause=No log invocations found		... cause=No log invocations found


	Get a log entry withut aefid and apiInvokerId		Get a log entry withut aefid and apiInvokerId
	[Tags] capif_api_auditing_service-3		[Tags] capif_api_auditing_service-3
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	# Publish one api		# Publish one api
	Publish Service Api ${register_user_info}		Publish Service Api ${register_user_info}

	# Register INVOKER		# Register INVOKER
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${discover_response}= Get Request Capif		${discover_response}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -120,7 +104,11 @@ Get a log entry withut aefid and apiInvokerId
	${api_ids} ${api_names}= Get Api Ids And Names From Discover Response ${discover_response}		${api_ids} ${api_names}= Get Api Ids And Names From Discover Response ${discover_response}

	# Create Log Entry		# Create Log Entry
	${request_body}= Create Log Entry ${register_user_info['aef_id']} ${register_user_info_invoker['api_invoker_id']} ${api_ids} ${api_names}		${request_body}= Create Log Entry
			... ${register_user_info['aef_id']}
			... ${register_user_info_invoker['api_invoker_id']}
			... ${api_ids}
			... ${api_names}
	${resp_1}= Post Request Capif		${resp_1}= Post Request Capif
	... /api-invocation-logs/v1/${AEF_ID_NOT_VALID}/logs		... /api-invocation-logs/v1/${AEF_ID_NOT_VALID}/logs
	... json=${request_body}		... json=${request_body}
	@@ -128,7 +116,6 @@ Get a log entry withut aefid and apiInvokerId
	... verify=ca.crt		... verify=ca.crt
	... username=${AEF_PROVIDER_USERNAME}		... username=${AEF_PROVIDER_USERNAME}


	${resp_2}= Get Request Capif		${resp_2}= Get Request Capif
	... /logs/v1/apiInvocationLogs		... /logs/v1/apiInvocationLogs
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -142,24 +129,17 @@ Get a log entry withut aefid and apiInvokerId
	... detail=aef_id and api_invoker_id parameters are mandatory		... detail=aef_id and api_invoker_id parameters are mandatory
	... cause=Mandatory parameters missing		... cause=Mandatory parameters missing


	Get Log Entry with apiVersion filter		Get Log Entry with apiVersion filter
	[Tags] capif_api_auditing_service-4		[Tags] capif_api_auditing_service-4
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	# Publish one api		# Publish one api
	Publish Service Api ${register_user_info}		Publish Service Api ${register_user_info}

	# Register INVOKER		# Register INVOKER
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${discover_response}= Get Request Capif		${discover_response}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -169,7 +149,11 @@ Get Log Entry with apiVersion filter
	${api_ids} ${api_names}= Get Api Ids And Names From Discover Response ${discover_response}		${api_ids} ${api_names}= Get Api Ids And Names From Discover Response ${discover_response}

	# Create Log Entry		# Create Log Entry
	${request_body}= Create Log Entry ${register_user_info['aef_id']} ${register_user_info_invoker['api_invoker_id']} ${api_ids} ${api_names}		${request_body}= Create Log Entry
			... ${register_user_info['aef_id']}
			... ${register_user_info_invoker['api_invoker_id']}
			... ${api_ids}
			... ${api_names}
	${resp_1}= Post Request Capif		${resp_1}= Post Request Capif
	... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs		... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
	... json=${request_body}		... json=${request_body}
	@@ -177,7 +161,6 @@ Get Log Entry with apiVersion filter
	... verify=ca.crt		... verify=ca.crt
	... username=${AEF_PROVIDER_USERNAME}		... username=${AEF_PROVIDER_USERNAME}


	${resp_2}= Get Request Capif		${resp_2}= Get Request Capif
	... /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}&api-version=${API_VERSION_VALID}		... /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}&api-version=${API_VERSION_VALID}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -193,19 +176,12 @@ Get Log Entry with no exist apiVersion filter
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	# Publish one api		# Publish one api
	Publish Service Api ${register_user_info}		Publish Service Api ${register_user_info}

	# Register INVOKER		# Register INVOKER
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}



	${discover_response}= Get Request Capif		${discover_response}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -215,7 +191,11 @@ Get Log Entry with no exist apiVersion filter
	${api_ids} ${api_names}= Get Api Ids And Names From Discover Response ${discover_response}		${api_ids} ${api_names}= Get Api Ids And Names From Discover Response ${discover_response}

	# Create Log Entry		# Create Log Entry
	${request_body}= Create Log Entry ${register_user_info['aef_id']} ${register_user_info_invoker['api_invoker_id']} ${api_ids} ${api_names}		${request_body}= Create Log Entry
			... ${register_user_info['aef_id']}
			... ${register_user_info_invoker['api_invoker_id']}
			... ${api_ids}
			... ${api_names}
	${resp_1}= Post Request Capif		${resp_1}= Post Request Capif
	... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs		... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
	... json=${request_body}		... json=${request_body}
	@@ -223,7 +203,6 @@ Get Log Entry with no exist apiVersion filter
	... verify=ca.crt		... verify=ca.crt
	... username=${AEF_PROVIDER_USERNAME}		... username=${AEF_PROVIDER_USERNAME}


	${resp_2}= Get Request Capif		${resp_2}= Get Request Capif
	... /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}&api-version=${API_VERSION_NOT_VALID}		... /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}&api-version=${API_VERSION_NOT_VALID}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -237,7 +216,3 @@ Get Log Entry with no exist apiVersion filter
	... status=404		... status=404
	... detail=Parameters do not match any log entry		... detail=Parameters do not match any log entry
	... cause=No logs found		... cause=No logs found

tests/features/CAPIF Api Discover Service/capif_api_service_discover.robot

+25 −59

Original line number	Original line	Diff line number	Diff line
	@@ -4,8 +4,8 @@ Resource /opt/robot-tests/tests/resources/api_invoker_management_requests
	Resource ../../resources/common.resource		Resource ../../resources/common.resource
	Library /opt/robot-tests/tests/libraries/bodyRequests.py		Library /opt/robot-tests/tests/libraries/bodyRequests.py

	Test Setup Reset Testing Environment
	Suite Teardown Reset Testing Environment		Suite Teardown Reset Testing Environment
			Test Setup Reset Testing Environment
	# Test Setup Initialize Test And Register role=invoker		# Test Setup Initialize Test And Register role=invoker


	@@ -19,9 +19,6 @@ Discover Published service APIs by Authorised API Invoker
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	# Publish one api		# Publish one api
	${service_api_description_published} ${resource_url} ${request_body}= Publish Service Api		${service_api_description_published} ${resource_url} ${request_body}= Publish Service Api
	... ${register_user_info}		... ${register_user_info}
	@@ -29,9 +26,6 @@ Discover Published service APIs by Authorised API Invoker
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	# Test		# Test
	${resp}= Get Request Capif		${resp}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
	@@ -47,24 +41,17 @@ Discover Published service APIs by Authorised API Invoker
	Length Should Be ${resp.json()['serviceAPIDescriptions']} 1		Length Should Be ${resp.json()['serviceAPIDescriptions']} 1
	List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published}		List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published}


	Discover Published service APIs by Non Authorised API Invoker		Discover Published service APIs by Non Authorised API Invoker
	[Tags] capif_api_discover_service-2		[Tags] capif_api_discover_service-2
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	# Publish one api		# Publish one api
	Publish Service Api ${register_user_info}		Publish Service Api ${register_user_info}

	# Register INVOKER		# Register INVOKER
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${resp}= Get Request Capif		${resp}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -83,18 +70,12 @@ Discover Published service APIs by not registered API Invoker
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	# Publish one api		# Publish one api
	Publish Service Api ${register_user_info}		Publish Service Api ${register_user_info}

	# Register INVOKER		# Register INVOKER
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${resp}= Get Request Capif		${resp}= Get Request Capif
	... ${DISCOVER_URL}${API_INVOKER_NOT_REGISTERED}		... ${DISCOVER_URL}${API_INVOKER_NOT_REGISTERED}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -113,9 +94,6 @@ Discover Published service APIs by registered API Invoker with 1 result filtered
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	${api_name_1}= Set Variable service_1		${api_name_1}= Set Variable service_1
	${api_name_2}= Set Variable service_2		${api_name_2}= Set Variable service_2

	@@ -130,9 +108,6 @@ Discover Published service APIs by registered API Invoker with 1 result filtered
	# Register INVOKER		# Register INVOKER
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	# Request all APIs for Invoker		# Request all APIs for Invoker
	${resp}= Get Request Capif		${resp}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
	@@ -167,9 +142,6 @@ Discover Published service APIs by registered API Invoker filtered with no match
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	${api_name_1}= Set Variable apiName1		${api_name_1}= Set Variable apiName1
	${api_name_2}= Set Variable apiName2		${api_name_2}= Set Variable apiName2

	@@ -184,9 +156,6 @@ Discover Published service APIs by registered API Invoker filtered with no match
	# Change to invoker role and register at api invoker management		# Change to invoker role and register at api invoker management
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	# Request all APIs for Invoker		# Request all APIs for Invoker
	${resp}= Get Request Capif		${resp}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
	@@ -210,7 +179,10 @@ Discover Published service APIs by registered API Invoker filtered with no match
	... username=${INVOKER_USERNAME}		... username=${INVOKER_USERNAME}

	# Check Results		# Check Results
	Check Response Variable Type And Values ${resp} 404 ProblemDetails		Check Response Variable Type And Values
			... ${resp}
			... 404
			... ProblemDetails
	... title=Not Found		... title=Not Found
	... status=404		... status=404
	... detail=API Invoker ${register_user_info_invoker['api_invoker_id']} has no API Published that accomplish filter conditions		... detail=API Invoker ${register_user_info_invoker['api_invoker_id']} has no API Published that accomplish filter conditions
	@@ -221,9 +193,6 @@ Discover Published service APIs by registered API Invoker not filtered
	# Register APF		# Register APF
	${register_user_info}= Provider Default Registration		${register_user_info}= Provider Default Registration

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}


	${api_name_1}= Set Variable apiName1		${api_name_1}= Set Variable apiName1
	${api_name_2}= Set Variable apiName2		${api_name_2}= Set Variable apiName2

	@@ -238,9 +207,6 @@ Discover Published service APIs by registered API Invoker not filtered
	# Change to invoker role and register at api invoker management		# Change to invoker role and register at api invoker management
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	# Request all APIs for Invoker		# Request all APIs for Invoker
	${resp}= Get Request Capif		${resp}= Get Request Capif
	... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}

tests/features/CAPIF Api Events/capif_events_api.robot

+10 −27

Original line number	Original line	Diff line number	Diff line
	@@ -5,8 +5,8 @@ Library XML
	Resource /opt/robot-tests/tests/resources/common/basicRequests.robot		Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
	Resource ../../resources/common.resource		Resource ../../resources/common.resource

	Test Setup Reset Testing Environment
	Suite Teardown Reset Testing Environment		Suite Teardown Reset Testing Environment
			Test Setup Reset Testing Environment


	* Variables *		* Variables *
	@@ -21,9 +21,6 @@ Creates a new individual CAPIF Event Subscription
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${request_body}= Create Events Subscription		${request_body}= Create Events Subscription
	${resp}= Post Request Capif		${resp}= Post Request Capif
	... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions		... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
	@@ -41,9 +38,6 @@ Creates a new individual CAPIF Event Subscription with Invalid SubscriberId
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${request_body}= Create Events Subscription		${request_body}= Create Events Subscription
	${resp}= Post Request Capif		${resp}= Post Request Capif
	... /capif-events/v1/${SUBSCRIBER_ID_NOT_VALID}/subscriptions		... /capif-events/v1/${SUBSCRIBER_ID_NOT_VALID}/subscriptions
	@@ -64,9 +58,6 @@ Deletes an individual CAPIF Event Subscription
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${request_body}= Create Events Subscription		${request_body}= Create Events Subscription
	${resp}= Post Request Capif		${resp}= Post Request Capif
	... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions		... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
	@@ -92,9 +83,6 @@ Deletes an individual CAPIF Event Subscription with invalid SubscriberId
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${request_body}= Create Events Subscription		${request_body}= Create Events Subscription
	${resp}= Post Request Capif		${resp}= Post Request Capif
	... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions		... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
	@@ -120,16 +108,12 @@ Deletes an individual CAPIF Event Subscription with invalid SubscriberId
	... detail=Invoker or APF or AEF or AMF Not found		... detail=Invoker or APF or AEF or AMF Not found
	... cause=Subscriber Not Found		... cause=Subscriber Not Found


	Deletes an individual CAPIF Event Subscription with invalid SubscriptionId		Deletes an individual CAPIF Event Subscription with invalid SubscriptionId
	[Tags] capif_api_events-5		[Tags] capif_api_events-5

	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}


	${request_body}= Create Events Subscription		${request_body}= Create Events Subscription
	${resp}= Post Request Capif		${resp}= Post Request Capif
	... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions		... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
	@@ -153,4 +137,3 @@ Deletes an individual CAPIF Event Subscription with invalid SubscriptionId
	... title=Unauthorized		... title=Unauthorized
	... detail=User not authorized		... detail=User not authorized
	... cause=You are not the owner of this resource		... cause=You are not the owner of this resource

tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot

+14 −24

Original line number	Original line	Diff line number	Diff line
	@@ -6,8 +6,8 @@ Library /opt/robot-tests/tests/libraries/bodyRequests.py
	Library Process		Library Process
	Library Collections		Library Collections

	Test Setup Reset Testing Environment
	Suite Teardown Reset Testing Environment		Suite Teardown Reset Testing Environment
			Test Setup Reset Testing Environment


	* Variables *		* Variables *
	@@ -47,8 +47,6 @@ Register NetApp Already Onboarded
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}

	${resp}= Post Request Capif		${resp}= Post Request Capif
	... ${register_user_info['ccf_onboarding_url']}		... ${register_user_info['ccf_onboarding_url']}
	... json=${request_body}		... json=${request_body}
	@@ -70,8 +68,6 @@ Update Onboarded NetApp
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}

	Set To Dictionary		Set To Dictionary
	... ${request_body}		... ${request_body}
	... notificationDestination=${new_notification_destination}		... notificationDestination=${new_notification_destination}
	@@ -92,8 +88,6 @@ Update Not Onboarded NetApp
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}

	${resp}= Put Request Capif		${resp}= Put Request Capif
	... /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}		... /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}
	... ${request_body}		... ${request_body}
	@@ -119,6 +113,8 @@ Offboard NetApp
	... verify=ca.crt		... verify=ca.crt
	... username=${INVOKER_USERNAME}		... username=${INVOKER_USERNAME}

			Call Method ${CAPIF_USERS} remove_capif_users_entry ${url.path}

	# Check Results		# Check Results
	Should Be Equal As Strings ${resp.status_code} 204		Should Be Equal As Strings ${resp.status_code} 204

	@@ -127,8 +123,6 @@ Offboard Not Previously Onboarded NetApp
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}

	${resp}= Delete Request Capif		${resp}= Delete Request Capif
	... /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}		... /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}
	... server=${CAPIF_HTTPS_URL}		... server=${CAPIF_HTTPS_URL}
	@@ -149,8 +143,6 @@ Update Onboarded NetApp Certificate
	# Default Invoker Registration and Onboarding		# Default Invoker Registration and Onboarding
	${register_user_info} ${url} ${request_body}= Invoker Default Onboarding		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

	Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}

	${INVOKER_USERNAME_NEW}= Set Variable ${INVOKER_USERNAME}_NEW		${INVOKER_USERNAME_NEW}= Set Variable ${INVOKER_USERNAME}_NEW

	${csr_request_new}= Create User Csr ${INVOKER_USERNAME_NEW} invoker		${csr_request_new}= Create User Csr ${INVOKER_USERNAME_NEW} invoker
	@@ -189,5 +181,3 @@ Update Onboarded NetApp Certificate
	# Check Results		# Check Results
	Check Response Variable Type And Values ${resp} 200 APIInvokerEnrolmentDetails		Check Response Variable Type And Values ${resp} 200 APIInvokerEnrolmentDetails
	... notificationDestination=${new_notification_destination}		... notificationDestination=${new_notification_destination}