Remove Trigger related sources in client side
Change-Id: Ibca6c89ce744da264c990bc4192b9db5533de31a Closes-bug: #1520030
This commit is contained in:
Haiwei Xu
parent
8efe9e7e9e
commit
74282d003f
@ -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)
|
||||
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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='<LIMIT>',
|
||||
help=_('Limit the number of triggers returned.'))
|
||||
@utils.arg('-m', '--marker', metavar='<ID>',
|
||||
help=_('Only return triggers that appear after the given ID.'))
|
||||
@utils.arg('-k', '--sort-keys', metavar='<KEYS>',
|
||||
help=_('Name of keys used for sorting the returned triggers.'))
|
||||
@utils.arg('-s', '--sort-dir', metavar='<DIR>',
|
||||
help=_('Direction for sorting, where DIR can be "asc" or "desc".'))
|
||||
@utils.arg('-f', '--filters', metavar='<KEY1=VALUE1;KEY2=VALUE2...>',
|
||||
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='<SPEC FILE>', required=True,
|
||||
help=_('The spec file used to create the trigger.'))
|
||||
@utils.arg('--desc', metavar='<DESCRIPTION>',
|
||||
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='<TRIGGER_NAME>',
|
||||
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='<TRIGGER>',
|
||||
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='<TRIGGER>', 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
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user