From 480d0fb4390de27b225722e72cb95686f5c42ff8 Mon Sep 17 00:00:00 2001 From: WuKong Date: Wed, 23 Sep 2015 11:58:00 +0200 Subject: review moonclient Change-Id: I0969fe42fd756c025d549d0cffe07943cddd2d15 Signed-off-by: WuKong --- moonclient/setup.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'moonclient/setup.py') diff --git a/moonclient/setup.py b/moonclient/setup.py index b2bf612b..5e090529 100644 --- a/moonclient/setup.py +++ b/moonclient/setup.py @@ -58,9 +58,9 @@ setup( 'moon = moonclient.shell:main' ], 'moon.client': [ - 'templates_list = moonclient.configuration:TemplatesList', - 'aggregation_algorithms_list = moonclient.configuration:AggregationAlgorithmsList', - 'submetarule_algorithms_list = moonclient.configuration:SubMetaRuleAlgorithmsList', + 'template_list = moonclient.configuration:TemplatesList', + 'aggregation_algorithm_list = moonclient.configuration:AggregationAlgorithmsList', + 'submetarule_algorithm_list = moonclient.configuration:SubMetaRuleAlgorithmsList', 'tenant_add = moonclient.tenants:TenantAdd', 'tenant_set = moonclient.tenants:TenantSet', @@ -83,15 +83,6 @@ setup( 'action_list = moonclient.actions:ActionsList', 'action_add = moonclient.actions:ActionsAdd', 'action_delete = moonclient.actions:ActionsDelete', - 'action_assignment_list = moonclient.action_assignments:ActionAssignmentsList', - 'action_assignment_add = moonclient.action_assignments:ActionAssignmentsAdd', - 'action_assignment_delete = moonclient.action_assignments:ActionAssignmentsDelete', - 'object_assignment_list = moonclient.object_assignments:ObjectAssignmentsList', - 'object_assignment_add = moonclient.object_assignments:ObjectAssignmentsAdd', - 'object_assignment_delete = moonclient.object_assignments:ObjectAssignmentsDelete', - 'subject_assignment_list = moonclient.subject_assignments:SubjectAssignmentsList', - 'subject_assignment_add = moonclient.subject_assignments:SubjectAssignmentsAdd', - 'subject_assignment_delete = moonclient.subject_assignments:SubjectAssignmentsDelete', 'subject_category_list = moonclient.subject_categories:SubjectCategoriesList', 'subject_category_add = moonclient.subject_categories:SubjectCategoriesAdd', 'subject_category_delete = moonclient.subject_categories:SubjectCategoriesDelete', @@ -101,15 +92,24 @@ setup( 'action_category_list = moonclient.action_categories:ActionCategoriesList', 'action_category_add = moonclient.action_categories:ActionCategoriesAdd', 'action_category_delete = moonclient.action_categories:ActionCategoriesDelete', - 'subject_scope_list = moonclient.subject_category_scope:SubjectCategoryScopeList', - 'subject_scope_add = moonclient.subject_category_scope:SubjectCategoryScopeAdd', - 'subject_scope_delete = moonclient.subject_category_scope:SubjectCategoryScopeDelete', - 'object_scope_list = moonclient.object_category_scope:ObjectCategoryScopeList', - 'object_scope_add = moonclient.object_category_scope:ObjectCategoryScopeAdd', - 'object_scope_delete = moonclient.object_category_scope:ObjectCategoryScopeDelete', - 'action_scope_list = moonclient.action_category_scope:ActionCategoryScopeList', - 'action_scope_add = moonclient.action_category_scope:ActionCategoryScopeAdd', - 'action_scope_delete = moonclient.action_category_scope:ActionCategoryScopeDelete', + 'subject_scope_list = moonclient.subject_scope:SubjectScopesList', + 'subject_scope_add = moonclient.subject_scope:SubjectScopesAdd', + 'subject_scope_delete = moonclient.subject_scope:SubjectScopesDelete', + 'object_scope_list = moonclient.object_scope:ObjectScopesList', + 'object_scope_add = moonclient.object_scope:ObjectScopesAdd', + 'object_scope_delete = moonclient.object_scope:ObjectScopesDelete', + 'action_scope_list = moonclient.action_scope:ActionScopesList', + 'action_scope_add = moonclient.action_scope:ActionScopesAdd', + 'action_scope_delete = moonclient.action_scope:ActionScopesDelete', + 'subject_assignment_list = moonclient.subject_assignments:SubjectAssignmentsList', + 'subject_assignment_add = moonclient.subject_assignments:SubjectAssignmentsAdd', + 'subject_assignment_delete = moonclient.subject_assignments:SubjectAssignmentsDelete', + 'object_assignment_list = moonclient.object_assignments:ObjectAssignmentsList', + 'object_assignment_add = moonclient.object_assignments:ObjectAssignmentsAdd', + 'object_assignment_delete = moonclient.object_assignments:ObjectAssignmentsDelete', + 'action_assignment_list = moonclient.action_assignments:ActionAssignmentsList', + 'action_assignment_add = moonclient.action_assignments:ActionAssignmentsAdd', + 'action_assignment_delete = moonclient.action_assignments:ActionAssignmentsDelete', 'aggregation_algorithm_show = moonclient.metarules:AggregationAlgorithmsList', 'aggregation_algorithm_set = moonclient.metarules:AggregationAlgorithmSet', @@ -124,7 +124,7 @@ setup( 'log = moonclient.logs:LogsList', - 'tests = moonclient.tests:TestsLaunch', + 'test = moonclient.tests:TestsLaunch', ], }, -- cgit 1.2.3-korg