diff --git a/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot b/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot
index 905e4c7b581be3907138a557401916b3a3e630b2..04d789839c2fb6ed6212ede4fd1abf5228b09a55 100644
--- a/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot
+++ b/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot
@@ -23,13 +23,6 @@ Retrieve ACL
# Register APF
${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
... ${register_user_info_provider}
... service_1
@@ -50,9 +43,6 @@ Retrieve ACL
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${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_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
... ${register_user_info_provider}
... service_1
@@ -117,8 +101,6 @@ Retrieve ACL with 2 Service APIs published
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
# Test
${discover_response}= Get Request Capif
... ${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_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
... ${register_user_info_provider}
... service_1
@@ -203,16 +179,12 @@ Retrieve ACL with security context created by two different Invokers
# Default Invoker Registration and 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
# Register another invoker
${register_user_info_invoker_2} ${url} ${request_body}= Invoker Default Onboarding
... ${INVOKER_USERNAME_2}
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME_2}
-
# Get Published APIs
${discover_response}= Get Request Capif
... ${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_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
... ${register_user_info_provider}
... service_1
@@ -318,18 +283,12 @@ Retrieve ACL filtered by api-invoker-id
# Default Invoker Registration and 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
# Register another invoker
${register_user_info_invoker_2} ${url} ${request_body}= Invoker Default Onboarding
... ${INVOKER_USERNAME_2}
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME_2}
-
-
# Get Published APIs
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
@@ -602,7 +561,7 @@ No ACL for invoker after be removed
Check Response Variable Type And Values ${resp} 200 AccessControlPolicyList
- Remove entity ${INVOKER_USERNAME}
+ Remove entity ${INVOKER_USERNAME}
${resp}= Get Request Capif
... /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}
@@ -619,4 +578,3 @@ No ACL for invoker after be removed
... 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
... cause=Wrong id
-
diff --git a/tests/features/CAPIF Api Auditing Service/capif_auditing_api.robot b/tests/features/CAPIF Api Auditing Service/capif_auditing_api.robot
index 4c0a3936effc113631c5d5f3dd4cf11948dc13a7..0676168adb8c2b12d2cfde56341a3703ace5f972 100644
--- a/tests/features/CAPIF Api Auditing Service/capif_auditing_api.robot
+++ b/tests/features/CAPIF Api Auditing Service/capif_auditing_api.robot
@@ -1,12 +1,13 @@
*** Settings ***
-Resource /opt/robot-tests/tests/resources/common.resource
-Library /opt/robot-tests/tests/libraries/bodyRequests.py
-Library Collections
-Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
-Resource ../../resources/common.resource
+Resource /opt/robot-tests/tests/resources/common.resource
+Library /opt/robot-tests/tests/libraries/bodyRequests.py
+Library Collections
+Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
+Resource ../../resources/common.resource
+
+Suite Teardown Reset Testing Environment
+Test Setup Reset Testing Environment
-Test Setup Reset Testing Environment
-Suite Teardown Reset Testing Environment
*** Variables ***
${AEF_ID_NOT_VALID} aef-example
@@ -16,34 +17,33 @@ ${NOTIFICATION_DESTINATION} http://robot.testing:1080
${API_VERSION_VALID} v1
${API_VERSION_NOT_VALID} v58
+
*** Test Cases ***
Get Log Entry
[Tags] capif_api_auditing_service-1
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
- ${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
- ${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
... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
... json=${request_body}
@@ -51,7 +51,6 @@ Get Log Entry
... verify=ca.crt
... username=${AEF_PROVIDER_USERNAME}
-
${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']}
... server=${CAPIF_HTTPS_URL}
@@ -60,67 +59,56 @@ Get Log Entry
# Check Results
Check Response Variable Type And Values ${resp_2} 200 InvocationLog
- Length Should Be ${resp_2.json()["logs"]} 2
+ Length Should Be ${resp_2.json()["logs"]} 2
Get a log entry without entry created
[Tags] capif_api_auditing_service-2
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${AMF_PROVIDER_USERNAME}
# Check Results
- Check Response Variable Type And Values ${resp_1} 404 ProblemDetails
+ Check Response Variable Type And Values ${resp_1} 404 ProblemDetails
... title=Not Found
... status=404
... detail=aefId or/and apiInvokerId do not match any InvocationLogs
... cause=No log invocations found
-
Get a log entry withut aefid and apiInvokerId
[Tags] capif_api_auditing_service-3
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
- ${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
- ${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
... /api-invocation-logs/v1/${AEF_ID_NOT_VALID}/logs
... json=${request_body}
@@ -128,48 +116,44 @@ Get a log entry withut aefid and apiInvokerId
... verify=ca.crt
... username=${AEF_PROVIDER_USERNAME}
-
- ${resp_2}= Get Request Capif
+ ${resp_2}= Get Request Capif
... /logs/v1/apiInvocationLogs
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${AMF_PROVIDER_USERNAME}
# Check Results
- Check Response Variable Type And Values ${resp_2} 400 ProblemDetails
+ Check Response Variable Type And Values ${resp_2} 400 ProblemDetails
... title=Bad Request
... status=400
... detail=aef_id and api_invoker_id parameters are mandatory
... cause=Mandatory parameters missing
-
Get Log Entry with apiVersion filter
[Tags] capif_api_auditing_service-4
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
- ${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
- ${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
... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
... json=${request_body}
@@ -177,45 +161,41 @@ Get Log Entry with apiVersion filter
... verify=ca.crt
... username=${AEF_PROVIDER_USERNAME}
-
${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}
... verify=ca.crt
... username=${AMF_PROVIDER_USERNAME}
# Check Results
Check Response Variable Type And Values ${resp_2} 200 InvocationLog
- Length Should Be ${resp_2.json()["logs"]} 1
+ Length Should Be ${resp_2.json()["logs"]} 1
-Get Log Entry with no exist apiVersion filter
+Get Log Entry with no exist apiVersion filter
[Tags] capif_api_auditing_service-5
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
- ${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
- ${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
... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
... json=${request_body}
@@ -223,21 +203,16 @@ Get Log Entry with no exist apiVersion filter
... verify=ca.crt
... username=${AEF_PROVIDER_USERNAME}
-
${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}
... verify=ca.crt
... username=${AMF_PROVIDER_USERNAME}
# Check Results
- # Check Results
- Check Response Variable Type And Values ${resp_2} 404 ProblemDetails
+ # Check Results
+ Check Response Variable Type And Values ${resp_2} 404 ProblemDetails
... title=Not Found
... status=404
... detail=Parameters do not match any log entry
... cause=No logs found
-
-
-
-
diff --git a/tests/features/CAPIF Api Discover Service/capif_api_service_discover.robot b/tests/features/CAPIF Api Discover Service/capif_api_service_discover.robot
index 2b7ed5b3226b2eeca955bc00558f75482eb2704c..ff82ec3b8535e389e55a377dce13c6a7d459113d 100644
--- a/tests/features/CAPIF Api Discover Service/capif_api_service_discover.robot
+++ b/tests/features/CAPIF Api Discover Service/capif_api_service_discover.robot
@@ -1,11 +1,11 @@
*** Settings ***
-Resource /opt/robot-tests/tests/resources/common.resource
-Resource /opt/robot-tests/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot
-Resource ../../resources/common.resource
-Library /opt/robot-tests/tests/libraries/bodyRequests.py
+Resource /opt/robot-tests/tests/resources/common.resource
+Resource /opt/robot-tests/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot
+Resource ../../resources/common.resource
+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
@@ -16,12 +16,9 @@ ${API_INVOKER_NOT_REGISTERED} not-valid
*** Test Cases ***
Discover Published service APIs by Authorised API Invoker
[Tags] capif_api_discover_service-1
- #Register APF
+ # Register APF
${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
${service_api_description_published} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info}
@@ -29,9 +26,6 @@ Discover Published service APIs by Authorised API Invoker
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${resp}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
@@ -45,26 +39,19 @@ Discover Published service APIs by Authorised API Invoker
Dictionary Should Contain Key ${resp.json()} serviceAPIDescriptions
Should Not Be Empty ${resp.json()['serviceAPIDescriptions']}
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
[Tags] capif_api_discover_service-2
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
@@ -80,21 +67,15 @@ Discover Published service APIs by Non Authorised API Invoker
Discover Published service APIs by not registered API Invoker
[Tags] capif_api_discover_service-3
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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
... ${DISCOVER_URL}${API_INVOKER_NOT_REGISTERED}
... server=${CAPIF_HTTPS_URL}
@@ -110,12 +91,9 @@ Discover Published service APIs by not registered API Invoker
Discover Published service APIs by registered API Invoker with 1 result filtered
[Tags] capif_api_discover_service-4
- #Register APF
+ # Register APF
${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_2}= Set Variable service_2
@@ -130,9 +108,6 @@ Discover Published service APIs by registered API Invoker with 1 result filtered
# Register INVOKER
${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
${resp}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
@@ -145,8 +120,8 @@ Discover Published service APIs by registered API Invoker with 1 result filtered
# Check returned values
Should Not Be Empty ${resp.json()['serviceAPIDescriptions']}
Length Should Be ${resp.json()['serviceAPIDescriptions']} 2
- List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_1}
- List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_2}
+ List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_1}
+ List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_2}
# Request api 1
${resp}= Get Request Capif
@@ -164,12 +139,9 @@ Discover Published service APIs by registered API Invoker with 1 result filtered
Discover Published service APIs by registered API Invoker filtered with no match
[Tags] capif_api_discover_service-5
- #Register APF
+ # Register APF
${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_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
${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
${resp}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
@@ -199,8 +168,8 @@ Discover Published service APIs by registered API Invoker filtered with no match
# Check returned values
Should Not Be Empty ${resp.json()['serviceAPIDescriptions']}
Length Should Be ${resp.json()['serviceAPIDescriptions']} 2
- List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_1}
- List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_2}
+ List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_1}
+ List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_2}
# Request api 1
${resp}= Get Request Capif
@@ -210,7 +179,10 @@ Discover Published service APIs by registered API Invoker filtered with no match
... username=${INVOKER_USERNAME}
# Check Results
- Check Response Variable Type And Values ${resp} 404 ProblemDetails
+ Check Response Variable Type And Values
+ ... ${resp}
+ ... 404
+ ... ProblemDetails
... title=Not Found
... status=404
... detail=API Invoker ${register_user_info_invoker['api_invoker_id']} has no API Published that accomplish filter conditions
@@ -218,12 +190,9 @@ Discover Published service APIs by registered API Invoker filtered with no match
Discover Published service APIs by registered API Invoker not filtered
[Tags] capif_api_discover_service-6
- #Register APF
+ # Register APF
${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_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
${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
${resp}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
@@ -253,5 +219,5 @@ Discover Published service APIs by registered API Invoker not filtered
# Check Results
Should Not Be Empty ${resp.json()['serviceAPIDescriptions']}
Length Should Be ${resp.json()['serviceAPIDescriptions']} 2
- List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_1}
- List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_2}
+ List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_1}
+ List Should Contain Value ${resp.json()['serviceAPIDescriptions']} ${service_api_description_published_2}
diff --git a/tests/features/CAPIF Api Events/capif_events_api.robot b/tests/features/CAPIF Api Events/capif_events_api.robot
index c027769534fe498dd3de1b77e1598cb928532c7e..f2a596689598ea7761ca25304e4e8f0e469f6c8e 100644
--- a/tests/features/CAPIF Api Events/capif_events_api.robot
+++ b/tests/features/CAPIF Api Events/capif_events_api.robot
@@ -1,12 +1,12 @@
*** Settings ***
-Resource /opt/robot-tests/tests/resources/common.resource
-Library /opt/robot-tests/tests/libraries/bodyRequests.py
-Library XML
-Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
-Resource ../../resources/common.resource
+Resource /opt/robot-tests/tests/resources/common.resource
+Library /opt/robot-tests/tests/libraries/bodyRequests.py
+Library XML
+Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
+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 ***
@@ -21,9 +21,6 @@ Creates a new individual CAPIF Event Subscription
# Default Invoker Registration and 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
${resp}= Post Request Capif
... /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
${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
${resp}= Post Request Capif
... /capif-events/v1/${SUBSCRIBER_ID_NOT_VALID}/subscriptions
@@ -53,7 +47,7 @@ Creates a new individual CAPIF Event Subscription with Invalid SubscriberId
... username=${INVOKER_USERNAME}
# Check Results
- Check Response Variable Type And Values ${resp} 404 ProblemDetails
+ Check Response Variable Type And Values ${resp} 404 ProblemDetails
... title=Not Found
... status=404
... detail=Invoker or APF or AEF or AMF Not found
@@ -64,9 +58,6 @@ Deletes an individual CAPIF Event Subscription
# Default Invoker Registration and 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
${resp}= Post Request Capif
... /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
${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
${resp}= Post Request Capif
... /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
@@ -112,24 +100,20 @@ Deletes an individual CAPIF Event Subscription with invalid SubscriberId
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
-
+
# Check Results
- Check Response Variable Type And Values ${resp} 404 ProblemDetails
+ Check Response Variable Type And Values ${resp} 404 ProblemDetails
... title=Not Found
... status=404
... detail=Invoker or APF or AEF or AMF Not found
... cause=Subscriber Not Found
-
Deletes an individual CAPIF Event Subscription with invalid SubscriptionId
[Tags] capif_api_events-5
# Default Invoker Registration and 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
${resp}= Post Request Capif
... /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
... detail=User not authorized
... cause=You are not the owner of this resource
-
diff --git a/tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot b/tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot
index 7127cc459eeb32609e9953c8af615e536d323082..8c40f7273fb59e53cb28ef2928109864bf4d54d2 100644
--- a/tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot
+++ b/tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot
@@ -1,13 +1,13 @@
*** Settings ***
-Resource /opt/robot-tests/tests/resources/common.resource
-Resource /opt/robot-tests/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot
-Resource ../../resources/common.resource
-Library /opt/robot-tests/tests/libraries/bodyRequests.py
-Library Process
-Library Collections
+Resource /opt/robot-tests/tests/resources/common.resource
+Resource /opt/robot-tests/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot
+Resource ../../resources/common.resource
+Library /opt/robot-tests/tests/libraries/bodyRequests.py
+Library Process
+Library Collections
-Test Setup Reset Testing Environment
-Suite Teardown Reset Testing Environment
+Suite Teardown Reset Testing Environment
+Test Setup Reset Testing Environment
*** Variables ***
@@ -17,7 +17,7 @@ ${API_INVOKER_NOT_REGISTERED} not-valid
*** Test Cases ***
Onboard NetApp
[Tags] capif_api_invoker_management-1
- #Register Netapp
+ # Register Netapp
${register_user_info}= Register User At Jwt Auth
... username=${INVOKER_USERNAME} role=${INVOKER_ROLE}
@@ -34,9 +34,9 @@ Onboard NetApp
... access_token=${register_user_info['access_token']}
# Check Results
- Check Response Variable Type And Values ${resp} 201 APIInvokerEnrolmentDetails
+ 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_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
Check Location Header ${resp} ${LOCATION_INVOKER_RESOURCE_REGEX}
# Store dummy signed certificate
@@ -47,8 +47,6 @@ Register NetApp Already Onboarded
# Default Invoker Registration and 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
... ${register_user_info['ccf_onboarding_url']}
... json=${request_body}
@@ -70,8 +68,6 @@ Update Onboarded NetApp
# Default Invoker Registration and 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
... ${request_body}
... notificationDestination=${new_notification_destination}
@@ -92,8 +88,6 @@ Update Not Onboarded NetApp
# Default Invoker Registration and 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
... /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}
... ${request_body}
@@ -118,6 +112,8 @@ Offboard NetApp
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
+
+ Call Method ${CAPIF_USERS} remove_capif_users_entry ${url.path}
# Check Results
Should Be Equal As Strings ${resp.status_code} 204
@@ -127,8 +123,6 @@ Offboard Not Previously Onboarded NetApp
# Default Invoker Registration and 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
... /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}
... server=${CAPIF_HTTPS_URL}
@@ -149,9 +143,7 @@ Update Onboarded NetApp Certificate
# Default Invoker Registration and 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
@@ -189,5 +181,3 @@ Update Onboarded NetApp Certificate
# Check Results
Check Response Variable Type And Values ${resp} 200 APIInvokerEnrolmentDetails
... notificationDestination=${new_notification_destination}
-
-
diff --git a/tests/features/CAPIF Api Logging Service/capif_logging_api.robot b/tests/features/CAPIF Api Logging Service/capif_logging_api.robot
index 2604bdb2c65bf5bda39c9d73037aca646e33f899..a7a025323714c370440cefda59a6cb73541442da 100644
--- a/tests/features/CAPIF Api Logging Service/capif_logging_api.robot
+++ b/tests/features/CAPIF Api Logging Service/capif_logging_api.robot
@@ -1,12 +1,13 @@
*** Settings ***
-Resource /opt/robot-tests/tests/resources/common.resource
-Library /opt/robot-tests/tests/libraries/bodyRequests.py
-Library Collections
-Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
-Resource ../../resources/common.resource
+Resource /opt/robot-tests/tests/resources/common.resource
+Library /opt/robot-tests/tests/libraries/bodyRequests.py
+Library Collections
+Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
+Resource ../../resources/common.resource
+
+Suite Teardown Reset Testing Environment
+Test Setup Reset Testing Environment
-Test Setup Reset Testing Environment
-Suite Teardown Reset Testing Environment
*** Variables ***
${AEF_ID_NOT_VALID} aef-example
@@ -14,34 +15,33 @@ ${SERVICE_API_ID_NOT_VALID} not-valid
${API_INVOKER_NOT_VALID} not-valid
${NOTIFICATION_DESTINATION} http://robot.testing:1080
+
*** Test Cases ***
Create a log entry
[Tags] capif_api_logging_service-1
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
- ${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
- ${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}= Post Request Capif
... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
... json=${request_body}
@@ -49,38 +49,35 @@ Create a log entry
... verify=ca.crt
... username=${AEF_PROVIDER_USERNAME}
-
# Check Results
Check Response Variable Type And Values ${resp} 201 InvocationLog
${resource_url}= Check Location Header ${resp} ${LOCATION_LOGGING_RESOURCE_REGEX}
Create a log entry invalid aefId
[Tags] capif_api_logging_service-2
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
- ${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
- ${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}= Post Request Capif
... /api-invocation-logs/v1/${AEF_ID_NOT_VALID}/logs
... json=${request_body}
@@ -89,31 +86,23 @@ Create a log entry invalid aefId
... username=${AEF_PROVIDER_USERNAME}
# Check Results
- Check Response Variable Type And Values ${resp} 404 ProblemDetails
+ Check Response Variable Type And Values ${resp} 404 ProblemDetails
... title=Not Found
... status=404
... detail=Exposer not exist
... cause=Exposer id not found
-
-
Create a log entry invalid serviceApi
[Tags] capif_api_logging_service-3
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
@@ -121,7 +110,9 @@ Create a log entry invalid serviceApi
... username=${INVOKER_USERNAME}
# Create Log Entry
- ${request_body}= Create Log Entry Bad Service ${register_user_info['aef_id']} ${register_user_info_invoker['api_invoker_id']}
+ ${request_body}= Create Log Entry Bad Service
+ ... ${register_user_info['aef_id']}
+ ... ${register_user_info_invoker['api_invoker_id']}
${resp}= Post Request Capif
... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
... json=${request_body}
@@ -137,31 +128,29 @@ Create a log entry invalid serviceApi
Create a log entry invalid apiInvokerId
[Tags] capif_api_logging_service-4
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
- ${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
- ${request_body}= Create Log Entry ${register_user_info['aef_id']} ${API_INVOKER_NOT_VALID} ${api_ids} ${api_names}
+ ${request_body}= Create Log Entry
+ ... ${register_user_info['aef_id']}
+ ... ${API_INVOKER_NOT_VALID}
+ ... ${api_ids}
+ ... ${api_names}
${resp}= Post Request Capif
... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
... json=${request_body}
@@ -176,35 +165,31 @@ Create a log entry invalid apiInvokerId
... detail=Invoker not exist
... cause=Invoker id not found
-
Create a log entry different aef_id in body
[Tags] capif_api_logging_service-5
- #Register APF
+ # Register APF
${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 Service Api ${register_user_info}
- #Register INVOKER
+ # Register INVOKER
${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_URL}${register_user_info_invoker['api_invoker_id']}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${INVOKER_USERNAME}
- ${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
- ${request_body}= Create Log Entry ${AEF_ID_NOT_VALID} ${register_user_info_invoker['api_invoker_id']} ${api_ids} ${api_names}
+ ${request_body}= Create Log Entry
+ ... ${AEF_ID_NOT_VALID}
+ ... ${register_user_info_invoker['api_invoker_id']}
+ ... ${api_ids}
+ ... ${api_names}
${resp}= Post Request Capif
... /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
... json=${request_body}
@@ -218,4 +203,3 @@ Create a log entry different aef_id in body
... status=401
... detail=AEF id not matching in request and body
... cause=Not identical AEF id
-
diff --git a/tests/features/CAPIF Api Provider Management/capif_api_provider_management.robot b/tests/features/CAPIF Api Provider Management/capif_api_provider_management.robot
index f47385f7136a636236e47998a3df4c9c7f0b3cb0..a6f9674acb9a7a097d284296bef12553ce939987 100644
--- a/tests/features/CAPIF Api Provider Management/capif_api_provider_management.robot
+++ b/tests/features/CAPIF Api Provider Management/capif_api_provider_management.robot
@@ -64,12 +64,6 @@ Register Api Provider Already registered
[Tags] capif_api_provider_management-2
${register_user_info}= Provider Default Registration
- Call Method
- ... ${CAPIF_USERS}
- ... update_capif_users_dicts
- ... ${register_user_info['resource_url'].path}
- ... ${AMF_PROVIDER_USERNAME}
-
${resp}= Post Request Capif
... /api-provider-management/v1/registrations
... json=${register_user_info['provider_enrollment_details']}
@@ -88,12 +82,6 @@ Update Registered Api Provider
[Tags] capif_api_provider_management-3
${register_user_info}= Provider Default Registration
- Call Method
- ... ${CAPIF_USERS}
- ... update_capif_users_dicts
- ... ${register_user_info['resource_url'].path}
- ... ${AMF_PROVIDER_USERNAME}
-
${request_body}= Set Variable ${register_user_info['provider_enrollment_details']}
Set To Dictionary ${request_body} apiProvDomInfo=ROBOT_TESTING_MOD
@@ -127,12 +115,6 @@ Update Not Registered Api Provider
[Tags] capif_api_provider_management-4
${register_user_info}= Provider Default Registration
- Call Method
- ... ${CAPIF_USERS}
- ... update_capif_users_dicts
- ... ${register_user_info['resource_url'].path}
- ... ${AMF_PROVIDER_USERNAME}
-
${request_body}= Set Variable ${register_user_info['provider_enrollment_details']}
${resp}= Put Request Capif
@@ -173,12 +155,6 @@ Partially Update Not Registered Api Provider
[Tags] capif_api_provider_management-6
${register_user_info}= Provider Default Registration
- Call Method
- ... ${CAPIF_USERS}
- ... update_capif_users_dicts
- ... ${register_user_info['resource_url'].path}
- ... ${AMF_PROVIDER_USERNAME}
-
${request_body}= Create Api Provider Enrolment Details Patch Body
${resp}= Patch Request Capif
@@ -205,6 +181,8 @@ Delete Registered Api Provider
... verify=ca.crt
... username=${AMF_PROVIDER_USERNAME}
+ Call Method ${CAPIF_USERS} remove_capif_users_entry ${register_user_info['resource_url'].path}
+
# Check Results
Status Should Be 204 ${resp}
@@ -212,12 +190,6 @@ Delete Not Registered Api Provider
[Tags] capif_api_provider_management-8
${register_user_info}= Provider Default Registration
- Call Method
- ... ${CAPIF_USERS}
- ... update_capif_users_dicts
- ... ${register_user_info['resource_url'].path}
- ... ${AMF_PROVIDER_USERNAME}
-
${resp}= Delete Request Capif
... /api-provider-management/v1/registrations/${API_PROVIDER_NOT_REGISTERED}
... server=${CAPIF_HTTPS_URL}
diff --git a/tests/features/CAPIF Api Publish Service/capif_api_publish_service.robot b/tests/features/CAPIF Api Publish Service/capif_api_publish_service.robot
index daef4be4cfccf1787e4c5846b7fff66cb56d0e56..56484d2d3e359ac65dc0a2dd172190a6b8c7e188 100644
--- a/tests/features/CAPIF Api Publish Service/capif_api_publish_service.robot
+++ b/tests/features/CAPIF Api Publish Service/capif_api_publish_service.robot
@@ -1,11 +1,11 @@
*** Settings ***
-Resource /opt/robot-tests/tests/resources/common.resource
-Resource ../../resources/common/basicRequests.robot
-Resource ../../resources/common.resource
-Library /opt/robot-tests/tests/libraries/bodyRequests.py
+Resource /opt/robot-tests/tests/resources/common.resource
+Resource ../../resources/common/basicRequests.robot
+Resource ../../resources/common.resource
+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
*** Variables ***
@@ -16,12 +16,9 @@ ${SERVICE_API_ID_NOT_VALID} not-valid
*** Test Cases ***
Publish API by Authorised API Publisher
[Tags] capif_api_publish_service-1
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Test
${request_body}= Create Service Api Description service_1
${resp}= Post Request Capif
@@ -38,12 +35,9 @@ Publish API by Authorised API Publisher
Publish API by NON Authorised API Publisher
[Tags] capif_api_publish_service-2
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${request_body}= Create Service Api Description
${resp}= Post Request Capif
... /published-apis/v1/${APF_ID_NOT_VALID}/service-apis
@@ -60,12 +54,9 @@ Publish API by NON Authorised API Publisher
Retrieve all APIs Published by Authorised apfId
[Tags] capif_api_publish_service-3
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Register One Service
${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info}
@@ -88,12 +79,9 @@ Retrieve all APIs Published by Authorised apfId
Retrieve all APIs Published by NON Authorised apfId
[Tags] capif_api_publish_service-4
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Retrieve Services published
${resp}= Get Request Capif
... /published-apis/v1/${APF_ID_NOT_VALID}/service-apis
@@ -109,12 +97,9 @@ Retrieve all APIs Published by NON Authorised apfId
Retrieve single APIs Published by Authorised apfId
[Tags] capif_api_publish_service-5
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info}
... service_1
@@ -148,19 +133,15 @@ Retrieve single APIs Published by Authorised apfId
Retrieve single APIs non Published by Authorised apfId
[Tags] capif_api_publish_service-6
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${resp}= Get Request Capif
... /published-apis/v1/${register_user_info['apf_id']}/service-apis/${SERVICE_API_ID_NOT_VALID}
... server=${CAPIF_HTTPS_URL}
... verify=ca.crt
... username=${APF_PROVIDER_USERNAME}
-
Check Response Variable Type And Values ${resp} 401 ProblemDetails
... title=Unauthorized
... detail=User not authorized
@@ -171,9 +152,6 @@ Retrieve single APIs Published by NON Authorised apfId
# Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Publish Service API
${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info}
@@ -182,9 +160,6 @@ Retrieve single APIs Published by NON Authorised apfId
# Register INVOKER
${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
... ${resource_url.path}
... server=${CAPIF_HTTPS_URL}
@@ -199,12 +174,9 @@ Retrieve single APIs Published by NON Authorised apfId
Update API Published by Authorised apfId with valid serviceApiId
[Tags] capif_api_publish_service-8
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info}
... service_1
@@ -232,12 +204,9 @@ Update API Published by Authorised apfId with valid serviceApiId
Update APIs Published by Authorised apfId with invalid serviceApiId
[Tags] capif_api_publish_service-9
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info}
... service_1
@@ -257,22 +226,16 @@ Update APIs Published by Authorised apfId with invalid serviceApiId
Update APIs Published by NON Authorised apfId
[Tags] capif_api_publish_service-10
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info}
... service_1
- #Register INVOKER
+ # Register INVOKER
${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 Service Api Description service_1_modified
${resp}= Put Request Capif
... ${resource_url.path}
@@ -299,12 +262,9 @@ Update APIs Published by NON Authorised apfId
Delete API Published by Authorised apfId with valid serviceApiId
[Tags] capif_api_publish_service-11
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${service_api_description_published_1} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info}
... first_service
@@ -330,12 +290,9 @@ Delete API Published by Authorised apfId with valid serviceApiId
Delete APIs Published by Authorised apfId with invalid serviceApiId
[Tags] capif_api_publish_service-12
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${resp}= Delete Request Capif
... /published-apis/v1/${register_user_info['apf_id']}/service-apis/${SERVICE_API_ID_NOT_VALID}
... server=${CAPIF_HTTPS_URL}
@@ -349,18 +306,12 @@ Delete APIs Published by Authorised apfId with invalid serviceApiId
Delete APIs Published by NON Authorised apfId
[Tags] capif_api_publish_service-13
- #Register APF
+ # Register APF
${register_user_info}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
- #Register INVOKER
+ # Register INVOKER
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
${resp}= Delete Request Capif
... /published-apis/v1/${register_user_info['apf_id']}/service-apis/${SERVICE_API_ID_NOT_VALID}
... server=${CAPIF_HTTPS_URL}
diff --git a/tests/features/CAPIF Security Api/capif_security_api.robot b/tests/features/CAPIF Security Api/capif_security_api.robot
index 4e27948473f243b9b062cd011518a05f32432375..6342aa9f92fd555e3d08c3ac443eb395e456e8c5 100644
--- a/tests/features/CAPIF Security Api/capif_security_api.robot
+++ b/tests/features/CAPIF Security Api/capif_security_api.robot
@@ -1,12 +1,12 @@
*** Settings ***
-Resource /opt/robot-tests/tests/resources/common.resource
-Library /opt/robot-tests/tests/libraries/bodyRequests.py
-Library Collections
-Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
-Resource ../../resources/common.resource
+Resource /opt/robot-tests/tests/resources/common.resource
+Library /opt/robot-tests/tests/libraries/bodyRequests.py
+Library Collections
+Resource /opt/robot-tests/tests/resources/common/basicRequests.robot
+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 ***
@@ -22,9 +22,6 @@ Create a security context for an API invoker
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Create Security Context
${request_body}= Create Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
@@ -43,15 +40,9 @@ Create a security context for an API invoker with Provider role
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Register Provider
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Create Security Context
${request_body}= Create Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
@@ -73,9 +64,6 @@ Create a security context for an API invoker with Provider entity role and inval
# Register APF
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Create Security Context
${request_body}= Create Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
@@ -97,9 +85,6 @@ Create a security context for an API invoker with Invalid apiInvokerID
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
@@ -120,9 +105,6 @@ Retrieve the Security Context of an API Invoker
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -139,9 +121,6 @@ Retrieve the Security Context of an API Invoker
# Register APF
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Retrieve Security context can setup by parameters if authenticationInfo and authorizationInfo are needed at response.
# ... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}?authenticationInfo=true&authorizationInfo=true
${resp}= Get Request Capif
@@ -165,9 +144,6 @@ Retrieve the Security Context of an API Invoker with invalid apiInvokerID
# Register APF
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${resp}= Get Request Capif
... /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
... server=${CAPIF_HTTPS_URL}
@@ -185,9 +161,6 @@ Retrieve the Security Context of an API Invoker with invalid apfId
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -217,9 +190,6 @@ Delete the Security Context of an API Invoker
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -233,9 +203,6 @@ Delete the Security Context of an API Invoker
# Register APF
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Remove Security Context
${resp}= Delete Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -263,9 +230,6 @@ Delete the Security Context of an API Invoker with Invoker entity role
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -294,9 +258,6 @@ Delete the Security Context of an API Invoker with Invoker entity role and inval
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
${resp}= Delete Request Capif
... /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
... server=${CAPIF_HTTPS_URL}
@@ -315,9 +276,6 @@ Delete the Security Context of an API Invoker with invalid apiInvokerID
# Register Provider
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${resp}= Delete Request Capif
... /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
... server=${CAPIF_HTTPS_URL}
@@ -336,15 +294,9 @@ Update the Security Context of an API Invoker
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Register Provider
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${request_body}= Create Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -389,9 +341,6 @@ Update the Security Context of an API Invoker with Provider entity role
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -402,12 +351,9 @@ Update the Security Context of an API Invoker with Provider entity role
Check Response Variable Type And Values ${resp} 201 ServiceSecurity
- #Register Provider
+ # Register Provider
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${resp}= Post Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}/update
... json=${request_body}
@@ -424,12 +370,9 @@ Update the Security Context of an API Invoker with Provider entity role
Update the Security Context of an API Invoker with AEF entity role and invalid apiInvokerId
[Tags] capif_security_api-14
- #Register Provider
+ # Register Provider
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${request_body}= Create Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Post Request Capif
... /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}/update
@@ -449,9 +392,6 @@ Update the Security Context of an API Invoker with invalid apiInvokerID
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Post Request Capif
... /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}/update
@@ -472,9 +412,6 @@ Revoke the authorization of the API invoker for APIs
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -485,10 +422,6 @@ Revoke the authorization of the API invoker for APIs
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
@@ -545,9 +478,6 @@ Revoke the authorization of the API invoker for APIs without valid apfID.
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -563,9 +493,6 @@ Revoke the authorization of the API invoker for APIs without valid apfID.
# Register Provider
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
# Revoke Security Context by Invoker
${request_body}= Create Security Notification Body ${register_user_info_invoker['api_invoker_id']} 1234
${resp}= Post Request Capif
@@ -601,9 +528,6 @@ Revoke the authorization of the API invoker for APIs with invalid apiInvokerId
# Default Invoker Registration and 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 Service Security Body ${NOTIFICATION_DESTINATION}
${resp}= Put Request Capif
... /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
@@ -616,12 +540,9 @@ Revoke the authorization of the API invoker for APIs with invalid apiInvokerId
${security_context}= Set Variable ${resp.json()}
- #Register Provider
+ # Register Provider
${register_user_info_publisher}= Provider Default Registration
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${register_user_info_publisher['resource_url'].path} ${AMF_PROVIDER_USERNAME}
-
-
${request_body}= Create Security Notification Body ${API_INVOKER_NOT_VALID} 1234
${resp}= Post Request Capif
... /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}/delete
@@ -652,9 +573,6 @@ Retrieve access token
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -665,9 +583,6 @@ Retrieve access token
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -711,9 +626,6 @@ Retrieve access token by Provider
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -724,9 +636,6 @@ Retrieve access token by Provider
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -769,9 +678,6 @@ Retrieve access token by Provider with invalid apiInvokerId
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -782,9 +688,6 @@ Retrieve access token by Provider with invalid apiInvokerId
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -828,9 +731,6 @@ Retrieve access token with invalid apiInvokerId
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -841,9 +741,6 @@ Retrieve access token with invalid apiInvokerId
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -889,9 +786,6 @@ Retrieve access token with invalid client_id
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -902,9 +796,6 @@ Retrieve access token with invalid client_id
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -948,9 +839,6 @@ Retrieve access token with unsupported grant_type
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -961,9 +849,6 @@ Retrieve access token with unsupported grant_type
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -1014,9 +899,6 @@ Retrieve access token with invalid scope
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -1027,9 +909,6 @@ Retrieve access token with invalid scope
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -1075,9 +954,6 @@ Retrieve access token with invalid aefid at scope
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -1088,9 +964,6 @@ Retrieve access token with invalid aefid at scope
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -1136,9 +1009,6 @@ Retrieve access token with invalid apiName at scope
# Register APF
${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}
-
-
${api_name}= Set Variable service_1
# Register One Service
@@ -1149,9 +1019,6 @@ Retrieve access token with invalid apiName at scope
# Default Invoker Registration and Onboarding
${register_user_info_invoker} ${url} ${request_body}= Invoker Default Onboarding
- Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${INVOKER_USERNAME}
-
-
# Test
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name}
@@ -1189,4 +1056,4 @@ Retrieve access token with invalid apiName at scope
# Check Results
Check Response Variable Type And Values ${resp} 400 AccessTokenErr
... error=invalid_scope
- ... error_description=One of the api names does not exist or is not associated with the aef id provided
\ No newline at end of file
+ ... error_description=One of the api names does not exist or is not associated with the aef id provided
diff --git a/tests/resources/common/basicRequests.robot b/tests/resources/common/basicRequests.robot
index 3a24b84a3c362940b9cbfc2b9bc73ca33cbee397..ea3a96ffc432e86aa543ab51c796cbffb61bfc76 100644
--- a/tests/resources/common/basicRequests.robot
+++ b/tests/resources/common/basicRequests.robot
@@ -5,7 +5,7 @@ Library RequestsLibrary
Library Collections
Library OperatingSystem
Library XML
-Library Telnet
+Library Telnet
*** Variables ***
@@ -58,31 +58,31 @@ Create Register Admin Session
[Documentation] Create needed session to reach Register as Administrator.
[Arguments] ${server}=${NONE} ${access_token}=${NONE} ${verify}=${NONE} ${vault_token}=${NONE}
IF "${server}" != "${NONE}"
- IF "${access_token}" != "${NONE}"
+ IF "${access_token}" != "${NONE}"
## Return Header with bearer
${headers}= Create Dictionary Authorization=Bearer ${access_token}
- RETURN ${headers}
+ RETURN ${headers}
END
-
+
# Request Admin Login to retrieve access token
- Create Session register_session ${server} verify=${verify} disable_warnings=1
+ Create Session register_session ${server} verify=${verify} disable_warnings=1
${auth}= Set variable ${{ ('${REGISTER_ADMIN_USER}','${REGISTER_ADMIN_PASSWORD}') }}
- ${resp}= POST On Session register_session /login auth=${auth}
+ ${resp}= POST On Session register_session /login auth=${auth}
Log Dictionary ${resp.json()}
-
+
## Crear sesión con token
${headers}= Create Dictionary Authorization=Bearer ${resp.json()['access_token']}
- RETURN ${headers}
+ RETURN ${headers}
END
-
RETURN ${NONE}
## NEW REQUESTS TO REGISTER
+
Post Request Admin Register
[Timeout] 60s
[Arguments]
@@ -139,12 +139,8 @@ Get Request Admin Register
... cert=${cert}
RETURN ${resp}
-
-
-
# NEW REQUESTS END
-
Post Request Capif
[Timeout] 60s
[Arguments]
@@ -327,8 +323,12 @@ Register User At Jwt Auth
END
Log cn=${cn}
-
- ${resp}= Create User At Register ${username} ${password} ${description} email="${username}@nobody.com"
+
+ ${resp}= Create User At Register
+ ... ${username}
+ ... ${password}
+ ... ${description}
+ ... email="${username}@nobody.com"
${get_auth_response}= Get Auth For User ${username} ${password}
@@ -353,7 +353,7 @@ Register User At Jwt Auth
Store In File ${username}.key ${register_user_info['private_key']}
END
- Call Method ${CAPIF_USERS} update_register_users ${register_user_info['uuid']} ${username}
+ Call Method ${CAPIF_USERS} update_register_users ${register_user_info['uuid']} ${username}
RETURN ${register_user_info}
@@ -372,7 +372,11 @@ Register User At Jwt Auth Provider
${amf_csr_request}= Create User Csr ${amf_username} amf
# Register provider
- ${resp}= Create User At Register ${username} ${password} ${description} email="${username}@nobody.com"
+ ${resp}= Create User At Register
+ ... ${username}
+ ... ${password}
+ ... ${description}
+ ... email="${username}@nobody.com"
${get_auth_response}= Get Auth For User ${username} ${password}
@@ -392,59 +396,62 @@ Register User At Jwt Auth Provider
Log Dictionary ${register_user_info}
- Call Method ${CAPIF_USERS} update_register_users ${register_user_info['uuid']} ${username}
+ Call Method ${CAPIF_USERS} update_register_users ${register_user_info['uuid']} ${username}
RETURN ${register_user_info}
-
Login Register Admin
- ${headers}= Create Register Admin Session ${CAPIF_HTTPS_REGISTER_URL}
- RETURN ${headers}
+ ${headers}= Create Register Admin Session ${CAPIF_HTTPS_REGISTER_URL}
+ RETURN ${headers}
Create User At Register
- [Documentation] (Administrator) This Keyword create a user at register component.
- [Arguments] ${username} ${password} ${description} ${email}
-
+ [Documentation] (Administrator) This Keyword create a user at register component.
+ [Arguments] ${username} ${password} ${description} ${email}
+
# Obtain Admin Token to request creation of User
${headers}= Login Register Admin
-
- &{body}= Create Dictionary username=${username} password=${password} description=${description} email=${email}
- ${resp}= Post On Session register_session /createUser headers=${headers} json=${body}
+
+ &{body}= Create Dictionary
+ ... username=${username}
+ ... password=${password}
+ ... description=${description}
+ ... email=${email}
+ ${resp}= Post On Session register_session /createUser headers=${headers} json=${body}
Should Be Equal As Strings ${resp.status_code} 201
-
+
RETURN ${resp}
Delete User At Register
- [Documentation] (Administrator) This Keyword delete a user from register.
- [Arguments] ${username}=${NONE} ${uuid}=${NONE}
- ${user_uuid}= Set Variable ${uuid}
+ [Documentation] (Administrator) This Keyword delete a user from register.
+ [Arguments] ${username}=${NONE} ${uuid}=${NONE}
+ ${user_uuid}= Set Variable ${uuid}
- IF "${username}" != "${NONE}"
- ${user_uuid}= Call Method ${CAPIF_USERS} get_user_uuid ${username}
+ IF "${username}" != "${NONE}"
+ ${user_uuid}= Call Method ${CAPIF_USERS} get_user_uuid ${username}
END
- ${headers}= Create Register Admin Session ${CAPIF_HTTPS_REGISTER_URL} verify=False
+ ${headers}= Create Register Admin Session ${CAPIF_HTTPS_REGISTER_URL} verify=False
- ${resp}= DELETE On Session register_session /deleteUser/${user_uuid} headers=${headers}
+ ${resp}= DELETE On Session register_session /deleteUser/${user_uuid} headers=${headers}
Should Be Equal As Strings ${resp.status_code} 204
Call Method ${CAPIF_USERS} remove_register_users_entry ${user_uuid}
- RETURN ${resp}
+ RETURN ${resp}
Get List of User At Register
- [Documentation] (Administrator) This Keyword retrieve a list of users from register.
- ${headers}= Create Register Admin Session ${CAPIF_HTTPS_REGISTER_URL} verify=False
+ [Documentation] (Administrator) This Keyword retrieve a list of users from register.
+ ${headers}= Create Register Admin Session ${CAPIF_HTTPS_REGISTER_URL} verify=False
- ${resp}= DELETE On Session register_session /getUsers headers=${headers}
+ ${resp}= DELETE On Session register_session /getUsers headers=${headers}
Should Be Equal As Strings ${resp.status_code} 200
- RETURN ${resp.json()['users']}
+ RETURN ${resp.json()['users']}
Get Auth For User
- [Documentation] (User) This Keyword retrieve token to be used by user towards first interaction with CCF.
+ [Documentation] (User) This Keyword retrieve token to be used by user towards first interaction with CCF.
[Arguments] ${username} ${password}
${auth}= Set variable ${{ ('${username}','${password}') }}
${resp}= GET On Session register_session /getauth auth=${auth}
@@ -475,11 +482,11 @@ Clean Test Information
${uuids}= Get Dictionary Keys ${register_users_dict}
FOR ${uuid} IN @{uuids}
- Delete User At Register uuid=${uuid}
+ Delete User At Register uuid=${uuid}
END
Remove entity
- [Arguments] ${entity_user} ${certificate_name}=${entity_user}
+ [Arguments] ${entity_user} ${certificate_name}=${entity_user}
${capif_users_dict}= Call Method ${CAPIF_USERS} get_capif_users_dict
@@ -491,7 +498,7 @@ Remove entity
FOR ${key} IN @{keys}
${value}= Get From Dictionary ${capif_users_dict} ${key}
- IF "${value}" == "${certificate_name}"
+ IF "${value}" == "${certificate_name}"
${resp}= Delete Request Capif
... ${key}
... server=${CAPIF_HTTPS_URL}
@@ -503,14 +510,14 @@ Remove entity
Call Method ${CAPIF_USERS} remove_capif_users_entry ${key}
END
END
-
- Delete User At Register username=${entity_user}
+
+ Delete User At Register username=${entity_user}
Log Dictionary ${capif_users_dict}
Log Dictionary ${register_users_dict}
Remove Resource
- [Arguments] ${resource_url} ${management_cert} ${username}
+ [Arguments] ${resource_url} ${management_cert} ${username}
${resp}= Delete Request Capif
... ${resource_url}
@@ -530,7 +537,6 @@ Remove Resource
Should Be Equal As Strings ${resp.status_code} 204
-
Invoker Default Onboarding
[Arguments] ${invoker_username}=${INVOKER_USERNAME}
${register_user_info}= Register User At Jwt Auth
@@ -554,11 +560,12 @@ Invoker Default Onboarding
# Assertions
Status Should Be 201 ${resp}
Check Variable ${resp.json()} APIInvokerEnrolmentDetails
- ${resource_url}= Check Location Header ${resp} ${LOCATION_INVOKER_RESOURCE_REGEX}
+ ${resource_url}= Check Location Header ${resp} ${LOCATION_INVOKER_RESOURCE_REGEX}
# Store dummy signede certificate
Store In File ${invoker_username}.crt ${resp.json()['onboardingInformation']['apiInvokerCertificate']}
${url}= Parse Url ${resp.headers['Location']}
+ Call Method ${CAPIF_USERS} update_capif_users_dicts ${url.path} ${invoker_username}
Set To Dictionary ${register_user_info} resource_url=${resource_url}
Set To Dictionary ${register_user_info} management_cert=${invoker_username}
@@ -622,6 +629,12 @@ Provider Registration
... provider_register_response=${resp}
... management_cert=${register_user_info['amf_username']}
+ Call Method
+ ... ${CAPIF_USERS}
+ ... update_capif_users_dicts
+ ... ${register_user_info['resource_url'].path}
+ ... ${register_user_info['amf_username']}
+
RETURN ${register_user_info}
Provider Default Registration
@@ -633,6 +646,7 @@ Provider Default Registration
${register_user_info}= Provider Registration ${register_user_info}
Log Dictionary ${register_user_info}
+
RETURN ${register_user_info}
Publish Service Api
@@ -657,13 +671,6 @@ Basic ACL registration
# Register APF
${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}
- Call Method ${CAPIF_USERS} update_register_users ${register_user_info_provider['uuid']} ${PROVIDER_USERNAME}
-
${service_api_description_published} ${resource_url} ${request_body}= Publish Service Api
... ${register_user_info_provider}
... service_1
@@ -714,7 +721,7 @@ Basic ACL registration
RETURN ${register_user_info_invoker} ${register_user_info_provider} ${service_api_description_published}
Create Security Context Between invoker and provider
- [Arguments] ${register_user_info_invoker} ${register_user_info_provider}
+ [Arguments] ${register_user_info_invoker} ${register_user_info_provider}
${discover_response}= Get Request Capif
... ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
@@ -737,4 +744,3 @@ Create Security Context Between invoker and provider
... username=${register_user_info_invoker['management_cert']}
Check Response Variable Type And Values ${resp} 201 ServiceSecurity
-