summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2015-04-29 08:16:09 +0200
committerTomas Babej <tbabej@redhat.com>2015-07-02 13:23:21 +0200
commite9a3b997176814f890ad90c69a6c14966a24d43f (patch)
treea861051249ecf1b93a55deedf28f30fe11d73a5a
parent7017d9e8a64d7974cbe61c82885256a75a9c2cd7 (diff)
downloadfreeipa-e9a3b997176814f890ad90c69a6c14966a24d43f.zip
freeipa-e9a3b997176814f890ad90c69a6c14966a24d43f.tar.gz
freeipa-e9a3b997176814f890ad90c69a6c14966a24d43f.tar.xz
winsync-migrate: Rename to tool to achive consistency with other tools
https://fedorahosted.org/freeipa/ticket/4524 Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
-rwxr-xr-xinstall/tools/ipa-winsync-migrate4
-rw-r--r--ipaserver/winsync_migrate/__init__.py22
-rw-r--r--ipaserver/winsync_migrate/base.py11
3 files changed, 7 insertions, 30 deletions
diff --git a/install/tools/ipa-winsync-migrate b/install/tools/ipa-winsync-migrate
index 9eb9a03..9f24663 100755
--- a/install/tools/ipa-winsync-migrate
+++ b/install/tools/ipa-winsync-migrate
@@ -18,6 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from ipaserver.winsync_migrate.base import MigrateWinsync
+from ipaserver.winsync_migrate.base import WinsyncMigrate
-MigrateWinsync.run_cli()
+WinsyncMigrate.run_cli()
diff --git a/ipaserver/winsync_migrate/__init__.py b/ipaserver/winsync_migrate/__init__.py
deleted file mode 100644
index e0da63d..0000000
--- a/ipaserver/winsync_migrate/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Authors: Tomas Babej <tbabej@redhat.com>
-#
-# Copyright (C) 2015 Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-"""
-Base subpackage for winsync-migrate related code.
-"""
diff --git a/ipaserver/winsync_migrate/base.py b/ipaserver/winsync_migrate/base.py
index 21056a0..cb62c7e 100644
--- a/ipaserver/winsync_migrate/base.py
+++ b/ipaserver/winsync_migrate/base.py
@@ -32,7 +32,7 @@ from ipaserver.install import replication
DEFAULT_TRUST_VIEW_NAME = u'Default Trust View'
-class MigrateWinsync(admintool.AdminTool):
+class WinsyncMigrate(admintool.AdminTool):
"""
Tool to migrate winsync users.
"""
@@ -53,7 +53,7 @@ class MigrateWinsync(admintool.AdminTool):
"""
Adds command line options to the tool.
"""
- super(MigrateWinsync, cls).add_options(parser)
+ super(WinsyncMigrate, cls).add_options(parser)
parser.add_option(
"--realm",
@@ -77,8 +77,7 @@ class MigrateWinsync(admintool.AdminTool):
the realm passed via --realm option
"""
- # Require root to have access to HTTP keytab
- super(MigrateWinsync, self).validate_options(needs_root=True)
+ super(WinsyncMigrate, self).validate_options(needs_root=True)
if self.options.realm is None:
raise admintool.ScriptError(
@@ -223,10 +222,10 @@ class MigrateWinsync(admintool.AdminTool):
except errors.DatabaseError, e:
sys.exit("Cannot connect to the LDAP database. Please check if IPA is running.")
- super(MigrateWinsync, cls).main(argv)
+ super(WinsyncMigrate, cls).main(argv)
def run(self):
- super(MigrateWinsync, self).run()
+ super(WinsyncMigrate, self).run()
# Stop winsync agreement with the given host
self.delete_winsync_agreement()