Upgrade Robot to new Register flow (a5173bdd) · Commits · OCF / capif

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

+5 −10

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ Retrieve ACL
		... update_capif_users_dicts
		... ${register_user_info_provider['resource_url'].path}
		... ${AMF_PROVIDER_USERNAME}
		Call Method ${CAPIF_USERS} update_register_users ${PROVIDER_USERNAME}


		${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
		... ${register_user_info_provider}
		@@ -51,7 +51,7 @@ Retrieve ACL
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		# Test
		${discover_response}= Get Request Capif
		@@ -102,7 +102,6 @@ Retrieve ACL with 2 Service APIs published
		... update_capif_users_dicts
		... ${register_user_info_provider['resource_url'].path}
		... ${AMF_PROVIDER_USERNAME}
		Call Method ${CAPIF_USERS} update_register_users ${PROVIDER_USERNAME}

		${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
		... ${register_user_info_provider}
		@@ -119,7 +118,6 @@ Retrieve ACL with 2 Service APIs published
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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

		# Test
		${discover_response}= Get Request Capif
		@@ -184,7 +182,6 @@ Retrieve ACL with security context created by two different Invokers
		... update_capif_users_dicts
		... ${register_user_info_provider['resource_url'].path}
		... ${AMF_PROVIDER_USERNAME}
		Call Method ${CAPIF_USERS} update_register_users ${PROVIDER_USERNAME}

		${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
		... ${register_user_info_provider}
		@@ -207,7 +204,6 @@ Retrieve ACL with security context created by two different Invokers
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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

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

		@@ -216,7 +212,6 @@ Retrieve ACL with security context created by two different Invokers
		... ${INVOKER_USERNAME_2}

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

		# Get Published APIs
		${discover_response}= Get Request Capif
		@@ -301,7 +296,7 @@ Retrieve ACL filtered by api-invoker-id
		... update_capif_users_dicts
		... ${register_user_info_provider['resource_url'].path}
		... ${AMF_PROVIDER_USERNAME}
		Call Method ${CAPIF_USERS} update_register_users ${PROVIDER_USERNAME}


		${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
		... ${register_user_info_provider}
		@@ -324,7 +319,7 @@ Retrieve ACL filtered by api-invoker-id
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


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

		@@ -333,7 +328,7 @@ Retrieve ACL filtered by api-invoker-id
		... ${INVOKER_USERNAME_2}

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


		# Get Published APIs
		${discover_response}= Get Request Capif

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ Get Log Entry
		${register_user_info}= Provider Default Registration

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


		# Publish one api
		Publish Service Api ${register_user_info}
		@@ -32,7 +32,7 @@ Get Log Entry
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${discover_response}= Get Request Capif
		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
		@@ -68,7 +68,7 @@ Get a log entry without entry created
		${register_user_info}= Provider Default Registration

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


		# Publish one api
		Publish Service Api ${register_user_info}
		@@ -77,7 +77,7 @@ Get a log entry without entry created
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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



		${resp_1}= Get Request Capif
		@@ -100,7 +100,7 @@ Get a log entry withut aefid and apiInvokerId
		${register_user_info}= Provider Default Registration

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


		# Publish one api
		Publish Service Api ${register_user_info}
		@@ -109,7 +109,7 @@ Get a log entry withut aefid and apiInvokerId
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${discover_response}= Get Request Capif
		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
		@@ -149,7 +149,7 @@ Get Log Entry with apiVersion filter
		${register_user_info}= Provider Default Registration

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


		# Publish one api
		Publish Service Api ${register_user_info}
		@@ -158,7 +158,7 @@ Get Log Entry with apiVersion filter
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${discover_response}= Get Request Capif
		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
		@@ -194,7 +194,7 @@ Get Log Entry with no exist apiVersion filter
		${register_user_info}= Provider Default Registration

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


		# Publish one api
		Publish Service Api ${register_user_info}
		@@ -203,7 +203,7 @@ Get Log Entry with no exist apiVersion filter
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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



		${discover_response}= Get Request Capif

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

+12 −12

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ Discover Published service APIs by Authorised API Invoker
		${register_user_info}= Provider Default Registration

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


		# Publish one api
		${service_api_description_published} ${resource_url} ${request_body}= Publish Service Api
		@@ -30,7 +30,7 @@ Discover Published service APIs by Authorised API Invoker
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		# Test
		${resp}= Get Request Capif
		@@ -54,7 +54,7 @@ Discover Published service APIs by Non Authorised API Invoker
		${register_user_info}= Provider Default Registration

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


		# Publish one api
		Publish Service Api ${register_user_info}
		@@ -63,7 +63,7 @@ Discover Published service APIs by Non Authorised API Invoker
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${resp}= Get Request Capif
		... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
		@@ -84,7 +84,7 @@ Discover Published service APIs by not registered API Invoker
		${register_user_info}= Provider Default Registration

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


		# Publish one api
		Publish Service Api ${register_user_info}
		@@ -93,7 +93,7 @@ Discover Published service APIs by not registered API Invoker
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${resp}= Get Request Capif
		... ${DISCOVER_URL}${API_INVOKER_NOT_REGISTERED}
		@@ -114,7 +114,7 @@ Discover Published service APIs by registered API Invoker with 1 result filtered
		${register_user_info}= Provider Default Registration

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


		${api_name_1}= Set Variable service_1
		${api_name_2}= Set Variable service_2
		@@ -131,7 +131,7 @@ Discover Published service APIs by registered API Invoker with 1 result filtered
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		# Request all APIs for Invoker
		${resp}= Get Request Capif
		@@ -168,7 +168,7 @@ Discover Published service APIs by registered API Invoker filtered with no match
		${register_user_info}= Provider Default Registration

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


		${api_name_1}= Set Variable apiName1
		${api_name_2}= Set Variable apiName2
		@@ -185,7 +185,7 @@ Discover Published service APIs by registered API Invoker filtered with no match
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		# Request all APIs for Invoker
		${resp}= Get Request Capif
		@@ -222,7 +222,7 @@ Discover Published service APIs by registered API Invoker not filtered
		${register_user_info}= Provider Default Registration

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


		${api_name_1}= Set Variable apiName1
		${api_name_2}= Set Variable apiName2
		@@ -239,7 +239,7 @@ Discover Published service APIs by registered API Invoker not filtered
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		# Request all APIs for Invoker
		${resp}= Get Request Capif

tests/features/CAPIF Api Events/capif_events_api.robot

+5 −5

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ Creates a new individual CAPIF Event Subscription
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${request_body}= Create Events Subscription
		${resp}= Post Request Capif
		@@ -42,7 +42,7 @@ Creates a new individual CAPIF Event Subscription with Invalid SubscriberId
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${request_body}= Create Events Subscription
		${resp}= Post Request Capif
		@@ -65,7 +65,7 @@ Deletes an individual CAPIF Event Subscription
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${request_body}= Create Events Subscription
		${resp}= Post Request Capif
		@@ -93,7 +93,7 @@ Deletes an individual CAPIF Event Subscription with invalid SubscriberId
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${request_body}= Create Events Subscription
		${resp}= Post Request Capif
		@@ -128,7 +128,7 @@ Deletes an individual CAPIF Event Subscription with invalid SubscriptionId
		${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding

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


		${request_body}= Create Events Subscription
		${resp}= Post Request Capif

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ Onboard NetApp
		Check Response Variable Type And Values ${resp} 201 APIInvokerEnrolmentDetails
		${url}= Parse Url ${resp.headers['Location']}
		Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
		Call Method ${CAPIF_USERS} update_register_users ${INVOKER_USERNAME}
		Check Location Header ${resp} ${LOCATION_INVOKER_RESOURCE_REGEX}

		# Store dummy signed certificate
		@@ -49,7 +48,6 @@ Register NetApp Already Onboarded
		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

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

		${resp}= Post Request Capif
		... ${register_user_info['ccf_onboarding_url']}
		@@ -73,7 +71,6 @@ Update Onboarded NetApp
		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

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

		Set To Dictionary
		... ${request_body}
		@@ -96,7 +93,6 @@ Update Not Onboarded NetApp
		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

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

		${resp}= Put Request Capif
		... /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}
		@@ -117,8 +113,6 @@ Offboard NetApp
		# Default Invoker Registration and Onboarding
		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

		Call Method ${CAPIF_USERS} update_register_users ${INVOKER_USERNAME}

		${resp}= Delete Request Capif
		... ${url.path}
		... server=${CAPIF_HTTPS_URL}
		@@ -134,7 +128,6 @@ Offboard Not Previously Onboarded NetApp
		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

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

		${resp}= Delete Request Capif
		... /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}
		@@ -157,7 +150,6 @@ Update Onboarded NetApp Certificate
		${register_user_info} ${url} ${request_body}= Invoker Default Onboarding

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

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