openstack
/
charm-ceph-rbd-mirror
Code Issues Proposed changes

Make rbd tool use json formatted output 

Change-Id: Ie2233350cb4520b598dd127b24132fdb4ed42802
This commit is contained in:
Frode Nordahl 2019-03-04 12:14:13 +01:00
parent a17c896c29
commit 8e54055e92
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/charm/openstack/ceph_rbd_mirror.py
View File

@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import json
import socket
import subprocess
@ -73,25 +74,24 @@ class CephRBDMirrorCharm(charms_openstack.plugins.CephCharm):
def _mirror_pool_info(self, pool):
output = subprocess.check_output(['rbd', '--id', self.ceph_id,
'mirror', 'pool', 'info', pool],
'mirror', 'pool', 'info', '--format',
'json', pool],
universal_newlines=True)
return output
return json.loads(output)
def mirror_pool_enabled(self, pool):
return 'Mode: pool' in self._mirror_pool_info(pool)
return self._mirror_pool_info(pool).get('mode', None) == 'pool'
def mirror_pool_has_peers(self, pool):
return 'Peers: none' not in self._mirror_pool_info(pool)
return len(self._mirror_pool_info(pool).get('peers', [])) > 0
def mirror_pool_status(self, pool):
output = subprocess.check_output(['rbd', '--id', self.ceph_id,
'mirror', 'pool', 'status', pool],
'mirror', 'pool', 'status',
'--format', 'json', '--verbose',
pool],
universal_newlines=True)
result = {}
for line in output.splitlines():
vp = line.split(':')
result.update({vp[0]: vp[1].lstrip().rstrip()})
return result
return json.loads(output)
def mirror_pool_enable(self, pool):
base_cmd = ['rbd', '--id', self.ceph_id, 'mirror', 'pool']

35
unit_tests/test_lib_charm_openstack_ceph_rbd_mirror.py
View File

@ -45,38 +45,47 @@ class TestCephRBDMirrorCharm(Helper):
self.patch_object(ceph_rbd_mirror.socket, 'gethostname')
self.patch_object(ceph_rbd_mirror.subprocess, 'check_output')
self.gethostname.return_value = 'ahostname'
self.check_output.return_value = '{}'
crmc = ceph_rbd_mirror.CephRBDMirrorCharm()
crmc._mirror_pool_info('apool')
self.check_output.assert_called_once_with(
['rbd', '--id', 'rbd-mirror.ahostname', 'mirror', 'pool', 'info',
'apool'], universal_newlines=True)
'--format', 'json', 'apool'], universal_newlines=True)
def test_mirror_pool_enabled(self):
self.patch_object(ceph_rbd_mirror.socket, 'gethostname')
crmc = ceph_rbd_mirror.CephRBDMirrorCharm()
_mirror_pool_info = mock.MagicMock()
_mirror_pool_info.return_value = (
'Mode: pool\n'
'Peers: \n'
' UUID NAME CLIENT'
' \n')
_mirror_pool_info.return_value = {
'mode': 'pool',
'peers': [{
'uuid': '0e4dfe58-93fc-44f8-8c74-7e700f950118',
'cluster_name': 'remote',
'client_name':
'client.rbd-mirror.juju-c50b1a-zaza-4ce96f1e7e43-12'}]
}
crmc._mirror_pool_info = _mirror_pool_info
self.assertTrue(crmc.mirror_pool_enabled('apool'))
_mirror_pool_info.assert_called_once_with('apool')
_mirror_pool_info.return_value = 'Mode: disabled\n'
_mirror_pool_info.return_value = {'mode': 'disabled'}
self.assertFalse(crmc.mirror_pool_enabled('apool'))
def test_mirror_pool_has_peers(self):
self.patch_object(ceph_rbd_mirror.socket, 'gethostname')
crmc = ceph_rbd_mirror.CephRBDMirrorCharm()
_mirror_pool_info = mock.MagicMock()
_mirror_pool_info.return_value = (
'Mode: pool\n'
'Peers: \n'
' UUID NAME CLIENT'
' \n')
_mirror_pool_info.return_value = {
'mode': 'pool',
'peers': [{
'uuid': '0e4dfe58-93fc-44f8-8c74-7e700f950118',
'cluster_name': 'remote',
'client_name':
'client.rbd-mirror.juju-c50b1a-zaza-4ce96f1e7e43-12'}]
}
crmc._mirror_pool_info = _mirror_pool_info
self.assertTrue(crmc.mirror_pool_has_peers('apool'))
_mirror_pool_info.assert_called_once_with('apool')
_mirror_pool_info.return_value = 'Mode: pool\nPeers: none\n'
_mirror_pool_info.return_value = {
'mode': 'pool',
'peers': []}
self.assertFalse(crmc.mirror_pool_has_peers('apool'))