permission plugin: Do not add the ipapermissionv2 for output

As with the flags, the objectclass should be returned as it is
on the entry.

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

Reviewed-By: Martin Kosek <mkosek@redhat.com>

ipalib/plugins/permission.py

@@ -624,7 +624,7 @@ class permission(baseldap.LDAPObject):
             from the ACI corresponding to ``entry``.
             If None, ``entry`` itself is filled
         :param output_only:
-            If true, the flags are not updated to V2.
+            If true, the flags & objectclass are not updated to V2.
             Used for the -find and -show commands.
         :param cached_acientry:
             Optional pre-retreived entry that contains the existing ACI.
@@ -665,7 +665,6 @@ class permission(baseldap.LDAPObject):
 
         if not output_only:
             target_entry['ipapermissiontype'] = ['SYSTEM', 'V2']
-
             if 'ipapermissionv2' not in entry['objectclass']:
                 target_entry['objectclass'] = list(entry['objectclass']) + [
                     u'ipapermissionv2']

ipatests/test_xmlrpc/test_old_permission_plugin.py

@@ -806,7 +806,7 @@ class test_old_permission(Declarative):
                         'dn': DN(('cn','Add user to default group'),
                                  api.env.container_permission, api.env.basedn),
                         'cn': [u'Add user to default group'],
-                        'objectclass': objectclasses.permission,
+                        'objectclass': objectclasses.system_permission,
                         'member_privilege': [u'User Administrators'],
                         'attrs': [u'member'],
                         'targetgroup': u'ipausers',

ipatests/test_xmlrpc/test_permission_plugin.py

@@ -1163,7 +1163,7 @@ class test_permission(Declarative):
                         'dn': DN(('cn','Add user to default group'),
                                  api.env.container_permission, api.env.basedn),
                         'cn': [u'Add user to default group'],
-                        'objectclass': objectclasses.permission,
+                        'objectclass': objectclasses.system_permission,
                         'member_privilege': [u'User Administrators'],
                         'attrs': [u'member'],
                         'targetgroup': [u'ipausers'],