summaryrefslogtreecommitdiffstats
path: root/cns-libs/cnslibs/common/openshift_ops.py
diff options
context:
space:
mode:
authorApeksha D Khakharia <akhakhar@redhat.com>2018-07-26 18:14:28 +0530
committerApeksha D Khakharia <akhakhar@redhat.com>2018-10-24 18:22:20 +0530
commit9fe4515438397e6153f51d58fd09551d240df6d3 (patch)
tree4a810ddada2fe189e5590c83ec2f1badda1ab181 /cns-libs/cnslibs/common/openshift_ops.py
parentbd4aebe9066ec258c3405cc0b5d3381f4a0bc6fd (diff)
CNS-439: adding heketi_down_pvc_delete case
Change-Id: Id3b679cf3193b36bfd10fc498fb0ba930c5d2536 Signed-off-by: Apeksha D Khakharia <akhakhar@redhat.com>
Diffstat (limited to 'cns-libs/cnslibs/common/openshift_ops.py')
-rw-r--r--cns-libs/cnslibs/common/openshift_ops.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/cns-libs/cnslibs/common/openshift_ops.py b/cns-libs/cnslibs/common/openshift_ops.py
index d05529d8..830dc215 100644
--- a/cns-libs/cnslibs/common/openshift_ops.py
+++ b/cns-libs/cnslibs/common/openshift_ops.py
@@ -447,23 +447,27 @@ def oc_create_tiny_pod_with_volume(hostname, pvc_name, pod_name_prefix='',
return pod_name
-def oc_delete(ocp_node, rtype, name):
+def oc_delete(ocp_node, rtype, name, raise_on_absence=True):
"""Delete an OCP resource by name.
Args:
ocp_node (str): Node on which the ocp command will run.
rtype (str): Name of the resource type (pod, storageClass, etc).
name (str): Name of the resource to delete.
- Raises:
- AssertionError: Raised when resource fails to create.
+ raise_on_absence (bool): if resource absent raise
+ exception if value is true,
+ else return
+ default value: True
"""
+ if not oc_get_yaml(ocp_node, rtype, name,
+ raise_on_error=raise_on_absence):
+ return
ret, out, err = g.run(ocp_node, ['oc', 'delete', rtype, name])
if ret != 0:
g.log.error('Failed to delete resource: %s, %s: %r; %r',
rtype, name, out, err)
raise AssertionError('failed to delete resource: %r; %r' % (out, err))
g.log.info('Deleted resource: %r %r', rtype, name)
- return
def oc_get_yaml(ocp_node, rtype, name=None, raise_on_error=True):