From 52bd5bbb3647082443eef9b15f403cad140d801c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 25 Dec 2016 13:19:31 -0500 Subject: [PATCH] mon: 'fs set-default' not 'fs set_default' The convention is to use - for command names and _ for variable names. Signed-off-by: Sage Weil --- src/mon/MDSMonitor.cc | 3 ++- src/mon/MonCommands.h | 6 +++++- src/test/pybind/test_ceph_argparse.py | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 9015405ee2a..43a0bb93b24 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -1758,7 +1758,8 @@ int MDSMonitor::management_command( // Persist the new FSMap pending_fsmap.filesystems[new_fs->fscid] = new_fs; return 0; - } else if (prefix == "fs set_default") { + } else if (prefix == "fs set_default" || + prefix == "fs set-default") { string fs_name; cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name); auto fs = pending_fsmap.get_filesystem(fs_name); diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index 5fa2079eed8..6cf911e47e6 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -413,7 +413,11 @@ COMMAND("fs add_data_pool name=fs_name,type=CephString " \ COMMAND("fs rm_data_pool name=fs_name,type=CephString " \ "name=pool,type=CephString", \ "remove data pool ", "mds", "rw", "cli,rest") -COMMAND("fs set_default name=fs_name,type=CephString", \ +COMMAND_WITH_FLAG("fs set_default name=fs_name,type=CephString", \ + "set the default to the named filesystem", \ + "fs", "rw", "cli,rest", \ + FLAG(DEPRECATED)) +COMMAND("fs set-default name=fs_name,type=CephString", \ "set the default to the named filesystem", \ "fs", "rw", "cli,rest") diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index c34e0ea3acd..00c571bc6a9 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -505,9 +505,9 @@ class TestFS(TestArgparse): assert_equal({}, validate_command(sigdict, ['fs', 'ls', 'toomany'])) def test_fs_set_default(self): - self.assert_valid_command(['fs', 'set_default', 'cephfs']) - assert_equal({}, validate_command(sigdict, ['fs', 'set_default'])) - assert_equal({}, validate_command(sigdict, ['fs', 'set_default', 'cephfs', 'toomany'])) + self.assert_valid_command(['fs', 'set-default', 'cephfs']) + assert_equal({}, validate_command(sigdict, ['fs', 'set-default'])) + assert_equal({}, validate_command(sigdict, ['fs', 'set-default', 'cephfs', 'toomany'])) class TestMon(TestArgparse): -- 2.39.5