diff options
author | asteroide <thomas.duval@orange.com> | 2015-09-17 17:21:23 +0200 |
---|---|---|
committer | asteroide <thomas.duval@orange.com> | 2015-09-17 17:21:23 +0200 |
commit | c2ed6c402f585bcff02a50daa4f6abc5090fde38 (patch) | |
tree | 264f3988a85434de17ff6a78cff49501730c42fa /moonclient/moonclient/object_categories.py | |
parent | b48cd70f5c2c115e1ed401492eaa62aa610ceaeb (diff) |
Fix subject, object and action categories commands and add tests for them.
Change-Id: I36dac141516da4a21c71cd7dadbb468fde255df7
Diffstat (limited to 'moonclient/moonclient/object_categories.py')
-rw-r--r-- | moonclient/moonclient/object_categories.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/moonclient/moonclient/object_categories.py b/moonclient/moonclient/object_categories.py index caae13c3..6c0076ff 100644 --- a/moonclient/moonclient/object_categories.py +++ b/moonclient/moonclient/object_categories.py @@ -28,11 +28,9 @@ class ObjectCategoriesList(Lister): parsed_args.intraextension = self.app.intraextension data = self.app.get_url("/v3/OS-MOON/intra_extensions/{}/object_categories".format(parsed_args.intraextension), authtoken=True) - if "object_categories" not in data: - raise Exception("Error in command {}: {}".format("ObjectCategoriesList", data)) return ( - ("object_categories",), - ((_uuid, ) for _uuid in data["object_categories"]) + ("id", "name", "description"), + ((_uuid, data[_uuid]["name"], data[_uuid]["description"]) for _uuid in data) ) @@ -53,19 +51,25 @@ class ObjectCategoriesAdd(Command): metavar='<intraextension-uuid>', help='IntraExtension UUID', ) + parser.add_argument( + '--description', + metavar='<description-str>', + help='Category description', + ) return parser def take_action(self, parsed_args): if not parsed_args.intraextension: parsed_args.intraextension = self.app.intraextension data = self.app.get_url("/v3/OS-MOON/intra_extensions/{}/object_categories".format(parsed_args.intraextension), - post_data={"object_category_id": parsed_args.object_category}, + post_data={ + "object_category_name": parsed_args.object_category, + "object_category_description": parsed_args.description, + }, authtoken=True) - if "object_categories" not in data: - raise Exception("Error in command {}".format(data)) return ( - ("object_categories",), - ((_uuid, ) for _uuid in data["object_categories"]) + ("id", "name", "description"), + ((_uuid, data[_uuid]["name"], data[_uuid]["description"]) for _uuid in data) ) |