parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Refactor ceph client for API

This commit is contained in:
Joshua Boniface 2019-07-05 00:29:47 -04:00
parent 6e2dfc1704
commit 84a905b7f0
2 changed files with 714 additions and 792 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
client-cli/pvc.py
View File

@ -1143,8 +1143,11 @@ def ceph_status():
""" """
zk_conn = pvc_common.startZKConnection(zk_host) zk_conn = pvc_common.startZKConnection(zk_host)
retcode, retmsg = pvc_ceph.get_status(zk_conn) retcode, retdata = pvc_ceph.get_status(zk_conn)
cleanup(retcode, retmsg, zk_conn) if retdata:
pvc_ceph.format_status(retdata)
retdata = ''
cleanup(retcode, retdata, zk_conn)
############################################################################### ###############################################################################
# pvc ceph osd # pvc ceph osd
@ -1303,8 +1306,11 @@ def ceph_osd_list(limit):
""" """
zk_conn = pvc_common.startZKConnection(zk_host) zk_conn = pvc_common.startZKConnection(zk_host)
retcode, retmsg = pvc_ceph.get_list_osd(zk_conn, limit) retcode, retdata = pvc_ceph.get_list_osd(zk_conn, limit)
cleanup(retcode, retmsg, zk_conn) if retcode:
pvc_ceph.format_list_osd(retdata)
retdata = ''
cleanup(retcode, retdata, zk_conn)
############################################################################### ###############################################################################
# pvc ceph pool # pvc ceph pool
@ -1377,8 +1383,11 @@ def ceph_pool_list(limit):
""" """
zk_conn = pvc_common.startZKConnection(zk_host) zk_conn = pvc_common.startZKConnection(zk_host)
retcode, retmsg = pvc_ceph.get_list_pool(zk_conn, limit) retcode, retdata = pvc_ceph.get_list_pool(zk_conn, limit)
cleanup(retcode, retmsg, zk_conn) if retcode:
pvc_ceph.format_list_pool(retdata)
retdata = ''
cleanup(retcode, retdata, zk_conn)
############################################################################### ###############################################################################
# pvc ceph volume # pvc ceph volume
@ -1460,8 +1469,11 @@ def ceph_volume_list(limit, pool):
""" """
zk_conn = pvc_common.startZKConnection(zk_host) zk_conn = pvc_common.startZKConnection(zk_host)
retcode, retmsg = pvc_ceph.get_list_volume(zk_conn, pool, limit) retcode, retdata = pvc_ceph.get_list_volume(zk_conn, pool, limit)
cleanup(retcode, retmsg, zk_conn) if retcode:
pvc_ceph.format_list_volume(retdata)
retdata = ''
cleanup(retcode, retdata, zk_conn)
############################################################################### ###############################################################################
# pvc ceph volume snapshot # pvc ceph volume snapshot
@ -1551,8 +1563,11 @@ def ceph_volume_snapshot_list(pool, volume, limit):
""" """
zk_conn = pvc_common.startZKConnection(zk_host) zk_conn = pvc_common.startZKConnection(zk_host)
retcode, retmsg = pvc_ceph.get_list_snapshot(zk_conn, pool, volume, limit) retcode, retdata = pvc_ceph.get_list_snapshot(zk_conn, pool, volume, limit)
cleanup(retcode, retmsg, zk_conn) if retcode:
pvc_ceph.format_list_snapshot(retdata)
retdata = ''
cleanup(retcode, retdata, zk_conn)
############################################################################### ###############################################################################

1471
client-common/ceph.py
View File

File diff suppressed because it is too large Load Diff