Skip to content

Commit 093e4d2

Browse files
capnmav77capnmav77
committed
Pipeline fixes
- removed oidc providers from conf - removed admin users from conf - added deterministic string generation - added additional support method for delete endpoint Change-Id: I640b971a5b6c30339ed3993db3b6ba3e8feb4917 Reviewed-on: https://review.couchbase.org/c/TAF/+/228397 Well-Formed: Restriction Checker Tested-by: Build Bot <build@couchbase.com> Reviewed-by: VIPUL BHARDWAJ <vipul.bhardwaj@couchbase.com>
1 parent 89535de commit 093e4d2

4 files changed

Lines changed: 69 additions & 44 deletions

File tree

‎conf/capella/cp_v4_API-sanity.conf‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -114,48 +114,48 @@ Capella.RestAPIv4.AppEndpoints.app_endpoint_online.PostActivationStatus:
114114
test_api_path,GROUP=P13;functional
115115
test_authorization,GROUP=P13;security;S1
116116

117-
Capella.RestAPIv4.AppEndpoints.get_app_endpoint_o_i_d_c_providers.GetOidcProviders:
118-
test_api_path,GROUP=P14;functional
119-
test_authorization,GROUP=P14;security;S1
120-
Capella.RestAPIv4.AppEndpoints.list_app_endpoint_o_i_d_c_providers.ListOidcProviders:
121-
test_api_path,GROUP=P14;functional
122-
test_authorization,GROUP=P14;security;S1
123-
Capella.RestAPIv4.AppEndpoints.create_app_endpoint_o_i_d_c_providers.PostOidcProviders:
124-
test_api_path,GROUP=P14;functional
125-
test_authorization,GROUP=P14;security;S1
126-
test_payload,GROUP=P14;functional
127-
Capella.RestAPIv4.AppEndpoints.update_app_endpoint_o_i_d_c_providers.PutOidcProviders:
128-
test_api_path,GROUP=P14;functional
129-
test_authorization,GROUP=P14;security;S1
130-
test_payload,GROUP=P14;functional
131-
Capella.RestAPIv4.AppEndpoints.update_app_endpoint_o_i_d_c_default_providers.PutDefaultProvider:
132-
test_api_path,GROUP=P14;functional
133-
test_authorization,GROUP=P14;security;S1
134-
test_payload,GROUP=P14;functional
135-
Capella.RestAPIv4.AppEndpoints.delete_app_endpoint_o_i_d_c_providers.DeleteOidcProviders:
136-
test_api_path,GROUP=P14;functional
137-
test_authorization,GROUP=P14;security;S1
117+
# Capella.RestAPIv4.AppEndpoints.get_app_endpoint_o_i_d_c_providers.GetOidcProviders:
118+
# test_api_path,GROUP=P14;functional
119+
# test_authorization,GROUP=P14;security;S1
120+
# Capella.RestAPIv4.AppEndpoints.list_app_endpoint_o_i_d_c_providers.ListOidcProviders:
121+
# test_api_path,GROUP=P14;functional
122+
# test_authorization,GROUP=P14;security;S1
123+
# Capella.RestAPIv4.AppEndpoints.create_app_endpoint_o_i_d_c_providers.PostOidcProviders:
124+
# test_api_path,GROUP=P14;functional
125+
# test_authorization,GROUP=P14;security;S1
126+
# test_payload,GROUP=P14;functional
127+
# Capella.RestAPIv4.AppEndpoints.update_app_endpoint_o_i_d_c_providers.PutOidcProviders:
128+
# test_api_path,GROUP=P14;functional
129+
# test_authorization,GROUP=P14;security;S1
130+
# test_payload,GROUP=P14;functional
131+
# Capella.RestAPIv4.AppEndpoints.update_app_endpoint_o_i_d_c_default_providers.PutDefaultProvider:
132+
# test_api_path,GROUP=P14;functional
133+
# test_authorization,GROUP=P14;security;S1
134+
# test_payload,GROUP=P14;functional
135+
# Capella.RestAPIv4.AppEndpoints.delete_app_endpoint_o_i_d_c_providers.DeleteOidcProviders:
136+
# test_api_path,GROUP=P14;functional
137+
# test_authorization,GROUP=P14;security;S1
138138

139-
Capella.RestAPIv4.AppService.get_app_service_admin_users.GetAdminUsers:
140-
test_api_path,GROUP=P15;functional
141-
test_authorization,GROUP=P15;security;S3
142-
Capella.RestAPIv4.AppService.add_app_service_admin_users.PostAdminUsers:
143-
test_api_path,GROUP=P15;functional
144-
test_authorization,GROUP=P15;security;S3
145-
test_payload,GROUP=P15;functional
146-
Capella.RestAPIv4.AppService.list_app_service_admin_users.ListAdminUsers:
147-
test_api_path,GROUP=P15;functional
148-
test_authorization,GROUP=P15;security;S3
149-
Capella.RestAPIv4.AppService.list_app_endpoint_admin_users.ListAdminUsers:
150-
test_api_path,GROUP=P15;functional
151-
test_authorization,GROUP=P15;security;S3
152-
Capella.RestAPIv4.AppService.update_app_service_admin_users.PutAdminUsers:
153-
test_api_path,GROUP=P15;functional
154-
test_authorization,GROUP=P15;security;S3
155-
test_payload,GROUP=P15;functional
156-
Capella.RestAPIv4.AppService.delete_app_service_admin_users.DeleteAdminUsers:
157-
test_api_path,GROUP=P15;functional
158-
test_authorization,GROUP=P15;security;S3
139+
# Capella.RestAPIv4.AppService.get_app_service_admin_users.GetAdminUsers:
140+
# test_api_path,GROUP=P15;functional
141+
# test_authorization,GROUP=P15;security;S3
142+
# Capella.RestAPIv4.AppService.add_app_service_admin_users.PostAdminUsers:
143+
# test_api_path,GROUP=P15;functional
144+
# test_authorization,GROUP=P15;security;S3
145+
# test_payload,GROUP=P15;functional
146+
# Capella.RestAPIv4.AppService.list_app_service_admin_users.ListAdminUsers:
147+
# test_api_path,GROUP=P15;functional
148+
# test_authorization,GROUP=P15;security;S3
149+
# Capella.RestAPIv4.AppService.list_app_endpoint_admin_users.ListAdminUsers:
150+
# test_api_path,GROUP=P15;functional
151+
# test_authorization,GROUP=P15;security;S3
152+
# Capella.RestAPIv4.AppService.update_app_service_admin_users.PutAdminUsers:
153+
# test_api_path,GROUP=P15;functional
154+
# test_authorization,GROUP=P15;security;S3
155+
# test_payload,GROUP=P15;functional
156+
# Capella.RestAPIv4.AppService.delete_app_service_admin_users.DeleteAdminUsers:
157+
# test_api_path,GROUP=P15;functional
158+
# test_authorization,GROUP=P15;security;S3
159159

160160
Capella.RestAPIv4.AppServicesAuditLogging.get_app_service_audit_log_states.GetAuditLog:
161161
test_api_path,GROUP=P12;functional

‎pytests/Capella/RestAPIv4/AppEndpoints/get_app_endpoints.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ def setUp(self, nomenclature="AppEndpoints_GET"):
3939
"headers": [
4040
"Content-Type"
4141
],
42-
"maxAge": None,
43-
"disabled": None
42+
"maxAge": 600,
43+
"disabled": False
4444
},
4545
"console": {
4646
"logLevel": "debug",

‎pytests/Capella/RestAPIv4/Projects/update_projects.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def test_payload(self):
212212
if key in ["audit", "id"]:
213213
continue
214214
values = [
215-
"", 1, 0, 100000, -1, 123.123, self.generate_random_string(),
215+
"", 1, 0, 100000, -1, 123.123, self.generate_random_string(special_characters=False),
216216
self.generate_random_string(500, special_characters=False),
217217
]
218218
for value in values:

‎pytests/Capella/RestAPIv4/api_base.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,6 +2023,31 @@ def create_app_endpoint_oidc_Provider_to_be_tested(self, app_svc_id,
20232023
self.fail("!!!...Failed to retrieve providerId...!!!")
20242024
return oidcProviderId
20252025

2026+
def create_app_endpoint_to_be_tested(self, app_svc_id,app_endpoint_name, delta_sync, bucket, scopes, userXattrKey):
2027+
2028+
res = self.capellaAPI.cluster_ops_apis.create_app_endpoint(
2029+
self.organisation_id, self.project_id, self.cluster_id,
2030+
app_svc_id,
2031+
app_endpoint_name, delta_sync,
2032+
bucket, scopes,
2033+
userXattrKey)
2034+
if res.status_code == 429:
2035+
self.handle_rate_limit(int(res.headers["Retry-After"]))
2036+
res = self.capellaAPI.cluster_ops_apis.create_app_endpoint(
2037+
self.organisation_id, self.project_id, self.cluster_id,
2038+
app_svc_id,
2039+
app_endpoint_name, delta_sync,
2040+
bucket, scopes,
2041+
userXattrKey)
2042+
if res.status_code == 412:
2043+
self.log.debug("App endpoint {} already exists".format(
2044+
app_endpoint_name))
2045+
elif res.status_code != 201:
2046+
self.log.error(res.content)
2047+
self.fail("!!!...Creating App Endpoint failed...!!!")
2048+
self.log.info("Created App Endpoint: {} successfully".format(
2049+
app_endpoint_name))
2050+
20262051
def create_app_service_admin_user_to_be_tested(self,project_id, cluster_id,
20272052
app_svc_id, **kwargs):
20282053
res = self.capellaAPI.cluster_ops_apis.add_app_service_admin_user(

0 commit comments

Comments
 (0)