From: Rishabh Dave Date: Wed, 18 Nov 2020 08:35:53 +0000 (+0530) Subject: vstart_runner: remove duplicate methods from LocalCephManager X-Git-Tag: v17.1.0~2760^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f827a7b90eba07c667d6832266be100f413421c;p=ceph.git vstart_runner: remove duplicate methods from LocalCephManager LocalCephManager already inherits these methods from CephManager. Signed-off-by: Rishabh Dave --- diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index 5d9c095c546d..c07dbb4e8f5e 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -1014,53 +1014,6 @@ class LocalCephManager(CephManager): "{0}.{1}".format(daemon_type, daemon_id)] + command, check_status=check_status, timeout=timeout, stdout=stdout) - def get_mon_socks(self): - """ - Get monitor sockets. - - :return socks: tuple of strings; strings are individual sockets. - """ - from json import loads - - output = loads(self.raw_cluster_cmd('--format=json', 'mon', 'dump')) - socks = [] - for mon in output['mons']: - for addrvec_mem in mon['public_addrs']['addrvec']: - socks.append(addrvec_mem['addr']) - return tuple(socks) - - def get_msgrv1_mon_socks(self): - """ - Get monitor sockets that use msgrv2 to operate. - - :return socks: tuple of strings; strings are individual sockets. - """ - from json import loads - - output = loads(self.raw_cluster_cmd('--format=json', 'mon', 'dump')) - socks = [] - for mon in output['mons']: - for addrvec_mem in mon['public_addrs']['addrvec']: - if addrvec_mem['type'] == 'v1': - socks.append(addrvec_mem['addr']) - return tuple(socks) - - def get_msgrv2_mon_socks(self): - """ - Get monitor sockets that use msgrv2 to operate. - - :return socks: tuple of strings; strings are individual sockets. - """ - from json import loads - - output = loads(self.raw_cluster_cmd('--format=json', 'mon', 'dump')) - socks = [] - for mon in output['mons']: - for addrvec_mem in mon['public_addrs']['addrvec']: - if addrvec_mem['type'] == 'v2': - socks.append(addrvec_mem['addr']) - return tuple(socks) - class LocalCephCluster(CephCluster): def __init__(self, ctx):