mon: 'mon feature list' -> 'mon feature ls'

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index 944fe322598001119b0d828979ccdc9b22ccd6ad..9687b5f88187b14faf547c45ab461ee072565caa 100644 (file)
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -197,17 +197,13 @@ Upgrade from Jewel or Kraken
    looking for the ``lumninous`` feature string in the mon map.  For
    example::
 
-     # ceph osd dump -f json-pretty
+     # ceph mon feature ls
 
-   should include::
+   should include `luminous` under persistent features::
 
-        "features": {
-            "persistent": [
-                "kraken",
-                "luminous"
-            ],
-            "optional": []
-        },
+     on current monmap (epoch NNN)
+        persistent: [kraken,luminous]
+        required: [kraken,luminous]
 
 #. Add or restart ``ceph-mgr`` daemons.  If you are upgrading from
    kraken, upgrade packages and restart ceph-mgr daemons with::

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 36fb92a31c7e70fa0d7b7dc9448b75755f104033..3ffa05148b29227b8bd49b0a4594e93e2225905d 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1117,7 +1117,7 @@ function test_mon_mon()
   ceph mon_status
 
   # test mon features
-  ceph mon feature list
+  ceph mon feature ls
   ceph mon feature set kraken --yes-i-really-mean-it
   expect_false ceph mon feature set abcd
   expect_false ceph mon feature set abcd --yes-i-really-mean-it

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 69a63964c8355e9bea6f72c0dc96fdb121d93ee6..00afc2e930c6970eefae8635a87caf9543e2a625 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -423,7 +423,7 @@ COMMAND("mon remove " \
 COMMAND("mon rm " \
        "name=name,type=CephString", \
        "remove monitor named <name>", "mon", "rw", "cli,rest")
-COMMAND("mon feature list " \
+COMMAND("mon feature ls " \
         "name=with_value,type=CephChoices,strings=--with-value,req=false", \
         "list available mon map features to be set/unset", \
         "mon", "r", "cli,rest")

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index b5ac990dfd063e73d3b5b21d19b4278cb4c05542..5035e1e23ce34d8a1cc669f56c7608fcd5179246 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -309,7 +309,7 @@ bool MonmapMonitor::preprocess_command(MonOpRequestRef op)
     if (p != mon->monmap)
        delete p;
 
-  } else if (prefix == "mon feature list") {
+  } else if (prefix == "mon feature ls") {
    
     bool list_with_value = false;
     string with_value;

diff --git a/src/test/mon/misc.sh b/src/test/mon/misc.sh
index 2002ecd8944c77dbef25eb22050e1a094085d05c..52e102435cc25b43e64d2fb2ac23b6ca0da5668e 100755 (executable)
--- a/src/test/mon/misc.sh
+++ b/src/test/mon/misc.sh
@@ -231,9 +231,9 @@ function TEST_mon_features() {
     jqfilter='.monmap.features.optional | length == 0'
     jq_success "$jqinput" "$jqfilter" || return 1
 
-    # validate 'mon feature list'
+    # validate 'mon feature ls'
 
-    jqinput="$(ceph mon feature list --format=json 2>/dev/null)"
+    jqinput="$(ceph mon feature ls --format=json 2>/dev/null)"
     # 'kraken' and 'luminous' are supported
     jqfilter='.all.supported[] | select(. == "kraken")'
     jq_success "$jqinput" "$jqfilter" "kraken" || return 1