X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osmclient%2Fscripts%2Fosm.py;h=fe140dd48382f4347d1b49036bed08de43e985cc;hb=refs%2Fchanges%2F19%2F8119%2F1;hp=b11ced4670014b41e1d0ceab4ba695e42ce4a6b9;hpb=7b716df9faa2fbe223b7525118842988d97fbd5e;p=osm%2Fosmclient.git diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index b11ced4..fe140dd 100755 --- a/osmclient/scripts/osm.py +++ b/osmclient/scripts/osm.py @@ -26,6 +26,7 @@ import yaml import json import time import pycurl +import os def check_client_version(obj, what, version='sol005'): @@ -52,62 +53,63 @@ def check_client_version(obj, what, version='sol005'): envvar='OSM_HOSTNAME', help='hostname of server. ' + 'Also can set OSM_HOSTNAME in environment') -@click.option('--sol005/--no-sol005', - default=True, - envvar='OSM_SOL005', - help='Use ETSI NFV SOL005 API (default) or the previous SO API. ' + - 'Also can set OSM_SOL005 in environment') +#@click.option('--sol005/--no-sol005', +# default=True, +# envvar='OSM_SOL005', +# help='Use ETSI NFV SOL005 API (default) or the previous SO API. ' + +# 'Also can set OSM_SOL005 in environment') @click.option('--user', default=None, envvar='OSM_USER', - help='user (only from Release FOUR, defaults to admin). ' + + help='user (defaults to admin). ' + 'Also can set OSM_USER in environment') @click.option('--password', default=None, envvar='OSM_PASSWORD', - help='password (only from Release FOUR, defaults to admin). ' + + help='password (defaults to admin). ' + 'Also can set OSM_PASSWORD in environment') @click.option('--project', default=None, envvar='OSM_PROJECT', - help='project (only from Release FOUR, defaults to admin). ' + + help='project (defaults to admin). ' + 'Also can set OSM_PROJECT in environment') -@click.option('--so-port', - default=None, - envvar='OSM_SO_PORT', - help='hostname of server. ' + - 'Also can set OSM_SO_PORT in environment') -@click.option('--so-project', - default=None, - envvar='OSM_SO_PROJECT', - help='Project Name in SO. ' + - 'Also can set OSM_SO_PROJECT in environment') -@click.option('--ro-hostname', - default=None, - envvar='OSM_RO_HOSTNAME', - help='hostname of RO server. ' + - 'Also can set OSM_RO_HOSTNAME in environment') -@click.option('--ro-port', - default=None, - envvar='OSM_RO_PORT', - help='hostname of RO server. ' + - 'Also can set OSM_RO_PORT in environment') -@click.pass_context -def cli(ctx, hostname, sol005, user, password, project, so_port, so_project, ro_hostname, ro_port): +#@click.option('--so-port', +# default=None, +# envvar='OSM_SO_PORT', +# help='hostname of server. ' + +# 'Also can set OSM_SO_PORT in environment') +#@click.option('--so-project', +# default=None, +# envvar='OSM_SO_PROJECT', +# help='Project Name in SO. ' + +# 'Also can set OSM_SO_PROJECT in environment') +#@click.option('--ro-hostname', +# default=None, +# envvar='OSM_RO_HOSTNAME', +# help='hostname of RO server. ' + +# 'Also can set OSM_RO_HOSTNAME in environment') +#@click.option('--ro-port', +# default=None, +# envvar='OSM_RO_PORT', +# help='hostname of RO server. ' + +# 'Also can set OSM_RO_PORT in environment') +@click.pass_context +def cli(ctx, hostname, user, password, project): if hostname is None: print(( "either hostname option or OSM_HOSTNAME " + "environment variable needs to be specified")) exit(1) kwargs={} - if so_port is not None: - kwargs['so_port']=so_port - if so_project is not None: - kwargs['so_project']=so_project - if ro_hostname is not None: - kwargs['ro_host']=ro_hostname - if ro_port is not None: - kwargs['ro_port']=ro_port +# if so_port is not None: +# kwargs['so_port']=so_port +# if so_project is not None: +# kwargs['so_project']=so_project +# if ro_hostname is not None: +# kwargs['ro_host']=ro_hostname +# if ro_port is not None: +# kwargs['ro_port']=ro_port + sol005 = os.getenv('OSM_SOL005', True) if user is not None: kwargs['user']=user if password is not None: @@ -217,7 +219,7 @@ def nsd_list(ctx, filter): resp = ctx.obj.nsd.list(filter) else: resp = ctx.obj.nsd.list() - # print yaml.safe_dump(resp) + # print(yaml.safe_dump(resp)) table = PrettyTable(['nsd name', 'id']) fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__ if fullclassname == 'osmclient.sol005.client.Client': @@ -271,7 +273,7 @@ def vnfd_list(ctx, nf_type, filter): resp = ctx.obj.vnfd.list(filter) else: resp = ctx.obj.vnfd.list() - # print yaml.safe_dump(resp) + # print(yaml.safe_dump(resp)) table = PrettyTable(['nfpkg name', 'id']) fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__ if fullclassname == 'osmclient.sol005.client.Client': @@ -518,7 +520,7 @@ def nst_list(ctx, filter): except ClientException as inst: print((inst.message)) exit(1) - # print yaml.safe_dump(resp) + # print(yaml.safe_dump(resp)) table = PrettyTable(['nst name', 'id']) for nst in resp: name = nst['name'] if 'name' in nst else '-' @@ -792,50 +794,50 @@ def vnf_show(ctx, name, literal, filter): print(table) -@cli.command(name='vnf-monitoring-show') -@click.argument('vnf_name') -@click.pass_context -def vnf_monitoring_show(ctx, vnf_name): - try: - check_client_version(ctx.obj, ctx.command.name, 'v1') - resp = ctx.obj.vnf.get_monitoring(vnf_name) - except ClientException as inst: - print((inst.message)) - exit(1) - - table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units']) - if resp is not None: - for monitor in resp: - table.add_row( - [vnf_name, - monitor['name'], - monitor['value-integer'], - monitor['units']]) - table.align = 'l' - print(table) - - -@cli.command(name='ns-monitoring-show') -@click.argument('ns_name') -@click.pass_context -def ns_monitoring_show(ctx, ns_name): - try: - check_client_version(ctx.obj, ctx.command.name, 'v1') - resp = ctx.obj.ns.get_monitoring(ns_name) - except ClientException as inst: - print((inst.message)) - exit(1) - - table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units']) - for key, val in list(resp.items()): - for monitor in val: - table.add_row( - [key, - monitor['name'], - monitor['value-integer'], - monitor['units']]) - table.align = 'l' - print(table) +#@cli.command(name='vnf-monitoring-show') +#@click.argument('vnf_name') +#@click.pass_context +#def vnf_monitoring_show(ctx, vnf_name): +# try: +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# resp = ctx.obj.vnf.get_monitoring(vnf_name) +# except ClientException as inst: +# print((inst.message)) +# exit(1) +# +# table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units']) +# if resp is not None: +# for monitor in resp: +# table.add_row( +# [vnf_name, +# monitor['name'], +# monitor['value-integer'], +# monitor['units']]) +# table.align = 'l' +# print(table) + + +#@cli.command(name='ns-monitoring-show') +#@click.argument('ns_name') +#@click.pass_context +#def ns_monitoring_show(ctx, ns_name): +# try: +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# resp = ctx.obj.ns.get_monitoring(ns_name) +# except ClientException as inst: +# print((inst.message)) +# exit(1) +# +# table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units']) +# for key, val in list(resp.items()): +# for monitor in val: +# table.add_row( +# [key, +# monitor['name'], +# monitor['value-integer'], +# monitor['units']]) +# table.align = 'l' +# print(table) @cli.command(name='ns-op-show', short_help='shows the info of an operation') @@ -1329,7 +1331,6 @@ def pdu_create(ctx, name, pdu_type, interface, description, vim_account, descrip print((inst.message)) exit(1) - #################### # UPDATE operations #################### @@ -1655,9 +1656,9 @@ def pdu_delete(ctx, name, force): exit(1) -#################### +################# # VIM operations -#################### +################# @cli.command(name='vim-create') @click.option('--name', @@ -1810,23 +1811,23 @@ def vim_delete(ctx, name, force, wait): @cli.command(name='vim-list') -@click.option('--ro_update/--no_ro_update', - default=False, - help='update list from RO') +#@click.option('--ro_update/--no_ro_update', +# default=False, +# help='update list from RO') @click.option('--filter', default=None, help='restricts the list to the VIM accounts matching the filter') @click.pass_context -def vim_list(ctx, ro_update, filter): +def vim_list(ctx, filter): """list all VIM accounts""" if filter: check_client_version(ctx.obj, '--filter') - if ro_update: - check_client_version(ctx.obj, '--ro_update', 'v1') +# if ro_update: +# check_client_version(ctx.obj, '--ro_update', 'v1') fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__ if fullclassname == 'osmclient.sol005.client.Client': resp = ctx.obj.vim.list(filter) - else: - resp = ctx.obj.vim.list(ro_update) +# else: +# resp = ctx.obj.vim.list(ro_update) table = PrettyTable(['vim name', 'uuid']) for vim in resp: table.add_row([vim['name'], vim['uuid']]) @@ -2104,7 +2105,7 @@ def sdnc_create(ctx, ctx.obj.sdnc.create(name, sdncontroller, wait=wait) except ClientException as inst: print((inst.message)) - + exit(1) @cli.command(name='sdnc-update', short_help='updates an SDN controller') @click.argument('name') @@ -2204,7 +2205,7 @@ def sdnc_list(ctx, filter): except ClientException as inst: print((inst.message)) exit(1) - table = PrettyTable(['name', 'id']) + table = PrettyTable(['sdnc name', 'id']) for sdnc in resp: table.add_row([sdnc['name'], sdnc['_id']]) table.align = 'l' @@ -2255,6 +2256,7 @@ def project_create(ctx, name): ctx.obj.project.create(name, project) except ClientException as inst: print(inst.message) + exit(1) @cli.command(name='project-delete') @@ -2382,6 +2384,7 @@ def user_create(ctx, username, password, projects, project_role_mappings): ctx.obj.user.create(username, user) except ClientException as inst: print(inst.message) + exit(1) @cli.command(name='user-update') @@ -2433,6 +2436,7 @@ def user_update(ctx, username, password, set_username, set_project, remove_proje ctx.obj.user.update(username, user) except ClientException as inst: print(inst.message) + exit(1) @cli.command(name='user-delete') @@ -2521,19 +2525,21 @@ def user_show(ctx, name): def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity, threshold_value, threshold_operator, statistic): """creates a new alarm for a NS instance""" - ns_instance = ctx.obj.ns.get(ns) - alarm = {} - alarm['alarm_name'] = name - alarm['ns_id'] = ns_instance['_id'] - alarm['correlation_id'] = ns_instance['_id'] - alarm['vnf_member_index'] = vnf - alarm['vdu_name'] = vdu - alarm['metric_name'] = metric - alarm['severity'] = severity - alarm['threshold_value'] = int(threshold_value) - alarm['operation'] = threshold_operator - alarm['statistic'] = statistic - try: + # TODO: Check how to validate threshold_value. + # Should it be an integer (1-100), percentage, or decimal (0.01-1.00)? + try: + ns_instance = ctx.obj.ns.get(ns) + alarm = {} + alarm['alarm_name'] = name + alarm['ns_id'] = ns_instance['_id'] + alarm['correlation_id'] = ns_instance['_id'] + alarm['vnf_member_index'] = vnf + alarm['vdu_name'] = vdu + alarm['metric_name'] = metric + alarm['severity'] = severity + alarm['threshold_value'] = int(threshold_value) + alarm['operation'] = threshold_operator + alarm['statistic'] = statistic check_client_version(ctx.obj, ctx.command.name) ctx.obj.ns.create_alarm(alarm) except ClientException as inst: @@ -2575,16 +2581,18 @@ def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity, @click.pass_context def ns_metric_export(ctx, ns, vnf, vdu, metric, interval): """exports a metric to the internal OSM bus, which can be read by other apps""" - ns_instance = ctx.obj.ns.get(ns) - metric_data = {} - metric_data['ns_id'] = ns_instance['_id'] - metric_data['correlation_id'] = ns_instance['_id'] - metric_data['vnf_member_index'] = vnf - metric_data['vdu_name'] = vdu - metric_data['metric_name'] = metric - metric_data['collection_unit'] = 'WEEK' - metric_data['collection_period'] = 1 - try: + # TODO: Check how to validate interval. + # Should it be an integer (seconds), or should a suffix (s,m,h,d,w) also be permitted? + try: + ns_instance = ctx.obj.ns.get(ns) + metric_data = {} + metric_data['ns_id'] = ns_instance['_id'] + metric_data['correlation_id'] = ns_instance['_id'] + metric_data['vnf_member_index'] = vnf + metric_data['vdu_name'] = vdu + metric_data['metric_name'] = metric + metric_data['collection_unit'] = 'WEEK' + metric_data['collection_period'] = 1 check_client_version(ctx.obj, ctx.command.name) if not interval: print('{}'.format(ctx.obj.ns.export_metric(metric_data))) @@ -2621,161 +2629,163 @@ def upload_package(ctx, filename): exit(1) -@cli.command(name='ns-scaling-show') -@click.argument('ns_name') -@click.pass_context -def show_ns_scaling(ctx, ns_name): - """shows the status of a NS scaling operation - - NS_NAME: name of the NS instance being scaled - """ - try: - check_client_version(ctx.obj, ctx.command.name, 'v1') - resp = ctx.obj.ns.list() - except ClientException as inst: - print((inst.message)) - exit(1) - - table = PrettyTable( - ['group-name', - 'instance-id', - 'operational status', - 'create-time', - 'vnfr ids']) - - for ns in resp: - if ns_name == ns['name']: - nsopdata = ctx.obj.ns.get_opdata(ns['id']) - scaling_records = nsopdata['nsr:nsr']['scaling-group-record'] - for record in scaling_records: - if 'instance' in record: - instances = record['instance'] - for inst in instances: - table.add_row( - [record['scaling-group-name-ref'], - inst['instance-id'], - inst['op-status'], - time.strftime('%Y-%m-%d %H:%M:%S', - time.localtime( - inst['create-time'])), - inst['vnfrs']]) - table.align = 'l' - print(table) - - -@cli.command(name='ns-scale') -@click.argument('ns_name') -@click.option('--ns_scale_group', prompt=True) -@click.option('--index', prompt=True) -@click.option('--wait', - required=False, - default=False, - is_flag=True, - help='do not return the control immediately, but keep it \ - until the operation is completed, or timeout') -@click.pass_context -def ns_scale(ctx, ns_name, ns_scale_group, index, wait): - """scales NS - - NS_NAME: name of the NS instance to be scaled - """ - try: - check_client_version(ctx.obj, ctx.command.name, 'v1') - ctx.obj.ns.scale(ns_name, ns_scale_group, index, wait=wait) - except ClientException as inst: - print((inst.message)) - exit(1) - - -@cli.command(name='config-agent-list') -@click.pass_context -def config_agent_list(ctx): - """list config agents""" - try: - check_client_version(ctx.obj, ctx.command.name, 'v1') - except ClientException as inst: - print((inst.message)) - exit(1) - table = PrettyTable(['name', 'account-type', 'details']) - for account in ctx.obj.vca.list(): - table.add_row( - [account['name'], - account['account-type'], - account['juju']]) - table.align = 'l' - print(table) - +#@cli.command(name='ns-scaling-show') +#@click.argument('ns_name') +#@click.pass_context +#def show_ns_scaling(ctx, ns_name): +# """shows the status of a NS scaling operation +# +# NS_NAME: name of the NS instance being scaled +# """ +# try: +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# resp = ctx.obj.ns.list() +# except ClientException as inst: +# print((inst.message)) +# exit(1) +# +# table = PrettyTable( +# ['group-name', +# 'instance-id', +# 'operational status', +# 'create-time', +# 'vnfr ids']) +# +# for ns in resp: +# if ns_name == ns['name']: +# nsopdata = ctx.obj.ns.get_opdata(ns['id']) +# scaling_records = nsopdata['nsr:nsr']['scaling-group-record'] +# for record in scaling_records: +# if 'instance' in record: +# instances = record['instance'] +# for inst in instances: +# table.add_row( +# [record['scaling-group-name-ref'], +# inst['instance-id'], +# inst['op-status'], +# time.strftime('%Y-%m-%d %H:%M:%S', +# time.localtime( +# inst['create-time'])), +# inst['vnfrs']]) +# table.align = 'l' +# print(table) + + +#@cli.command(name='ns-scale') +#@click.argument('ns_name') +#@click.option('--ns_scale_group', prompt=True) +#@click.option('--index', prompt=True) +#@click.option('--wait', +# required=False, +# default=False, +# is_flag=True, +# help='do not return the control immediately, but keep it \ +# until the operation is completed, or timeout') +#@click.pass_context +#def ns_scale(ctx, ns_name, ns_scale_group, index, wait): +# """scales NS +# +# NS_NAME: name of the NS instance to be scaled +# """ +# try: +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# ctx.obj.ns.scale(ns_name, ns_scale_group, index, wait=wait) +# except ClientException as inst: +# print((inst.message)) +# exit(1) -@cli.command(name='config-agent-delete') -@click.argument('name') -@click.pass_context -def config_agent_delete(ctx, name): - """deletes a config agent - NAME: name of the config agent to be deleted - """ - try: - check_client_version(ctx.obj, ctx.command.name, 'v1') - ctx.obj.vca.delete(name) - except ClientException as inst: - print((inst.message)) - exit(1) +#@cli.command(name='config-agent-list') +#@click.pass_context +#def config_agent_list(ctx): +# """list config agents""" +# try: +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# except ClientException as inst: +# print((inst.message)) +# exit(1) +# table = PrettyTable(['name', 'account-type', 'details']) +# for account in ctx.obj.vca.list(): +# table.add_row( +# [account['name'], +# account['account-type'], +# account['juju']]) +# table.align = 'l' +# print(table) -@cli.command(name='config-agent-add') -@click.option('--name', - prompt=True) -@click.option('--account_type', - prompt=True) -@click.option('--server', - prompt=True) -@click.option('--user', - prompt=True) -@click.option('--secret', - prompt=True, - hide_input=True, - confirmation_prompt=True) -@click.pass_context -def config_agent_add(ctx, name, account_type, server, user, secret): - """adds a config agent""" - try: - check_client_version(ctx.obj, ctx.command.name, 'v1') - ctx.obj.vca.create(name, account_type, server, user, secret) - except ClientException as inst: - print((inst.message)) - exit(1) +#@cli.command(name='config-agent-delete') +#@click.argument('name') +#@click.pass_context +#def config_agent_delete(ctx, name): +# """deletes a config agent +# +# NAME: name of the config agent to be deleted +# """ +# try: +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# ctx.obj.vca.delete(name) +# except ClientException as inst: +# print((inst.message)) +# exit(1) -@cli.command(name='ro-dump') -@click.pass_context -def ro_dump(ctx): - """shows RO agent information""" - check_client_version(ctx.obj, ctx.command.name, 'v1') - resp = ctx.obj.vim.get_resource_orchestrator() - table = PrettyTable(['key', 'attribute']) - for k, v in list(resp.items()): - table.add_row([k, json.dumps(v, indent=2)]) - table.align = 'l' - print(table) +#@cli.command(name='config-agent-add') +#@click.option('--name', +# prompt=True) +#@click.option('--account_type', +# prompt=True) +#@click.option('--server', +# prompt=True) +#@click.option('--user', +# prompt=True) +#@click.option('--secret', +# prompt=True, +# hide_input=True, +# confirmation_prompt=True) +#@click.pass_context +#def config_agent_add(ctx, name, account_type, server, user, secret): +# """adds a config agent""" +# try: +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# ctx.obj.vca.create(name, account_type, server, user, secret) +# except ClientException as inst: +# print((inst.message)) +# exit(1) -@cli.command(name='vcs-list') -@click.pass_context -def vcs_list(ctx): - check_client_version(ctx.obj, ctx.command.name, 'v1') - resp = ctx.obj.utils.get_vcs_info() - table = PrettyTable(['component name', 'state']) - for component in resp: - table.add_row([component['component_name'], component['state']]) - table.align = 'l' - print(table) +#@cli.command(name='ro-dump') +#@click.pass_context +#def ro_dump(ctx): +# """shows RO agent information""" +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# resp = ctx.obj.vim.get_resource_orchestrator() +# table = PrettyTable(['key', 'attribute']) +# for k, v in list(resp.items()): +# table.add_row([k, json.dumps(v, indent=2)]) +# table.align = 'l' +# print(table) + + +#@cli.command(name='vcs-list') +#@click.pass_context +#def vcs_list(ctx): +# check_client_version(ctx.obj, ctx.command.name, 'v1') +# resp = ctx.obj.utils.get_vcs_info() +# table = PrettyTable(['component name', 'state']) +# for component in resp: +# table.add_row([component['component_name'], component['state']]) +# table.align = 'l' +# print(table) @cli.command(name='ns-action') @click.argument('ns_name') -@click.option('--vnf_name', default=None) +@click.option('--vnf_name', default=None, help='member-vnf-index if the target is a vnf instead of a ns)') +@click.option('--vdu_id', default=None, help='vdu-id if the target is a vdu o a vnf') +@click.option('--vdu_count', default=None, help='number of vdu instance of this vdu_id') @click.option('--action_name', prompt=True) -@click.option('--params', prompt=True) +@click.option('--params', default=None) @click.option('--wait', required=False, default=False, @@ -2786,6 +2796,8 @@ def vcs_list(ctx): def ns_action(ctx, ns_name, vnf_name, + vdu_id, + vdu_count, action_name, params, wait): @@ -2795,15 +2807,22 @@ def ns_action(ctx, """ try: check_client_version(ctx.obj, ctx.command.name) - op_data={} + op_data = {} if vnf_name: - op_data['vnf_member_index'] = vnf_name + op_data['member_vnf_index'] = vnf_name + if vdu_id: + op_data['vdu_id'] = vdu_id + if vdu_count: + op_data['vdu_count_index'] = vdu_count op_data['primitive'] = action_name - op_data['primitive_params'] = yaml.load(params) + if params: + op_data['primitive_params'] = yaml.load(params) + else: + op_data['primitive_params'] = {} ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data, wait=wait) except ClientException as inst: - print((inst.message)) + print(inst.message) exit(1) @@ -2843,11 +2862,11 @@ def vnf_scale(ctx, @cli.command(name='role-create', short_help='creates a role') @click.argument('name') -@click.option('--definition', +@click.option('--permissions', default=None, - help='role definition using a dictionary') + help='role permissions using a dictionary') @click.pass_context -def role_create(ctx, name, definition): +def role_create(ctx, name, permissions): """ Creates a new role. @@ -2857,24 +2876,28 @@ def role_create(ctx, name, definition): """ try: check_client_version(ctx.obj, ctx.command.name) - ctx.obj.role.create(name, definition) + ctx.obj.role.create(name, permissions) except ClientException as inst: print(inst.message) + exit(1) @cli.command(name='role-update', short_help='updates a role') @click.argument('name') -@click.option('--definition', +@click.option('--set-name', default=None, - help='add a new definition to the role') + help='change name of rle') +# @click.option('--permissions', +# default=None, +# help='provide a yaml format dictionary with incremental changes. Values can be bool or None to delete') @click.option('--add', default=None, - help='add a resource access grant/denial') + help='yaml format dictionary with permission: True/False to access grant/denial') @click.option('--remove', default=None, - help='remove a resource access grant/denial') + help='yaml format list to remove a permission') @click.pass_context -def role_update(ctx, name, definition, add, remove): +def role_update(ctx, name, set_name, add, remove): """ Updates a role. @@ -2886,7 +2909,7 @@ def role_update(ctx, name, definition, add, remove): """ try: check_client_version(ctx.obj, ctx.command.name) - ctx.obj.role.update(name, definition, add, remove) + ctx.obj.role.update(name, set_name, None, add, remove) except ClientException as inst: print(inst.message) exit(1)