RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-03 06:51:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR into master

Browse Source 
* refs/pull/39682/head:
	vstart_runner: remove duplicate methods from LocalCephManager

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2021-03-03 10:05:35 -08:00
commit 7bb6845e87
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 0 additions and 47 deletions

47
qa/tasks/vstart_runner.py
View File

@ -1011,53 +1011,6 @@ class LocalCephManager(CephManager):
return self.controller.run(args=args, 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):