From 138e3668b61cbf2d9482a7128e731c0df7000178 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Mon, 3 Apr 2017 12:42:59 -0400 Subject: Adding ability to delete by selector. --- roles/lib_openshift/src/class/oc_obj.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'roles/lib_openshift/src/class/oc_obj.py') diff --git a/roles/lib_openshift/src/class/oc_obj.py b/roles/lib_openshift/src/class/oc_obj.py index 2976bd523..4d03fc80e 100644 --- a/roles/lib_openshift/src/class/oc_obj.py +++ b/roles/lib_openshift/src/class/oc_obj.py @@ -10,7 +10,7 @@ class OCObject(OpenShiftCLI): def __init__(self, kind, namespace, - rname=None, + name=None, selector=None, kubeconfig='/etc/origin/master/admin.kubeconfig', verbose=False, @@ -19,24 +19,21 @@ class OCObject(OpenShiftCLI): super(OCObject, self).__init__(namespace, kubeconfig=kubeconfig, verbose=verbose, all_namespaces=all_namespaces) self.kind = kind - self.name = rname + self.name = name self.selector = selector def get(self): '''return a kind by name ''' - results = self._get(self.kind, rname=self.name, selector=self.selector) - if (results['returncode'] == 0 and 'stderr' in results and - 'No resources found.' in results['stderr']): - - elif (results['returncode'] != 0 and 'stderr' in results and + results = self._get(self.kind, name=self.name, selector=self.selector) + if (results['returncode'] != 0 and 'stderr' in results and '\"%s\" not found' % self.name in results['stderr']): results['returncode'] = 0 return results def delete(self): - '''return all pods ''' - return self._delete(self.kind, self.name) + '''delete the object''' + return self._delete(self.kind, name=self.name, selector=self.selector) def create(self, files=None, content=None): ''' -- cgit v1.2.3