diff options
author | Nitin Goyal <nigoyal@redhat.com> | 2019-09-13 14:40:18 +0530 |
---|---|---|
committer | Nitin Goyal <nigoyal@redhat.com> | 2019-12-05 22:02:11 +0530 |
commit | a3c024ac1525783323061e1565c3a1f760074217 (patch) | |
tree | e095465a3cffeb67df97c43962d4e60c3ca0745b /openshift-storage-libs/openshiftstoragelibs/podcmd.py | |
parent | f75cf7f58dc17d45ab93aeedbbbbfe9cd9134d03 (diff) |
Add new TCs remove or delete heketi node
Add new TC remove or delete node from heketi, and verify gluster
peer status, bricks on the new node and heal info.
Change-Id: If4b6006a4a58fd581ac9851b377a82f69ce0f30f
Diffstat (limited to 'openshift-storage-libs/openshiftstoragelibs/podcmd.py')
-rw-r--r-- | openshift-storage-libs/openshiftstoragelibs/podcmd.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/openshift-storage-libs/openshiftstoragelibs/podcmd.py b/openshift-storage-libs/openshiftstoragelibs/podcmd.py index 62fff01a..33e88a26 100644 --- a/openshift-storage-libs/openshiftstoragelibs/podcmd.py +++ b/openshift-storage-libs/openshiftstoragelibs/podcmd.py @@ -49,6 +49,7 @@ from collections import namedtuple from functools import partial, wraps from glusto.core import Glusto as g +import mock import six from openshiftstoragelibs import openshift_ops @@ -85,14 +86,21 @@ def run(target, command, user=None, log_level=None, orig_run=g.run): # definition time in order to capture the method before # any additional monkeypatching by other code - if target == 'auto_get_gluster_endpoint': - ocp_client_node = list(g.config['ocp_servers']['client'].keys())[0] + ocp_client_node = list(g.config['ocp_servers']['client'].keys())[0] + with mock.patch.object(g, 'run', new=orig_run): gluster_pods = openshift_ops.get_ocp_gluster_pod_details( ocp_client_node) + + if target == 'auto_get_gluster_endpoint': if gluster_pods: target = Pod(ocp_client_node, gluster_pods[0]["pod_name"]) else: target = list(g.config.get("gluster_servers", {}).keys())[0] + elif not isinstance(target, Pod) and gluster_pods: + for g_pod in gluster_pods: + if target in (g_pod['pod_host_ip'], g_pod['pod_hostname']): + target = Pod(ocp_client_node, g_pod['pod_name']) + break if isinstance(target, Pod): prefix = ['oc', 'rsh', target.podname] |