From 74282d003fd098f12a1eddbb79c9f9edc31ae87b Mon Sep 17 00:00:00 2001 From: Haiwei Xu Date: Thu, 26 Nov 2015 10:40:29 +0900 Subject: [PATCH] Remove Trigger related sources in client side Change-Id: Ibca6c89ce744da264c990bc4192b9db5533de31a Closes-bug: #1520030 --- senlinclient/v1/client.py | 13 ---- senlinclient/v1/models.py | 26 -------- senlinclient/v1/shell.py | 129 -------------------------------------- 3 files changed, 168 deletions(-) diff --git a/senlinclient/v1/client.py b/senlinclient/v1/client.py index 6943755f..81409528 100644 --- a/senlinclient/v1/client.py +++ b/senlinclient/v1/client.py @@ -252,19 +252,6 @@ class Client(object): } return self.action(models.Node, params) - def triggers(self, **queries): - return self.list(models.Trigger, **queries) - - def create_trigger(self, **attrs): - return self.create(models.Trigger, attrs) - - def get_trigger(self, value): - return self.get(models.Trigger, dict(id=value)) - - def delete_trigger(self, value, ignore_missing=True): - return self.delete(models.Trigger, - dict(id=value, ignore_missing=ignore_missing)) - def events(self, **queries): return self.list(models.Event, **queries) diff --git a/senlinclient/v1/models.py b/senlinclient/v1/models.py index bb86ee3c..fc30fb34 100644 --- a/senlinclient/v1/models.py +++ b/senlinclient/v1/models.py @@ -544,32 +544,6 @@ class Node(resource.Resource): } -class Trigger(resource.Resource): - resource_key = 'trigger' - resources_key = 'triggers' - base_path = '/triggers' - service = cluster_service.ClusterService() - - # capabilities - allow_create = True - allow_retrieve = True - # allow_update = True - allow_delete = True - allow_list = True - # patch_update = True - - # properties - id = resource.prop('id') - name = resource.prop('name') - type = resource.prop('type') - spec = resource.prop('spec', type=dict) - state = resource.prop('state') - enabled = resource.prop('enabled') - severity = resource.prop('severity') - created_time = resource.prop('created_time') - deleted_time = resource.prop('deleted_time') - - class Action(resource.Resource): resource_key = 'action' resources_key = 'actions' diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index faea0171..607c9166 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -1190,135 +1190,6 @@ def do_node_leave(sc, args): _show_node(sc, args.id) -# TRIGGERS - - -@utils.arg('-D', '--show-deleted', default=False, action="store_true", - help=_('Include soft-deleted triggers if any.')) -@utils.arg('-l', '--limit', metavar='', - help=_('Limit the number of triggers returned.')) -@utils.arg('-m', '--marker', metavar='', - help=_('Only return triggers that appear after the given ID.')) -@utils.arg('-k', '--sort-keys', metavar='', - help=_('Name of keys used for sorting the returned triggers.')) -@utils.arg('-s', '--sort-dir', metavar='', - help=_('Direction for sorting, where DIR can be "asc" or "desc".')) -@utils.arg('-f', '--filters', metavar='', - help=_('Filter parameters to apply on returned clusters. ' - 'This can be specified multiple times, or once with ' - 'parameters separated by a semicolon.'), - action='append') -@utils.arg('-g', '--global-project', default=False, action="store_true", - help=_('Indicate that the list should include triggers from ' - 'all projects. This option is subject to access policy ' - 'checking. Default is False.')) -@utils.arg('-F', '--full-id', default=False, action="store_true", - help=_('Print full IDs in list.')) -def do_trigger_list(sc, args=None): - '''List triggers that meet the criteria.''' - fields = ['id', 'name', 'type', 'state', 'enabled', 'severity', - 'created_time'] - sort_keys = ['name', 'type', 'state', 'severity', 'created_time', - 'enabled', 'updated_time'] - queries = { - 'limit': args.limit, - 'marker': args.marker, - 'sort_keys': args.sort_keys, - 'sort_dir': args.sort_dir, - 'global_project': args.global_project, - } - - if args.show_deleted is not None: - fields.append('deleted_time') - - if args.filters: - queries.update(utils.format_parameters(args.filters)) - - sortby_index = None - if args.sort_keys: - for key in args.sort_keys.split(';'): - if len(key) > 0 and key not in sort_keys: - raise exc.CommandError(_('Invalid sorting key: %s') % key) - else: - sortby_index = 1 - - triggers = sc.triggers(**queries) - formatters = {} - if not args.full_id: - formatters = { - 'id': _short_id, - } - utils.print_list(triggers, fields, formatters=formatters, - sortby_index=sortby_index) - - -def _show_trigger(sc, trigger_id): - try: - trigger = sc.get_trigger(trigger_id) - except exc.HTTPNotFound: - raise exc.CommandError(_('Trigger not found: %s') % trigger_id) - - formatters = { - 'spec': utils.json_formatter, - } - - utils.print_dict(trigger.to_dict(), formatters=formatters) - - -@utils.arg('-s', '--spec-file', metavar='', required=True, - help=_('The spec file used to create the trigger.')) -@utils.arg('--desc', metavar='', - help=_('A string for describing of the trigger to be created.')) -@utils.arg('-e', '--enabled', default=True, action='store_true', - help=_('Whether the trigger should be enabled when created.')) -@utils.arg('-v', '--severity', - help=_('Severity level of the target trigger to be created.')) -@utils.arg('--state', - help=_('Initial state of the target trigger.')) -@utils.arg('name', metavar='', - help=_('Name of the trigger to create.')) -def do_trigger_create(sc, args): - '''Create a trigger.''' - - spec = utils.get_spec_content(args.spec_file) - params = { - 'name': args.name, - 'spec': spec, - 'enabled': args.enabled, - 'severity': args.severity, - 'state': args.state, - 'description': args.desc, - } - - trigger = sc.create_trigger(**params) - _show_trigger(sc, trigger.id) - - -@utils.arg('id', metavar='', - help=_('Name or ID of trigger to show.')) -def do_trigger_show(sc, args): - '''Show the trigger details.''' - _show_trigger(sc, args.id) - - -@utils.arg('id', metavar='', nargs='+', - help=_('Name or ID of trigger(s) to delete.')) -def do_trigger_delete(sc, args): - '''Delete trigger(s).''' - failure_count = 0 - - for tid in args.id: - try: - sc.delete_trigger(tid) - except exc.HTTPNotFound as ex: - failure_count += 1 - print(ex) - if failure_count > 0: - msg = _('Failed to delete some of the specified trigger(s).') - raise exc.CommandError(msg) - print('Triggers deleted: %s' % args.id) - - # EVENTS