Merge pull request #5987 from dillaman/wip-rbd-refactor

rbd: refactor cli command handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/Makefile-client.am
Simple merge

diff --cc src/test/run-rbd-tests
index 7ad28b46995997ac1d416fdab49cf1233a45837b,1f7096148a8900369ead86e9b84f337ce55981ed..ac9ca714aecb1c7c88771dc0c0b4e92fcecfca4b
--- 1/src/test/run-rbd-tests
--- 2/src/test/run-rbd-tests
+++ b/src/test/run-rbd-tests
@@@ -36,9 -31,8 +36,9 @@@ run_admin_socket_tests() 
  ceph_test_cls_rbd
  run_api_tests
  run_cli_tests
 +run_admin_socket_tests
  
- export RBD_CREATE_ARGS="--format 2"
+ export RBD_CREATE_ARGS="--image-format 2"
  run_cli_tests
  
  for i in 0 1 5 13 29 45