Updated Branches: refs/heads/4.1 dd675a16d -> 2ce6b80a2
cli: Fix attribute error and fix helpdoc Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2ce6b80a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2ce6b80a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2ce6b80a Branch: refs/heads/4.1 Commit: 2ce6b80a24561c461b68ec642db9f057a8f7ff18 Parents: e234fcf Author: Rohit Yadav <[email protected]> Authored: Wed Feb 6 16:51:38 2013 +0530 Committer: Rohit Yadav <[email protected]> Committed: Wed Feb 6 16:57:29 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/2ce6b80a/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']
