Commit 905a492c authored by Seblu's avatar Seblu
Browse files

multiple command cleaning

parent eb4a13af

cccli/command.py

+27 −36
Original line number Diff line number Diff line
@@ -71,19 +71,16 @@ class Command(object): 
        '''Quit application with respect'''

        raise SystemExit()

    cmd_exit.usage = "exit"

    cmd_exit.desc = "Quit application with respect"



    def cmd_quit(self, argv):

        '''Quit application with respect'''

        raise SystemExit()

    cmd_quit.usage = "quit"

    cmd_quit.desc = "Quit application with respect"



    def cmd_version(self, argv):

        '''Print cli version'''

        self.printer.out(cccli.version)

    cmd_version.usage = "version"

    cmd_version.desc = "Print cli version"



    def cmd_usage(self, argv):

        '''Print usage of a command'''
@@ -94,8 +91,7 @@ class Command(object): 
            self.printer.out("usage: %s"%usage)

        else:

            self.printer.out("No usage.")

    cmd_usage.usage = "usage [command]"

    cmd_usage.desc = "Print usage of a command"

    cmd_usage.usage = "usage <command>"



    def cmd_help(self, argv):

        '''Print help'''
@@ -131,7 +127,6 @@ class Command(object): 
        else:

            raise cmdBadArgument()

    cmd_help.usage = "help [command]"

    cmd_help.desc = "Print help about a command"



    def cmd_alias(self, argv):

        '''Show or create alias'''
@@ -148,7 +143,6 @@ class Command(object): 
        else:

            raise cmdBadArgument()

    cmd_alias.usage = "alias [name] [value]"

    cmd_alias.desc = "Show or create aliases"



    def cmd_unalias(self, argv):

        '''Remove an alias'''
@@ -159,23 +153,20 @@ class Command(object): 
        del self.cli.alias[argv[1]]

        self.cli.alias.save(self.cli.settings.get("alias", ""))

    cmd_unalias.usage = "unalias [name]"

    cmd_unalias.desc = "Remove an aliases"



    def cmd_rcmd(self, argv):

        '''Show remote commands'''

    def cmd_remote(self, argv):

        '''Show remote command list'''

        for cmds in self.cli.rpc.call("list_commands"):

            self.printer.out("%s"%cmds["name"])

    cmd_rcmd.usage = "rcmd"

    cmd_rcmd.desc = "Print remote command list"

    cmd_remote.usage = "remote"



    def cmd_history(self, argv):

        '''Show history of commands'''

        '''Show commands history'''

        if not self.printer.history:

            raise cmdError("not available")

        for l in self.printer.history:

            self.printer.out(l)

    cmd_history.usage = "history"

    cmd_history.desc = "Show commands history"



    def cmd_list(self, argv):

        '''List objects'''
@@ -197,7 +188,7 @@ class Command(object): 
            self._list_table(objs)

        else:

            self._list(objs)

    cmd_list.usage = "list [-t] [--help] tql"

    cmd_list.usage = "list [-t] [--help] <tql>"



    def _list(self, objs):

        for o in objs:
@@ -287,29 +278,29 @@ class Command(object): 
                    self.printer.error("RPCError: %s"%str(e))



    def cmd_start(self, argv):

        '''Start objects'''

        '''Start vm'''

        self._vm_action(argv, "&role=vm&status=stopped")

    cmd_start.usage = "start [--raw] [--direct] [--force] [--help] tql"

    cmd_start.usage = "start [--raw] [--direct] [--force] [--help] <tql>"



    def cmd_stop(self, argv):

        '''Stop objects'''

        '''Stop vm'''

        self._vm_action(argv, "&role=vm&status=running")

    cmd_stop.usage = "stop [--raw] [--direct] [--force] [--help] tql"

    cmd_stop.usage = "stop [--raw] [--direct] [--force] [--help] <tql>"



    def cmd_pause(self, argv):

        '''Pause objects'''

        '''Pause vm'''

        self._vm_action(argv, "&role=vm&status=running")

    cmd_pause.usage = "pause [--raw] [--direct] [--force] [--help] tql"

    cmd_pause.usage = "pause [--raw] [--direct] [--force] [--help] <tql>"



    def cmd_resume(self, argv):

        '''Resume objects'''

        '''Resume vm'''

        self._vm_action(argv, "&role=vm&status=stalled")

    cmd_resume.usage = "resume [--raw] [--direct] [--force] [--help] tql"

    cmd_resume.usage = "resume [--raw] [--direct] [--force] [--help] <tql>"



    def cmd_destroy(self, argv):

        '''Force objects to stop'''

        '''Force vm to stop'''

        self._vm_action(argv, "&role=vm&status!=stopped")

    cmd_destroy.usage = "destroy [--raw] [--direct] [--force] [--help] tql"

    cmd_destroy.usage = "destroy [--raw] [--direct] [--force] [--help] <tql>"



    def cmd_clear(self, argv):

        '''Clear tty'''
@@ -358,7 +349,7 @@ class Command(object): 
            id = o.pop("id")

            tags = " ".join([ "%s%s:%s%s"%(color["green"], t, color["reset"], v) for (t,v) in o.items() ])

            self.printer.out("%sid:%s%s%s %s"%(color["green"], color["yellow"], id, color["reset"], tags))

    cmd_tags.usage = "tags [--raw] [--help] [account tql]"

    cmd_tags.usage = "tags [--raw] [--help] [tql]"



    def cmd_addtag(self, argv):

        '''Add/Modify a static tag on an account'''
@@ -368,7 +359,7 @@ class Command(object): 
            self.cli.rpc.call("addtag", argv[1], argv[2], argv[3])

        except RpcError as e:

            raise cmdError("RPCError: %s"%str(e))

    cmd_addtag.usage = "addtag <account> <tag> <value>"

    cmd_addtag.usage = "addtag <tql> <tag> <value>"



    def cmd_deltag(self, argv):

        '''Delete a static tag from an account'''
@@ -378,7 +369,7 @@ class Command(object): 
            self.cli.rpc.call("deltag", argv[1], argv[2])

        except RpcError as e:

            raise cmdError("RPCError: %s"%str(e))

    cmd_deltag.usage = "deltag <account> <tag>"

    cmd_deltag.usage = "deltag <tql> <tag>"



    def cmd_rights(self, argv):

        '''List account rights (current by default)'''
@@ -419,7 +410,7 @@ class Command(object): 
            self.cli.rpc.call("addright", argv[1], argv[2], argv[3], argv[4])

        except RpcError as e:

            raise cmdError("RPCError: %s"%str(e))

    cmd_addright.usage = "addright <account> <right tql> <method> <allow>"

    cmd_addright.usage = "addright <tql> <right tql> <method> <allow>"



    def cmd_delright(self, argv):

        '''Delete a right'''
@@ -439,7 +430,7 @@ class Command(object): 
            self.cli.rpc.call("addaccount", argv[1], argv[2])

        except RpcError as e:

            raise cmdError("RPCError: %s"%str(e))

    cmd_addaccount.usage = "addaccount <account> <role>"

    cmd_addaccount.usage = "addaccount <account name> <role>"



    def cmd_delaccount(self, argv):

        '''Delete an account'''
@@ -449,7 +440,7 @@ class Command(object): 
            self.cli.rpc.call("delaccount", argv[1])

        except RpcError as e:

            raise cmdError("RPCError: %s"%str(e))

    cmd_delaccount.usage = "delaccount <account>"

    cmd_delaccount.usage = "delaccount <tql>"



    def cmd_passwd(self, argv):

        '''Change account password'''
@@ -505,7 +496,7 @@ class Command(object): 
            self.cli.rpc.call("close", argv[1])

        except RpcError as e:

            raise cmdError("RPCError: %s"%str(e))

    cmd_close.usage = "close <account tql>"

    cmd_close.usage = "close <tql>"



    def cmd_declose(self, argv):

        '''Open closed accounts'''
@@ -515,7 +506,7 @@ class Command(object): 
            self.cli.rpc.call("declose", argv[1])

        except RpcError as e:

            raise cmdError("RPCError: %s"%str(e))

    cmd_declose.usage = "declose <account tql>"

    cmd_declose.usage = "declose <tql>"





class Alias(dict):