server: define missing virtual attributes

Move virtual attributes defined in output params of methods into params of
the related object.

This fixes the virtual attributes being ommited in CLI output.

https://fedorahosted.org/freeipa/ticket/4739

Reviewed-By: David Kupka <dkupka@redhat.com>

1 files changed, 36 insertions, 27 deletions

diff --git a/ipaserver/plugins/service.py b/ipaserver/plugins/service.py
index 701314f8d..bead94d3f 100644
--- a/ipaserver/plugins/service.py
+++ b/ipaserver/plugins/service.py
@@ -122,33 +122,6 @@ output_params = (
     Str('managedby_host',
         label='Managed by',
     ),
-    Str('subject',
-        label=_('Subject'),
-    ),
-    Str('serial_number',
-        label=_('Serial Number'),
-    ),
-    Str('serial_number_hex',
-        label=_('Serial Number (hex)'),
-    ),
-    Str('issuer',
-        label=_('Issuer'),
-    ),
-    Str('valid_not_before',
-        label=_('Not Before'),
-    ),
-    Str('valid_not_after',
-        label=_('Not After'),
-    ),
-    Str('md5_fingerprint',
-        label=_('Fingerprint (MD5)'),
-    ),
-    Str('sha1_fingerprint',
-        label=_('Fingerprint (SHA1)'),
-    ),
-    Str('revocation_reason?',
-        label=_('Revocation reason'),
-    ),
     Str('ipaallowedtoperform_read_keys_user',
         label=_('Users allowed to retrieve keytab'),
     ),
@@ -497,6 +470,42 @@ class service(LDAPObject):
             doc=_('Base-64 encoded service certificate'),
             flags=['no_search',],
         ),
+        Str('subject',
+            label=_('Subject'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
+        Str('serial_number',
+            label=_('Serial Number'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
+        Str('serial_number_hex',
+            label=_('Serial Number (hex)'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
+        Str('issuer',
+            label=_('Issuer'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
+        Str('valid_not_before',
+            label=_('Not Before'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
+        Str('valid_not_after',
+            label=_('Not After'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
+        Str('md5_fingerprint',
+            label=_('Fingerprint (MD5)'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
+        Str('sha1_fingerprint',
+            label=_('Fingerprint (SHA1)'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
+        Str('revocation_reason?',
+            label=_('Revocation reason'),
+            flags={'virtual_attribute', 'no_create', 'no_update', 'no_search'},
+        ),
         StrEnum('ipakrbauthzdata*',
             cli_name='pac_type',
             label=_('PAC type'),