Correct some bugs around new code

client-cli/pvc.py

@@ -1316,6 +1316,16 @@ def ceph_pool_list(limit):
     retcode, retmsg = pvc_ceph.get_list_pool(zk_conn, limit)
     cleanup(retcode, retmsg, zk_conn)
 
+###############################################################################
+# pvc ceph volume
+###############################################################################
+@click.group(name='volume', short_help='Manage RBD volumes in the PVC storage cluster.', context_settings=CONTEXT_SETTINGS)
+def ceph_volume():
+    """
+    Manage the Ceph RBD volumes of the PVC cluster.
+    """
+    pass
+
 ###############################################################################
 # pvc ceph volume add
 ###############################################################################
@@ -1381,6 +1391,16 @@ def ceph_volume_list(pool, limit):
     retcode, retmsg = pvc_ceph.get_list_volume(zk_conn, pool, limit)
     cleanup(retcode, retmsg, zk_conn)
 
+###############################################################################
+# pvc ceph volume snapshot
+###############################################################################
+@click.group(name='snapshot', short_help='Manage RBD volume snapshots in the PVC storage cluster.', context_settings=CONTEXT_SETTINGS)
+def ceph_volume_snapshot():
+    """
+    Manage the Ceph RBD volume snapshots of the PVC cluster.
+    """
+    pass
+
 ###############################################################################
 # pvc ceph volume snapshot add
 ###############################################################################
@@ -1394,7 +1414,7 @@ def ceph_volume_list(pool, limit):
 @click.argument(
     'name'
 )
-def ceph_snapshot_add(pool, volume, name):
+def ceph_volume_snapshot_add(pool, volume, name):
     """
     Add a snapshot of Ceph RBD volume VOLUME with name NAME.
     """
@@ -1416,7 +1436,7 @@ def ceph_snapshot_add(pool, volume, name):
 @click.argument(
     'name'
 )
-def ceph_volume_remove(pool, volume, name):
+def ceph_volume_snapshot_remove(pool, volume, name):
     """
     Remove a Ceph RBD volume with name NAME from pool POOL.
     """
@@ -1443,7 +1463,7 @@ def ceph_volume_remove(pool, volume, name):
 @click.argument(
     'limit', default=None, required=False
 )
-def ceph_volume_list(pool, volume, limit):
+def ceph_volume_snapshot_list(pool, volume, limit):
     """
     List all Ceph RBD volume snapshots, in the cluster or in pool POOL, for all volumes or volume VOLUME; optionally only match elements matching name regex LIMIT.
     """

client-cli/pvc_init.py

@@ -650,6 +650,8 @@ def init_zookeeper(zk_host):
     transaction.create('/ceph', ''.encode('ascii'))
     transaction.create('/ceph/osds', ''.encode('ascii'))
     transaction.create('/ceph/pools', ''.encode('ascii'))
+    transaction.create('/ceph/volumes', ''.encode('ascii'))
+    transaction.create('/ceph/snapshots', ''.encode('ascii'))
     transaction.create('/locks', ''.encode('ascii'))
     transaction.create('/locks/flush_lock', 'False'.encode('ascii'))
     transaction.commit()