pybind/mgr/restful: prefix commands with 'restful'

And use - instead of _, following the ceph convention.

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

diff --git a/src/pybind/mgr/restful/api/__init__.py b/src/pybind/mgr/restful/api/__init__.py
index a6c662a2ca13f00c39e7c0a7518450b0f7e9ce8b..d4345eebc647f7475ba1a778445dbd3a5e428f62 100644 (file)
--- a/src/pybind/mgr/restful/api/__init__.py
+++ b/src/pybind/mgr/restful/api/__init__.py
@@ -30,7 +30,7 @@ class Root(RestController):
         return {
             'api_version': 1,
             'auth':
-                'Use "ceph tell mgr create_key <key>" to create a key pair, '
+                'Use "ceph tell mgr restful create_key <key>" to create a key pair, '
                 'pass it as HTTP Basic auth to authenticate',
             'doc': 'See /doc endpoint',
             'info': "Ceph Manager RESTful API server",

diff --git a/src/pybind/mgr/restful/module.py b/src/pybind/mgr/restful/module.py
index adfefd098a99ac0e3bbc842e5695b6fd54d8c7d6..e41c55e24575fdf8b1b7da26b1a268e12b96801f 100644 (file)
--- a/src/pybind/mgr/restful/module.py
+++ b/src/pybind/mgr/restful/module.py
@@ -198,17 +198,17 @@ class CommandsRequest(object):
 class Module(MgrModule):
     COMMANDS = [
         {
-            "cmd": "create_key name=key_name,type=CephString",
+            "cmd": "restful create-key name=key_name,type=CephString",
             "desc": "Create an API key with this name",
             "perm": "rw"
         },
         {
-            "cmd": "delete_key name=key_name,type=CephString",
+            "cmd": "restful delete-key name=key_name,type=CephString",
             "desc": "Delete an API key with this name",
             "perm": "rw"
         },
         {
-            "cmd": "list_keys",
+            "cmd": "restful list-keys",
             "desc": "List all API keys",
             "perm": "rw"
         },
@@ -326,7 +326,7 @@ class Module(MgrModule):
 
     def handle_command(self, command):
         self.log.warn("Handling command: '%s'" % str(command))
-        if command['prefix'] == "create_key":
+        if command['prefix'] == "restful create-key":
             if command['key_name'] in self.keys:
                 return 0, self.keys[command['key_name']], ""
 
@@ -340,7 +340,7 @@ class Module(MgrModule):
                 "",
             )
 
-        elif command['prefix'] == "delete_key":
+        elif command['prefix'] == "restful delete-key":
             if command['key_name'] in self.keys:
                 del self.keys[command['key_name']]
                 self.set_config_json('keys', self.keys)
@@ -351,7 +351,7 @@ class Module(MgrModule):
                 "",
             )
 
-        elif command['prefix'] == "list_keys":
+        elif command['prefix'] == "restful list-keys":
             return (
                 0,
                 json.dumps(self.get_config_json('keys'), indent=2),

diff --git a/src/vstart.sh b/src/vstart.sh
index f48fdfbea9790abe14c94f20126ad3a222e3b032..fcd727fdc84231b6c09353cb5b098e6ff02276f3 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -653,7 +653,7 @@ EOF
     done
 
     SF=`mktemp`
-    ceph_adm --debug-ms 1 tell mgr.x create_key admin -o $SF
+    ceph_adm tell mgr.x restful create-key admin -o $SF
     RESTFUL_SECRET=`cat $SF`
     rm $SF
 }