Skip to content

Commit 64a411a

Browse files
committed
dividing 404
Signed-off-by: Katharina Trentau <[email protected]>
1 parent b284203 commit 64a411a

File tree

1 file changed

+46
-39
lines changed

1 file changed

+46
-39
lines changed

Tests/kaas/k8s-default-storage-class/k8s-default-storage-class-check.py

Lines changed: 46 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,23 @@ def check_default_storageclass(k8s_client_storage):
6161
# pick out name and provisioner for each default storage class
6262
defaults = [
6363
(item["metadata"]["name"], item["provisioner"])
64-
for item in storageclasses['items']
65-
if item["metadata"]["annotations"].get("storageclass.kubernetes.io/is-default-class") == "true"
64+
for item in storageclasses["items"]
65+
if item["metadata"]["annotations"].get(
66+
"storageclass.kubernetes.io/is-default-class"
67+
)
68+
== "true"
6669
]
6770
if len(defaults) != 1:
68-
names = ', '.join(item[0] for item in defaults)
69-
logger.error(f"Precisely one default storage class required, found {names or 'none'}")
70-
raise SCSTestException('...', return_code=32)
71+
names = ", ".join(item[0] for item in defaults)
72+
logger.error(
73+
f"Precisely one default storage class required, found {names or 'none'}"
74+
)
75+
raise SCSTestException("...", return_code=32)
7176
name, provisioner = defaults[0]
7277
logger.info(f"Default storage class and provisioner: {name}, {provisioner}")
7378
if provisioner == "kubernetes.io/no-provisioner":
7479
logger.error("Default storage class missing provisioner")
75-
raise SCSTestException('...', return_code=31)
80+
raise SCSTestException("...", return_code=31)
7681
return name
7782

7883

@@ -109,16 +114,15 @@ def create_pvc_pod(
109114
namespace, body_pvc
110115
)
111116
try:
112-
k8s_api_instance.read_namespaced_persistent_volume_claim(name=pvc_name, namespace=namespace)
113-
logger.debug("created pvc successfully")
117+
k8s_api_instance.read_namespaced_persistent_volume_claim(
118+
name=pvc_name, namespace=namespace
119+
)
120+
logger.debug("created pvc successfully")
114121
except ApiException as api_exception:
115-
logger.info(f"code {api_exception.status}")
116-
if api_exception.status == 404:
117-
logger.info(
118-
"pvc not found, "
119-
"failed to build resources correctly"
120-
)
121-
return 43
122+
logger.info(f"code {api_exception.status}")
123+
if api_exception.status == 404:
124+
logger.info("pvc not found, " "failed to build resources correctly")
125+
return 43
122126

123127
# 2. Create a pod which makes use of the PersistantVolumeClaim
124128
logger.debug(f"create pod: {pod_name}")
@@ -144,19 +148,18 @@ def create_pvc_pod(
144148
)
145149

146150
api_response = k8s_api_instance.create_namespaced_pod(
147-
namespace, pod_body, _preload_content=False,
151+
namespace,
152+
pod_body,
153+
_preload_content=False,
148154
)
149155
try:
150-
k8s_api_instance.read_namespaced_pod(name=pod_name, namespace=namespace)
151-
logger.debug(f"created pod successfully")
156+
k8s_api_instance.read_namespaced_pod(name=pod_name, namespace=namespace)
157+
logger.debug(f"created pod successfully")
152158
except ApiException as api_exception:
153-
logger.info(f"code {api_exception.status}")
154-
if api_exception.status == 404:
155-
logger.info(
156-
"pod not found, "
157-
"failed to build resources correctly"
158-
)
159-
return 44
159+
logger.info(f"code {api_exception.status}")
160+
if api_exception.status == 404:
161+
logger.info("pod not found, " "failed to build resources correctly")
162+
return 44
160163
pod_info = json.loads(api_response.read().decode("utf-8"))
161164
pod_status = pod_info["status"]["phase"]
162165

@@ -189,7 +192,10 @@ def check_default_persistentvolumeclaim_readwriteonce(
189192
logger.debug("check if the created PV supports ReadWriteOnce")
190193
api_response = k8s_api_instance.list_persistent_volume(_preload_content=False)
191194
if not api_response:
192-
raise SCSTestException("No persistent volume found",return_code=1, )
195+
raise SCSTestException(
196+
"No persistent volume found",
197+
return_code=1,
198+
)
193199

194200
pv_info = json.loads(api_response.read().decode("utf-8"))
195201
pv_list = pv_info["items"]
@@ -315,16 +321,15 @@ def __enter__(self):
315321
def __exit__(self, exc_type, exc_value, traceback):
316322
if self.return_code != 43:
317323
try:
318-
self.clean()
324+
self.clean()
319325
except ApiException as api_exception:
320-
logger.info(f"code {api_exception.status}")
321-
if api_exception.status == 404: # might be obsolete
322-
logger.info(
323-
"resource not found, "
324-
"failed to build resources correctly"
325-
)
326-
self.return_code = 4
327-
self.return_message = "(404) resource not found"
326+
logger.info(f"code {api_exception.status}")
327+
if api_exception.status == 404: # might be obsolete
328+
logger.info(
329+
"resource not found, " "failed to build resources correctly"
330+
)
331+
self.return_code = 4
332+
self.return_message = "(404) resource not found"
328333
if self.return_code == 0:
329334
self.return_message = "all tests passed"
330335
if isinstance(exc_value, SCSTestException):
@@ -375,7 +380,9 @@ def main(argv):
375380
k8s_core_api = env.k8s_core_api
376381
logger.debug("check_default_storageclass()")
377382
try:
378-
default_class_name = check_default_storageclass(env.k8s_storage_api) #raise Exception
383+
default_class_name = check_default_storageclass(
384+
env.k8s_storage_api
385+
) # raise Exception
379386
except SCSTestException:
380387
raise
381388
except Exception:
@@ -407,9 +414,9 @@ def main(argv):
407414
# env.return_message = "(409) conflicting resources"
408415
# return
409416
# else:
410-
logger.info(f"An API error occurred: {api_exception}")
411-
env.return_code = api_exception.status
412-
return
417+
logger.info(f"An API error occurred: {api_exception}")
418+
env.return_code = api_exception.status
419+
return
413420

414421
logger.info(
415422
"Check if default_persistent volume has ReadWriteOnce defined (MANDATORY)"

0 commit comments

Comments
 (0)