|
 |
403b09 |
From b654999d25de81e2c63b0765b6f16df2ff880144 Mon Sep 17 00:00:00 2001
|
|
|
403b09 |
From: Jan Cholasta <jcholast@redhat.com>
|
|
|
403b09 |
Date: Wed, 10 Aug 2016 09:02:47 +0200
|
|
|
403b09 |
Subject: [PATCH] client: add missing output params to client-side commands
|
|
|
403b09 |
|
|
|
403b09 |
Add output params for the otptoken-add-yubikey, vault-add, vault-mod,
|
|
|
403b09 |
vault-archive and vault-retrieve commands.
|
|
|
403b09 |
|
|
|
403b09 |
This fixes the commands not having any output in CLI.
|
|
|
403b09 |
|
|
|
403b09 |
https://fedorahosted.org/freeipa/ticket/6182
|
|
|
403b09 |
|
|
|
403b09 |
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
403b09 |
Reviewed-By: David Kupka <dkupka@redhat.com>
|
|
|
403b09 |
---
|
|
|
403b09 |
ipaclient/plugins/otptoken_yubikey.py | 6 ++++++
|
|
|
403b09 |
ipaclient/plugins/vault.py | 24 ++++++++++++++++++++++++
|
|
|
403b09 |
2 files changed, 30 insertions(+)
|
|
|
403b09 |
|
|
|
403b09 |
diff --git a/ipaclient/plugins/otptoken_yubikey.py b/ipaclient/plugins/otptoken_yubikey.py
|
|
|
403b09 |
index 423b670de15dd7f803db1dcbb759bd0254827072..3c310eacbaeef654e43049db78437c8c29f52279 100644
|
|
|
403b09 |
--- a/ipaclient/plugins/otptoken_yubikey.py
|
|
|
403b09 |
+++ b/ipaclient/plugins/otptoken_yubikey.py
|
|
|
403b09 |
@@ -103,6 +103,12 @@ class otptoken_add_yubikey(Command):
|
|
|
403b09 |
for option in super(otptoken_add_yubikey, self).get_options():
|
|
|
403b09 |
yield option
|
|
|
403b09 |
|
|
|
403b09 |
+ def get_output_params(self):
|
|
|
403b09 |
+ for param in self.api.Command.otptoken_add.output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+ for param in super(otptoken_add_yubikey, self).get_output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+
|
|
|
403b09 |
def _iter_output(self):
|
|
|
403b09 |
return self.api.Command.otptoken_add.output()
|
|
|
403b09 |
|
|
|
403b09 |
diff --git a/ipaclient/plugins/vault.py b/ipaclient/plugins/vault.py
|
|
|
403b09 |
index 9026cbb0829a7557584df27a4262dfde640b4f28..3e116bbad54fea419b571d1f09c1b00280e94991 100644
|
|
|
403b09 |
--- a/ipaclient/plugins/vault.py
|
|
|
403b09 |
+++ b/ipaclient/plugins/vault.py
|
|
|
403b09 |
@@ -220,6 +220,12 @@ class vault_add(Local):
|
|
|
403b09 |
for option in super(vault_add, self).get_options():
|
|
|
403b09 |
yield option
|
|
|
403b09 |
|
|
|
403b09 |
+ def get_output_params(self):
|
|
|
403b09 |
+ for param in self.api.Command.vault_add_internal.output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+ for param in super(vault_add, self).get_output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+
|
|
|
403b09 |
def _iter_output(self):
|
|
|
403b09 |
return self.api.Command.vault_add_internal.output()
|
|
|
403b09 |
|
|
|
403b09 |
@@ -418,6 +424,12 @@ class vault_mod(Local):
|
|
|
403b09 |
for option in super(vault_mod, self).get_options():
|
|
|
403b09 |
yield option
|
|
|
403b09 |
|
|
|
403b09 |
+ def get_output_params(self):
|
|
|
403b09 |
+ for param in self.api.Command.vault_mod_internal.output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+ for param in super(vault_mod, self).get_output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+
|
|
|
403b09 |
def _iter_output(self):
|
|
|
403b09 |
return self.api.Command.vault_mod_internal.output()
|
|
|
403b09 |
|
|
|
403b09 |
@@ -600,6 +612,12 @@ class vault_archive(Local):
|
|
|
403b09 |
for option in super(vault_archive, self).get_options():
|
|
|
403b09 |
yield option
|
|
|
403b09 |
|
|
|
403b09 |
+ def get_output_params(self):
|
|
|
403b09 |
+ for param in self.api.Command.vault_archive_internal.output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+ for param in super(vault_archive, self).get_output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+
|
|
|
403b09 |
def _iter_output(self):
|
|
|
403b09 |
return self.api.Command.vault_archive_internal.output()
|
|
|
403b09 |
|
|
|
403b09 |
@@ -846,6 +864,12 @@ class vault_retrieve(Local):
|
|
|
403b09 |
for option in super(vault_retrieve, self).get_options():
|
|
|
403b09 |
yield option
|
|
|
403b09 |
|
|
|
403b09 |
+ def get_output_params(self):
|
|
|
403b09 |
+ for param in self.api.Command.vault_retrieve_internal.output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+ for param in super(vault_retrieve, self).get_output_params():
|
|
|
403b09 |
+ yield param
|
|
|
403b09 |
+
|
|
|
403b09 |
def _iter_output(self):
|
|
|
403b09 |
return self.api.Command.vault_retrieve_internal.output()
|
|
|
403b09 |
|
|
|
403b09 |
--
|
|
|
403b09 |
2.7.4
|
|
|
403b09 |
|