Revert "adtrust: remove nttrustpartner parameter"

This reverts commit 185806432d.

The wrong version of patch has been pushed.

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

Reviewed-By: Martin Basti <mbasti@redhat.com>

API.txt

@@ -5323,13 +5323,14 @@ output: Entry('result')
 output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>])
 output: PrimaryKey('value')
 command: trustdomain_add
-args: 2,8,3
+args: 2,9,3
 arg: Str('trustcn', cli_name='trust')
 arg: Str('cn', cli_name='domain')
 option: Str('addattr*', cli_name='addattr')
 option: Flag('all', autofill=True, cli_name='all', default=False)
 option: Str('ipantflatname?', cli_name='flat_name')
 option: Str('ipanttrusteddomainsid?', cli_name='sid')
+option: Str('ipanttrustpartner?')
 option: Flag('raw', autofill=True, cli_name='raw', default=False)
 option: Str('setattr*', cli_name='setattr')
 option: StrEnum('trust_type', autofill=True, cli_name='type', default=u'ad', values=[u'ad'])
@@ -5363,13 +5364,14 @@ output: Output('result', type=[<type 'bool'>])
 output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>])
 output: PrimaryKey('value')
 command: trustdomain_find
-args: 2,9,4
+args: 2,10,4
 arg: Str('trustcn', cli_name='trust')
 arg: Str('criteria?')
 option: Flag('all', autofill=True, cli_name='all', default=False)
 option: Str('cn?', autofill=False, cli_name='domain')
 option: Str('ipantflatname?', autofill=False, cli_name='flat_name')
 option: Str('ipanttrusteddomainsid?', autofill=False, cli_name='sid')
+option: Str('ipanttrustpartner?', autofill=False)
 option: Flag('pkey_only?', autofill=True, default=False)
 option: Flag('raw', autofill=True, cli_name='raw', default=False)
 option: Int('sizelimit?', autofill=False)
@@ -5380,7 +5382,7 @@ output: ListOfEntries('result')
 output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>])
 output: Output('truncated', type=[<type 'bool'>])
 command: trustdomain_mod
-args: 2,10,3
+args: 2,11,3
 arg: Str('trustcn', cli_name='trust')
 arg: Str('cn', cli_name='domain')
 option: Str('addattr*', cli_name='addattr')
@@ -5388,6 +5390,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False)
 option: Str('delattr*', cli_name='delattr')
 option: Str('ipantflatname?', autofill=False, cli_name='flat_name')
 option: Str('ipanttrusteddomainsid?', autofill=False, cli_name='sid')
+option: Str('ipanttrustpartner?', autofill=False)
 option: Flag('raw', autofill=True, cli_name='raw', default=False)
 option: Flag('rights', autofill=True, default=False)
 option: Str('setattr*', cli_name='setattr')

install/ui/test/data/ipa_init_commands.json

@@ -22022,6 +22022,20 @@
                         "noextrawhitespace": true,
                         "type": "unicode"
                     },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "deprecated_cli_aliases": [],
+                        "doc": "Trusted domain partner",
+                        "flags": [
+                            "no_display",
+                            "no_option"
+                        ],
+                        "label": "Trusted domain partner",
+                        "name": "ipanttrustpartner",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
                     {
                         "name": "setattr"
                     },
@@ -22127,6 +22141,21 @@
                         "query": true,
                         "type": "unicode"
                     },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "deprecated_cli_aliases": [],
+                        "doc": "Trusted domain partner",
+                        "flags": [
+                            "no_display",
+                            "no_option"
+                        ],
+                        "label": "Trusted domain partner",
+                        "name": "ipanttrustpartner",
+                        "noextrawhitespace": true,
+                        "query": true,
+                        "type": "unicode"
+                    },
                     {
                         "class": "Int",
                         "deprecated_cli_aliases": [],
@@ -22198,6 +22227,20 @@
                         "noextrawhitespace": true,
                         "type": "unicode"
                     },
+                    {
+                        "attribute": true,
+                        "class": "Str",
+                        "deprecated_cli_aliases": [],
+                        "doc": "Trusted domain partner",
+                        "flags": [
+                            "no_display",
+                            "no_option"
+                        ],
+                        "label": "Trusted domain partner",
+                        "name": "ipanttrustpartner",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    },
                     {
                         "name": "setattr"
                     },

install/ui/test/data/ipa_init_objects.json

@@ -8527,6 +8527,19 @@
                         "noextrawhitespace": true,
                         "type": "unicode"
                     },
+                    {
+                        "class": "Str",
+                        "deprecated_cli_aliases": [],
+                        "doc": "Trusted domain partner",
+                        "flags": [
+                            "no_display",
+                            "no_option"
+                        ],
+                        "label": "Trusted domain partner",
+                        "name": "ipanttrustpartner",
+                        "noextrawhitespace": true,
+                        "type": "unicode"
+                    }
                 ],
                 "uuid_attribute": ""
             },

ipaserver/plugins/trust.py

@@ -1477,6 +1477,10 @@ class trustdomain(LDAPObject):
             cli_name='sid',
             label=_('Domain Security Identifier'),
         ),
+        Str('ipanttrustpartner?',
+            label=_('Trusted domain partner'),
+            flags=['no_display', 'no_option'],
+        ),
     )
 
     # LDAPObject.get_dn() only passes all but last element of keys and no kwargs