From 210c86b35e8d42cc81e5387da981b5518352eb66 Mon Sep 17 00:00:00 2001 From: Sushil Gupta Date: Wed, 11 Nov 2020 16:53:36 +0530 Subject: [LibFix] Add parameter to lib 'oc_delete' to check resource presence Change-Id: I3382f9c52013a58f038f28b1c3d64a82ece813f6 Signed-off-by: Sushil Gupta --- openshift-storage-libs/openshiftstoragelibs/openshift_ops.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'openshift-storage-libs') diff --git a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py index 5f53dabb..fb60a009 100644 --- a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py +++ b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py @@ -483,7 +483,8 @@ def oc_create_tiny_pod_with_volume(hostname, pvc_name, pod_name_prefix='', def oc_delete( - ocp_node, rtype, name, raise_on_absence=True, collect_logs=False): + ocp_node, rtype, name, raise_on_absence=True, collect_logs=False, + skip_res_validation=True): """Delete an OCP resource by name Args: @@ -495,8 +496,10 @@ def oc_delete( else return default value: True collect_logs (bool): Collect logs before deleting resource + skip_res_validation(bool): To validate before deletion of resource. """ - if not oc_get_yaml(ocp_node, rtype, name, raise_on_error=raise_on_absence): + if skip_res_validation and not oc_get_yaml( + ocp_node, rtype, name, raise_on_error=raise_on_absence): return if rtype == "pod" and collect_logs: -- cgit