[spp] [PATCH 02/10] controller: move server help msg to SppCtlServer
yasufum.o at gmail.com
yasufum.o at gmail.com
Mon Jun 24 09:11:16 CEST 2019
From: Yasufumi Ogawa <yasufum.o at gmail.com>
This patch is to move comment of `do_server` to `SppCtlServer.help` to
reduce the number of lines.
Signed-off-by: Yasufumi Ogawa <yasufum.o at gmail.com>
---
src/controller/commands/server.py | 33 +++++++++++++++++++++++++++++++
src/controller/shell.py | 33 +++++--------------------------
2 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/src/controller/commands/server.py b/src/controller/commands/server.py
index c2bda9d..2b5913a 100644
--- a/src/controller/commands/server.py
+++ b/src/controller/commands/server.py
@@ -258,3 +258,36 @@ class SppCtlServer(object):
removed.ip_addr, removed.port))
return True
+
+ @classmethod
+ def help(cls):
+ msg = """Switch SPP REST API server.
+
+ Show a list of servers. '*' means that it is under the control.
+
+ spp > server # or 'server list'
+ 1: 192.168.1.101:7777 *
+ 2: 192.168.1.102:7777
+
+ Switch to the second node with index or address.
+
+ spp > server 2
+ Switch spp-ctl to "2: 192.168.1.102:7777".
+
+ # It is the same
+ spp > server 192.168.1.101 # no need port if default
+ Switch spp-ctl to "1: 192.168.1.101:7777".
+
+ Register or unregister a node by using 'add' or 'del' command.
+ For unregistering, node is also specified with index.
+
+ # Register third node
+ spp > server add 192.168.122.177
+ Registered spp-ctl "192.168.122.177:7777".
+
+ # Unregister second one
+ spp > server del 2 # or 192.168.1.102
+ Unregistered spp-ctl "192.168.1.102:7777".
+ """
+
+ print(msg)
diff --git a/src/controller/shell.py b/src/controller/shell.py
index 75dabaa..b86ba5c 100644
--- a/src/controller/shell.py
+++ b/src/controller/shell.py
@@ -253,38 +253,15 @@ class Shell(cmd.Cmd, object):
self.recorded_file = None
def do_server(self, commands):
- """Switch SPP REST API server.
-
- Show a list of servers. '*' means that it is under the control.
-
- spp > server # or 'server list'
- 1: 192.168.1.101:7777 *
- 2: 192.168.1.102:7777
-
- Switch to the second node with index or address.
-
- spp > server 2
- Switch spp-ctl to "2: 192.168.1.102:7777".
-
- # It is the same
- spp > server 192.168.1.101 # no need port if default
- Switch spp-ctl to "1: 192.168.1.101:7777".
-
- Register or unregister a node by using 'add' or 'del' command.
- For unregistering, node is also specified with index.
-
- # Register third node
- spp > server add 192.168.122.177
- Registered spp-ctl "192.168.122.177:7777".
-
- # Unregister second one
- spp > server del 2 # or 192.168.1.102
- Unregistered spp-ctl "192.168.1.102:7777".
- """
+ """Switch SPP REST API server."""
self.spp_ctl_server.run(commands)
self.spp_ctl_cli = self.spp_ctl_server.get_current_server()
+ def help_server(self):
+ """Print help message of server command."""
+ server.SppCtlServer.help()
+
def complete_server(self, text, line, begidx, endidx):
"""Completion for server command."""
--
2.17.1
More information about the spp
mailing list