You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/02/07 21:04:12 UTC

[16/51] [abbrv] git commit: refs/heads/ui-plugins - cli: Fix attribute error and fix helpdoc

cli: Fix attribute error and fix helpdoc

Signed-off-by: Rohit Yadav <bh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d99f836d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d99f836d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d99f836d

Branch: refs/heads/ui-plugins
Commit: d99f836d5d72fee807569bfb27ba53d2492ccfc8
Parents: 2a0c2be
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Feb 6 16:51:38 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Feb 6 16:54:46 2013 +0530

----------------------------------------------------------------------
 tools/cli/cloudmonkey/cloudmonkey.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d99f836d/tools/cli/cloudmonkey/cloudmonkey.py
----------------------------------------------------------------------
diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py
index db7104a..53f73bd 100644
--- a/tools/cli/cloudmonkey/cloudmonkey.py
+++ b/tools/cli/cloudmonkey/cloudmonkey.py
@@ -65,6 +65,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
     ruler = "="
     cache_file = cache_file
     config_options = []
+    verbs = []
 
     def __init__(self, pname):
         self.program_name = pname
@@ -246,7 +247,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
                                       args_dict.pop('filter').split(',')))
 
         missing_args = []
-        if verb in self.apicache:
+        if verb in self.apicache and subject in self.apicache[verb]:
             missing_args = filter(lambda x: x not in args_dict.keys(),
                            self.apicache[verb][subject]['requiredparams'])
 
@@ -388,7 +389,6 @@ class CloudMonkeyShell(cmd.Cmd, object):
             if subject in self.apicache[verb]:
                 api = self.apicache[verb][subject]
                 helpdoc = "(%s) %s" % (api['name'], api['description'])
-                helpdoc = api['description']
                 if api['isasync']:
                     helpdoc += "\nThis API is asynchronous."
                 required = api['requiredparams']