Improve migration help topic so that it easier understandable:
  - Add missing list of Topic commands
  - Add one more example to demonstrate migration abilities
  - Add breaks to too long lines to improve readibility

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

>From efa96bec7a55ca5eeb06a9243fefe8b1b3373752 Mon Sep 17 00:00:00 2001
From: Martin Kosek <mko...@redhat.com>
Date: Fri, 3 Feb 2012 09:38:16 +0100
Subject: [PATCH] Improve migration help

Improve migration help topic so that it easier understandable:
  - Add missing list of Topic commands
  - Add one more example to demonstrate migration abilities
  - Add breaks to too long lines to improve readibility

https://fedorahosted.org/freeipa/ticket/2174
---
 ipalib/cli.py               |    2 +-
 ipalib/plugins/migration.py |   27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ipalib/cli.py b/ipalib/cli.py
index 667a7cdc40b4557841bac3186b3271836e6f358c..ad835f29127a274f38ecbc7b7026aba319d35749 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -818,7 +818,7 @@ class help(frontend.Local):
                 raise HelpError(topic=topic)
 
             print doc
-            if len(commands) > 1:
+            if commands:
                 print ''
                 print unicode(_('Topic commands:'))
                 for c in commands:
diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py
index 9fe72d587a3dcfb26c93db8a2099aba837bce631..688265fd3ea7f62bb22bf78abbc7f26e64f7470b 100644
--- a/ipalib/plugins/migration.py
+++ b/ipalib/plugins/migration.py
@@ -67,18 +67,31 @@ EXAMPLES:
  The simplest migration, accepting all defaults:
    ipa migrate-ds ldap://ds.example.com:389
 
- Specify the user and group container. This can be used to migrate user and
- group data from an IPA v1 server:
-   ipa migrate-ds --user-container='cn=users,cn=accounts' --group-container='cn=groups,cn=accounts' ldap://ds.example.com:389
+ Specify the user and group container. This can be used to migrate user
+ and group data from an IPA v1 server:
+   ipa migrate-ds --user-container='cn=users,cn=accounts' \\
+       --group-container='cn=groups,cn=accounts' \\
+       ldap://ds.example.com:389
 
  Since IPA v2 server already contain predefined groups that may collide with
- groups in migrated (IPA v1) server (for example admins, ipausers), users having
- colliding group as their primary group may happen to belong to an unknown group
- on new IPA v2 server.
+ groups in migrated (IPA v1) server (for example admins, ipausers), users
+ having colliding group as their primary group may happen to belong to
+ an unknown group on new IPA v2 server.
  Use --group-overwrite-gid option to overwrite GID of already existing groups
  to prevent this issue:
-    ipa migrate-ds --group-overwrite-gid --user-container='cn=users,cn=accounts' --group-container='cn=groups,cn=accounts' ldap://ds.example.com:389
+    ipa migrate-ds --group-overwrite-gid \\
+        --user-container='cn=users,cn=accounts' \\
+        --group-container='cn=groups,cn=accounts' \\
+        ldap://ds.example.com:389
 
+ Migrated users or groups may have object class and accompanied attributes
+ unknown to the IPA v2 server. These object classes and attributes may be
+ left out of the migration process:
+    ipa migrate-ds --user-container='cn=users,cn=accounts' \\
+       --group-container='cn=groups,cn=accounts' \\
+       --user-ignore-objectclass=radiusprofile \\
+       --user-ignore-attribute=radiusgroupname \\
+       ldap://ds.example.com:389
 """)
 
 # USER MIGRATION CALLBACKS AND VARS
-- 
1.7.7.6

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to