diff options
author | Jan Cholasta <jcholast@redhat.com> | 2016-06-27 09:33:29 +0200 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2016-06-30 16:32:20 +0200 |
commit | c1d8c710e749110d157a6769a48ac0b9552f458e (patch) | |
tree | cab7db36ed06147d9ee6baeb620571bad9928f2f | |
parent | 390fd3d305daf3844dd7c5e36b2d9e7b3c651e3d (diff) | |
download | freeipa-c1d8c710e749110d157a6769a48ac0b9552f458e.tar.gz freeipa-c1d8c710e749110d157a6769a48ac0b9552f458e.tar.xz freeipa-c1d8c710e749110d157a6769a48ac0b9552f458e.zip |
client: ignore override errors in command overrides
This fixes API initialization errors when the remote server does not have
the overriden command.
https://fedorahosted.org/freeipa/ticket/4739
Reviewed-By: David Kupka <dkupka@redhat.com>
-rw-r--r-- | ipaclient/plugins/automember.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/automount.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/cert.py | 8 | ||||
-rw-r--r-- | ipaclient/plugins/certprofile.py | 6 | ||||
-rw-r--r-- | ipaclient/plugins/dns.py | 18 | ||||
-rw-r--r-- | ipaclient/plugins/hbactest.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/host.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/idrange.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/internal.py | 4 | ||||
-rw-r--r-- | ipaclient/plugins/location.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/migration.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/misc.py | 4 | ||||
-rw-r--r-- | ipaclient/plugins/otptoken.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/passwd.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/permission.py | 6 | ||||
-rw-r--r-- | ipaclient/plugins/server.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/service.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/sudorule.py | 8 | ||||
-rw-r--r-- | ipaclient/plugins/topology.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/trust.py | 2 | ||||
-rw-r--r-- | ipaclient/plugins/user.py | 4 | ||||
-rw-r--r-- | ipaclient/plugins/vault.py | 2 |
22 files changed, 43 insertions, 43 deletions
diff --git a/ipaclient/plugins/automember.py b/ipaclient/plugins/automember.py index 98caf931d..0b6fddaa2 100644 --- a/ipaclient/plugins/automember.py +++ b/ipaclient/plugins/automember.py @@ -25,7 +25,7 @@ from ipalib.text import _ register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class automember_add_condition(MethodOverride): has_output_params = ( Str('failed', diff --git a/ipaclient/plugins/automount.py b/ipaclient/plugins/automount.py index 2d6b8d929..7ac541358 100644 --- a/ipaclient/plugins/automount.py +++ b/ipaclient/plugins/automount.py @@ -39,7 +39,7 @@ DEFAULT_MAPS = (u'auto.direct', ) DEFAULT_KEYS = (u'/-', ) -@register(override=True) +@register(override=True, no_fail=True) class automountlocation_tofiles(MethodOverride): def output_for_cli(self, textui, result, *keys, **options): maps = result['result']['maps'] diff --git a/ipaclient/plugins/cert.py b/ipaclient/plugins/cert.py index 37e894efb..1075972c4 100644 --- a/ipaclient/plugins/cert.py +++ b/ipaclient/plugins/cert.py @@ -30,7 +30,7 @@ from ipalib.text import _ register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class cert_request(MethodOverride): def get_args(self): for arg in super(cert_request, self).get_args(): @@ -39,7 +39,7 @@ class cert_request(MethodOverride): yield arg -@register(override=True) +@register(override=True, no_fail=True) class cert_show(MethodOverride): def forward(self, *keys, **options): if 'out' in options: @@ -54,7 +54,7 @@ class cert_show(MethodOverride): return super(cert_show, self).forward(*keys, **options) -@register(override=True) +@register(override=True, no_fail=True) class cert_remove_hold(MethodOverride): has_output_params = ( Flag('unrevoked', @@ -66,7 +66,7 @@ class cert_remove_hold(MethodOverride): ) -@register(override=True) +@register(override=True, no_fail=True) class cert_find(MethodOverride): takes_options = ( File( diff --git a/ipaclient/plugins/certprofile.py b/ipaclient/plugins/certprofile.py index f36f27128..cde039a9e 100644 --- a/ipaclient/plugins/certprofile.py +++ b/ipaclient/plugins/certprofile.py @@ -11,7 +11,7 @@ from ipalib.text import _ register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class certprofile_show(MethodOverride): def forward(self, *keys, **options): if 'out' in options: @@ -29,7 +29,7 @@ class certprofile_show(MethodOverride): return result -@register(override=True) +@register(override=True, no_fail=True) class certprofile_import(MethodOverride): def get_options(self): for option in super(certprofile_import, self).get_options(): @@ -38,7 +38,7 @@ class certprofile_import(MethodOverride): yield option -@register(override=True) +@register(override=True, no_fail=True) class certprofile_mod(MethodOverride): def get_options(self): for option in super(certprofile_mod, self).get_options(): diff --git a/ipaclient/plugins/dns.py b/ipaclient/plugins/dns.py index bca5ad73c..e17c282fa 100644 --- a/ipaclient/plugins/dns.py +++ b/ipaclient/plugins/dns.py @@ -109,17 +109,17 @@ class DNSZoneMethodOverride(MethodOverride): yield option -@register(override=True) +@register(override=True, no_fail=True) class dnszone_add(DNSZoneMethodOverride): pass -@register(override=True) +@register(override=True, no_fail=True) class dnszone_mod(DNSZoneMethodOverride): pass -@register(override=True) +@register(override=True, no_fail=True) class dnsrecord_add(MethodOverride): no_option_msg = 'No options to add a specific record provided.\n' \ "Command help may be consulted for all supported record types." @@ -194,7 +194,7 @@ class dnsrecord_add(MethodOverride): kw.update(user_options) -@register(override=True) +@register(override=True, no_fail=True) class dnsrecord_mod(MethodOverride): no_option_msg = 'No options to modify a specific record provided.' @@ -252,7 +252,7 @@ class dnsrecord_mod(MethodOverride): break -@register(override=True) +@register(override=True, no_fail=True) class dnsrecord_del(MethodOverride): no_option_msg = _('Neither --del-all nor options to delete a specific record provided.\n'\ "Command help may be consulted for all supported record types.") @@ -309,7 +309,7 @@ class dnsrecord_del(MethodOverride): kw[param.name] = tuple(deleted_values) -@register(override=True) +@register(override=True, no_fail=True) class dnsconfig_mod(MethodOverride): def interactive_prompt_callback(self, kw): @@ -322,7 +322,7 @@ class dnsconfig_mod(MethodOverride): _("This may take some time, please wait ...")) -@register(override=True) +@register(override=True, no_fail=True) class dnsforwardzone_add(MethodOverride): def interactive_prompt_callback(self, kw): # show informative message on client side @@ -334,7 +334,7 @@ class dnsforwardzone_add(MethodOverride): _("This may take some time, please wait ...")) -@register(override=True) +@register(override=True, no_fail=True) class dnsforwardzone_mod(MethodOverride): def interactive_prompt_callback(self, kw): # show informative message on client side @@ -346,7 +346,7 @@ class dnsforwardzone_mod(MethodOverride): _("This may take some time, please wait ...")) -@register(override=True) +@register(override=True, no_fail=True) class dns_update_system_records(MethodOverride): def output_for_cli(self, textui, output, *args, **options): output_super = copy.deepcopy(output) diff --git a/ipaclient/plugins/hbactest.py b/ipaclient/plugins/hbactest.py index 10a640a5a..251871952 100644 --- a/ipaclient/plugins/hbactest.py +++ b/ipaclient/plugins/hbactest.py @@ -28,7 +28,7 @@ if six.PY3: register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class hbactest(CommandOverride): def output_for_cli(self, textui, output, *args, **options): """ diff --git a/ipaclient/plugins/host.py b/ipaclient/plugins/host.py index a346226b5..7d8b92d8e 100644 --- a/ipaclient/plugins/host.py +++ b/ipaclient/plugins/host.py @@ -27,7 +27,7 @@ from ipalib import x509 register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class host_show(MethodOverride): def forward(self, *keys, **options): if 'out' in options: diff --git a/ipaclient/plugins/idrange.py b/ipaclient/plugins/idrange.py index 83ad8fdcf..1a8d68ed7 100644 --- a/ipaclient/plugins/idrange.py +++ b/ipaclient/plugins/idrange.py @@ -24,7 +24,7 @@ from ipalib import api register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class idrange_add(MethodOverride): def interactive_prompt_callback(self, kw): """ diff --git a/ipaclient/plugins/internal.py b/ipaclient/plugins/internal.py index 65cbbe7a5..1a8f36969 100644 --- a/ipaclient/plugins/internal.py +++ b/ipaclient/plugins/internal.py @@ -30,13 +30,13 @@ from ipalib.plugable import Registry register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class json_metadata(CommandOverride): def output_for_cli(self, textui, result, *args, **options): print(json.dumps(result, default=json_serialize)) -@register(override=True) +@register(override=True, no_fail=True) class i18n_messages(CommandOverride): def output_for_cli(self, textui, result, *args, **options): print(json.dumps(result, default=json_serialize)) diff --git a/ipaclient/plugins/location.py b/ipaclient/plugins/location.py index b3b6026c0..e5191e78f 100644 --- a/ipaclient/plugins/location.py +++ b/ipaclient/plugins/location.py @@ -10,7 +10,7 @@ from ipalib.plugable import Registry register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class location_show(MethodOverride): def output_for_cli(self, textui, output, *keys, **options): rv = super(location_show, self).output_for_cli( diff --git a/ipaclient/plugins/migration.py b/ipaclient/plugins/migration.py index b40ddfd80..8ac5f66bf 100644 --- a/ipaclient/plugins/migration.py +++ b/ipaclient/plugins/migration.py @@ -30,7 +30,7 @@ if six.PY3: register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class migrate_ds(CommandOverride): migrate_order = ('user', 'group') diff --git a/ipaclient/plugins/misc.py b/ipaclient/plugins/misc.py index 05fc54214..2c195f866 100644 --- a/ipaclient/plugins/misc.py +++ b/ipaclient/plugins/misc.py @@ -8,7 +8,7 @@ from ipalib.plugable import Registry register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class env(CommandOverride): def output_for_cli(self, textui, output, *args, **options): output = dict(output) @@ -19,7 +19,7 @@ class env(CommandOverride): *args, **options) -@register(override=True) +@register(override=True, no_fail=True) class plugins(CommandOverride): def output_for_cli(self, textui, output, *args, **options): options['all'] = True diff --git a/ipaclient/plugins/otptoken.py b/ipaclient/plugins/otptoken.py index d7d53562d..dd4a71826 100644 --- a/ipaclient/plugins/otptoken.py +++ b/ipaclient/plugins/otptoken.py @@ -43,7 +43,7 @@ if six.PY3: register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class otptoken_add(MethodOverride): def _get_qrcode(self, output, uri, version): # Print QR code to terminal if specified diff --git a/ipaclient/plugins/passwd.py b/ipaclient/plugins/passwd.py index 738230619..b00a4597a 100644 --- a/ipaclient/plugins/passwd.py +++ b/ipaclient/plugins/passwd.py @@ -8,7 +8,7 @@ from ipalib.plugable import Registry register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class passwd(CommandOverride): def get_args(self): for arg in super(passwd, self).get_args(): diff --git a/ipaclient/plugins/permission.py b/ipaclient/plugins/permission.py index 2ec1eb408..5b7293c47 100644 --- a/ipaclient/plugins/permission.py +++ b/ipaclient/plugins/permission.py @@ -16,16 +16,16 @@ class PermissionMethodOverride(MethodOverride): yield option -@register(override=True) +@register(override=True, no_fail=True) class permission_add(PermissionMethodOverride): pass -@register(override=True) +@register(override=True, no_fail=True) class permission_mod(PermissionMethodOverride): pass -@register(override=True) +@register(override=True, no_fail=True) class permission_find(PermissionMethodOverride): pass diff --git a/ipaclient/plugins/server.py b/ipaclient/plugins/server.py index 277a87488..725a2ce95 100644 --- a/ipaclient/plugins/server.py +++ b/ipaclient/plugins/server.py @@ -9,7 +9,7 @@ from ipalib.plugable import Registry register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class server_del(MethodOverride): def interactive_prompt_callback(self, kw): self.api.Backend.textui.print_plain( diff --git a/ipaclient/plugins/service.py b/ipaclient/plugins/service.py index 72783b617..c45a2f2bc 100644 --- a/ipaclient/plugins/service.py +++ b/ipaclient/plugins/service.py @@ -29,7 +29,7 @@ from ipalib import util register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class service_show(MethodOverride): def forward(self, *keys, **options): if 'out' in options: diff --git a/ipaclient/plugins/sudorule.py b/ipaclient/plugins/sudorule.py index 4098eb809..a87628044 100644 --- a/ipaclient/plugins/sudorule.py +++ b/ipaclient/plugins/sudorule.py @@ -24,19 +24,19 @@ from ipalib import _ register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class sudorule_enable(MethodOverride): def output_for_cli(self, textui, result, cn, **options): textui.print_dashed(_('Enabled Sudo Rule "%s"') % cn) -@register(override=True) +@register(override=True, no_fail=True) class sudorule_disable(MethodOverride): def output_for_cli(self, textui, result, cn, **options): textui.print_dashed(_('Disabled Sudo Rule "%s"') % cn) -@register(override=True) +@register(override=True, no_fail=True) class sudorule_add_option(MethodOverride): def output_for_cli(self, textui, result, cn, **options): textui.print_dashed( @@ -47,7 +47,7 @@ class sudorule_add_option(MethodOverride): **options) -@register(override=True) +@register(override=True, no_fail=True) class sudorule_remove_option(MethodOverride): def output_for_cli(self, textui, result, cn, **options): textui.print_dashed( diff --git a/ipaclient/plugins/topology.py b/ipaclient/plugins/topology.py index 522dcfa9a..c7fbcc39e 100644 --- a/ipaclient/plugins/topology.py +++ b/ipaclient/plugins/topology.py @@ -14,7 +14,7 @@ if six.PY3: register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class topologysuffix_verify(MethodOverride): def output_for_cli(self, textui, output, *args, **options): diff --git a/ipaclient/plugins/trust.py b/ipaclient/plugins/trust.py index 004c870c3..8e05396e4 100644 --- a/ipaclient/plugins/trust.py +++ b/ipaclient/plugins/trust.py @@ -24,7 +24,7 @@ from ipalib.plugable import Registry register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class trust_add(MethodOverride): def interactive_prompt_callback(self, kw): """ diff --git a/ipaclient/plugins/user.py b/ipaclient/plugins/user.py index ccff9bbbc..19eecac54 100644 --- a/ipaclient/plugins/user.py +++ b/ipaclient/plugins/user.py @@ -29,7 +29,7 @@ from ipalib import x509 register = Registry() -@register(override=True) +@register(override=True, no_fail=True) class user_del(MethodOverride): def get_options(self): for option in super(user_del, self).get_options(): @@ -60,7 +60,7 @@ class user_del(MethodOverride): return super(user_del, self).forward(*keys, **options) -@register(override=True) +@register(override=True, no_fail=True) class user_show(MethodOverride): def forward(self, *keys, **options): if 'out' in options: diff --git a/ipaclient/plugins/vault.py b/ipaclient/plugins/vault.py index 945f390c0..2674970b5 100644 --- a/ipaclient/plugins/vault.py +++ b/ipaclient/plugins/vault.py @@ -493,7 +493,7 @@ class vault_mod(Local): return response -@register(override=True) +@register(override=True, no_fail=True) class vaultconfig_show(MethodOverride): def forward(self, *args, **options): |