From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 3 Mar 2021 18:05:35 +0000 (-0800)
Subject: Merge PR #39682 into master
X-Git-Tag: v17.1.0~2760
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bb6845e8751fab75f00d27756f26ae131c196b3;p=ceph.git

Merge PR #39682 into master

* 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>
---

7bb6845e8751fab75f00d27756f26ae131c196b3
diff --cc qa/tasks/vstart_runner.py
index f717030b941d,c07dbb4e8f5e..6ee66214d2bc
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@@ -1007,57 -1009,11 +1007,10 @@@ class LocalCephManager(CephManager)
          if stdout is None:
              stdout = StringIO()
  
 -        return self.controller.run(
 -            args=[os.path.join(BIN_PREFIX, "ceph"), "daemon",
 -                  "{0}.{1}".format(daemon_type, daemon_id)] + command,
 -            check_status=check_status, timeout=timeout, stdout=stdout)
 +        args=[CEPH_CMD, "daemon", f'{daemon_type}', f'{daemon_id}'] + command
 +        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):