From 657fc760dab834f352a552cba486e69e80c676c0 Mon Sep 17 00:00:00 2001 From: Tibor Dudlák Date: Mar 29 2019 17:58:49 +0000 Subject: Fix test_ntp_options to use tasks' methods Use methods: - tasks.replica_install() - tasks.client_install() instead of custom methods. Move ntp_pool/server to class scope. Using teardown_method for cleanup. Edit tasks.client_install to return result of installation. Refactor install_replica task: Add promote parameter to install_replica task. Add ntp_args to install_client call and remove from replica installation from tasks.install_replica while promoting. Use case while not promoting has to have user allowed to enroll a replica and server to contact in case autodiscovery does not work. Related: https://pagure.io/freeipa/issue/7719 Reviewed-By: Christian Heimes Reviewed-By: Florence Blanc-Renaud Reviewed-By: Sergey Orlov Reviewed-By: Alexander Bokovoy Reviewed-By: Armando Neto --- diff --git a/ipatests/prci_definitions/nightly_master.yaml b/ipatests/prci_definitions/nightly_master.yaml index 046757b..7f00204 100644 --- a/ipatests/prci_definitions/nightly_master.yaml +++ b/ipatests/prci_definitions/nightly_master.yaml @@ -1169,6 +1169,18 @@ jobs: timeout: 3600 topology: *master_1repl + fedora-29/test_ntp_options: + requires: [fedora-29/build] + priority: 50 + job: + class: RunPytest + args: + build_url: '{fedora-29/build_url}' + test_suite: test_integration/test_ntp_options.py::TestNTPoptions + template: *ci-master-f29 + timeout: 7200 + topology: *master_1repl_1client + fedora-29/test_pkinit_manage: requires: [fedora-29/build] priority: 50 @@ -1204,15 +1216,3 @@ jobs: template: *ci-master-f29 timeout: 3600 topology: *ipaserver - - fedora-29/test_ntp_options: - requires: [fedora-29/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-29/build_url}' - test_suite: test_integration/test_ntp_options.py::TestNTPoptions - template: *ci-master-f29 - timeout: 7200 - topology: *master_1repl_1client diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py index 30a31bd..2d5d136 100644 --- a/ipatests/pytest_ipa/integration/tasks.py +++ b/ipatests/pytest_ipa/integration/tasks.py @@ -423,7 +423,11 @@ def config_replica_resolvconf_with_master_data(master, replica): def install_replica(master, replica, setup_ca=True, setup_dns=False, setup_kra=False, setup_adtrust=False, extra_args=(), domain_level=None, unattended=True, stdin_text=None, - raiseonerr=True): + raiseonerr=True, promote=True): + """ + This task installs client and then promote it to the replica + """ + replica_args = list(extra_args) # needed for client's ntp options if domain_level is None: domain_level = domainlevel(master) check_domain_level(domain_level) @@ -433,8 +437,25 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False, # Otherwise ipa-client-install would not create a PTR # and replica installation would fail args = ['ipa-replica-install', - '-p', replica.config.dirman_password, - '-w', replica.config.admin_password] + '--admin-password', replica.config.admin_password] + + if promote: # while promoting we use directory manager password + args.extend(['--password', replica.config.dirman_password]) + # install client on a replica machine and then promote it to replica + # to configure ntp options we have to pass them to client installation + # because promotion does not support NTP options + ntp_args = [arg for arg in replica_args if "-ntp" in arg] + + for ntp_arg in ntp_args: + replica_args.remove(ntp_arg) + + install_client(master, replica, extra_args=ntp_args) + else: + # for one step installation of replica we need authorized user + # to enroll a replica and master server to contact + args.extend(['--principal', replica.config.admin_name, + '--server', master.hostname]) + if unattended: args.append('-U') if setup_ca: @@ -452,12 +473,11 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False, if master_authoritative_for_client_domain(master, replica): args.extend(['--ip-address', replica.ip]) - args.extend(extra_args) + args.extend(replica_args) # append extra arguments to installation - # install client on a replica machine and then promote it to replica - install_client(master, replica) fix_apache_semaphores(replica) - args.extend(['-r', replica.domain.realm]) + args.extend(['--realm', replica.domain.realm, + '--domain', replica.domain.name]) result = replica.run_command(args, raiseonerr=raiseonerr, stdin_text=stdin_text) @@ -486,17 +506,20 @@ def install_client(master, client, extra_args=(), if password is None: password = client.config.admin_password - client.run_command(['ipa-client-install', '-U', - '--domain', client.domain.name, - '--realm', client.domain.realm, - '-p', user, - '-w', password, - '--server', master.hostname] - + list(extra_args)) + result = client.run_command([ + 'ipa-client-install', '-U', + '--domain', client.domain.name, + '--realm', client.domain.realm, + '-p', user, + '-w', password, + '--server', master.hostname] + list(extra_args) + ) setup_sssd_debugging(client) kinit_admin(client) + return result + def install_adtrust(host): """ diff --git a/ipatests/test_integration/test_ntp_options.py b/ipatests/test_integration/test_ntp_options.py index e99ce3a..e0d5999 100644 --- a/ipatests/test_integration/test_ntp_options.py +++ b/ipatests/test_integration/test_ntp_options.py @@ -2,6 +2,7 @@ # Copyright (C) 2018 FreeIPA Contributors see COPYING for license # +from __future__ import absolute_import from ipatests.test_integration.base import IntegrationTest from ipatests.pytest_ipa.integration import tasks from ipaplatform.paths import paths @@ -17,26 +18,15 @@ class TestNTPoptions(IntegrationTest): num_clients = 1 num_replicas = 1 + ntp_pool = "pool.ntp.org" + ntp_server1 = "1.pool.ntp.org" + ntp_server2 = "2.pool.ntp.org" + @classmethod def install(cls, mh): cls.client = cls.clients[0] cls.replica = cls.replicas[0] - def install_client(self, *args): - cmd = ['ipa-client-install', '-U', - '--domain', self.client.domain.name, - '--realm', self.client.domain.realm, - '-p', self.client.config.admin_name, - '-w', self.client.config.admin_password, - '--server', self.master.hostname, *args] - return self.client.run_command(cmd, raiseonerr=False) - - def install_replica(self, *args): - cmd = ['ipa-replica-install', '-w', self.master.config.admin_password, - '-n', self.master.domain.name, '-r', self.master.domain.realm, - '--server', self.master.hostname, '-U', *args] - return self.replica.run_command(cmd, raiseonerr=False) - def test_server_client_install_without_options(self): """ test to verify that ipa-server and ipa-client install uses @@ -50,12 +40,11 @@ class TestNTPoptions(IntegrationTest): assert expected_msg1 in server_install.stderr_text assert expected_msg2 in server_install.stdout_text - client_install = self.install_client() + client_install = tasks.install_client(self.master, self.client) + assert expected_msg1 in client_install.stderr_text assert expected_msg2 in client_install.stdout_text - self.cleanup() - def test_server_client_install_no_ntp(self): """ test to verify that ipa-server and ipa-client install invoked with @@ -69,96 +58,118 @@ class TestNTPoptions(IntegrationTest): assert expected_msg1 in server_install.stdout_text assert expected_msg2 not in server_install.stdout_text - client_install = self.install_client('--no-ntp') + client_install = tasks.install_client(self.master, self.client, + extra_args=['--no-ntp']) assert expected_msg2 not in client_install.stdout_text - self.cleanup() - def test_server_client_install_with_multiple_ntp_srv(self): """ test to verify that ipa-server-install passes with multiple --ntp-server option used """ - ntp_server1 = "1.pool.ntp.org" - ntp_server2 = "2.pool.ntp.org" expected_msg = "Configuration of chrony was changed by installer." + args = ['--ntp-server=%s' % self.ntp_server1, + '--ntp-server=%s' % self.ntp_server2] - server_install = tasks.install_master( - self.master, setup_dns=False, - extra_args=['--ntp-server=%s' % ntp_server1, - '--ntp-server=%s' % ntp_server2]) + server_install = tasks.install_master(self.master, setup_dns=False, + extra_args=args) assert expected_msg in server_install.stderr_text cmd = self.master.run_command(['cat', paths.CHRONY_CONF]) - assert ntp_server1 in cmd.stdout_text - assert ntp_server2 in cmd.stdout_text + assert self.ntp_server1 in cmd.stdout_text + assert self.ntp_server2 in cmd.stdout_text - client_install = self.install_client('--ntp-server=%s' % ntp_server1, - '--ntp-server=%s' % ntp_server2) + client_install = tasks.install_client(self.master, self.client, + extra_args=args) assert expected_msg in client_install.stderr_text cmd = self.client.run_command(['cat', paths.CHRONY_CONF]) - assert ntp_server1 in cmd.stdout_text - assert ntp_server2 in cmd.stdout_text - - self.cleanup() + assert self.ntp_server1 in cmd.stdout_text + assert self.ntp_server2 in cmd.stdout_text def test_server_replica_client_install_with_pool_and_srv(self): """ test to verify that ipa-server, ipa-replica and ipa-client install passes with options --ntp-pool and --ntp-server together """ - ntp_pool = "pool.ntp.org" - ntp_server = "1.pool.ntp.org" expected_msg = "Configuration of chrony was changed by installer." + args = ['--ntp-pool=%s' % self.ntp_pool, + '--ntp-server=%s' % self.ntp_server1] - server_install = tasks.install_master( - self.master, setup_dns=False, - extra_args=['--ntp-pool=%s' % ntp_pool, - '--ntp-server=%s' % ntp_server]) + server_install = tasks.install_master(self.master, setup_dns=False, + extra_args=args) assert expected_msg in server_install.stderr_text cmd = self.master.run_command(['cat', paths.CHRONY_CONF]) - assert ntp_pool in cmd.stdout_text - assert ntp_server in cmd.stdout_text + assert self.ntp_pool in cmd.stdout_text + assert self.ntp_server1 in cmd.stdout_text - replica_install = self.install_replica('--ntp-pool=%s' % ntp_pool, - '--ntp-server=%s' % ntp_server) + replica_install = tasks.install_replica(self.master, self.replica, + extra_args=args, + promote=False) assert expected_msg in replica_install.stderr_text + cmd = self.replica.run_command(['cat', paths.CHRONY_CONF]) - assert ntp_pool in cmd.stdout_text - assert ntp_server in cmd.stdout_text + assert self.ntp_pool in cmd.stdout_text + assert self.ntp_server1 in cmd.stdout_text - client_install = self.install_client('--ntp-pool=%s' % ntp_pool, - '--ntp-server=%s' % ntp_server) + client_install = tasks.install_client(self.master, self.client, + extra_args=args) assert expected_msg in client_install.stderr_text cmd = self.client.run_command(['cat', paths.CHRONY_CONF]) - assert ntp_pool in cmd.stdout_text - assert ntp_server in cmd.stdout_text - tasks.uninstall_master(self.replica) + assert self.ntp_pool in cmd.stdout_text + assert self.ntp_server1 in cmd.stdout_text - self.cleanup() + def test_server_promoted_replica_client_install_with_srv(self): + """ + test to verify that ipa-server, promotion of ipa-replica and + ipa-client install passes with options --ntp-server + """ + expected_msg = "Configuration of chrony was changed by installer." + args = ['--ntp-server=%s' % self.ntp_server1] + + server_install = tasks.install_master(self.master, setup_dns=False, + extra_args=args) + assert expected_msg in server_install.stderr_text + cmd = self.master.run_command(['cat', paths.CHRONY_CONF]) + assert self.ntp_server1 in cmd.stdout_text + + replica_install = tasks.install_replica(self.master, self.replica, + extra_args=args, + promote=True) + # while promoting with tasks expected_msg will not be in output + assert expected_msg not in replica_install.stderr_text + + cmd = self.replica.run_command(['cat', paths.CHRONY_CONF]) + assert self.ntp_server1 in cmd.stdout_text + + client_install = tasks.install_client(self.master, self.client, + extra_args=args) + assert expected_msg in client_install.stderr_text + cmd = self.client.run_command(['cat', paths.CHRONY_CONF]) + assert self.ntp_server1 in cmd.stdout_text def test_server_client_install_mixed_options(self): """ test to verify that ipa-server and ipa-client install with - --ntp-server and -N options would fail + --ntp-server and -N options would fail """ - ntp_server = "1.pool.ntp.org" exp_str = ("error: --ntp-server cannot be used" " together with --no-ntp") exp_pool_str = ("error: --ntp-pool cannot be used" " together with --no-ntp") - args1 = ['ipa-server-install', '-N', '--ntp-server=%s' % ntp_server] + args1 = ['ipa-server-install', '-N', + '--ntp-server=%s' % self.ntp_server1] server_install = self.master.run_command(args1, raiseonerr=False) assert server_install.returncode == 2 assert exp_str in server_install.stderr_text - args2 = ['ipa-client-install', '-N', '--ntp-server=%s' % ntp_server] + args2 = ['ipa-client-install', '--no-ntp', + '--ntp-server=%s' % self.ntp_server2] client_install = self.client.run_command(args2, raiseonerr=False) assert client_install.returncode == 2 assert exp_str in client_install.stderr_text args3 = ['ipa-client-install', '-N', - '--ntp-pool=%s' % ntp_server.lstrip('1.')] + '--ntp-pool=%s' % self.ntp_pool] client_install = self.client.run_command(args3, raiseonerr=False) assert client_install.returncode == 2 assert exp_pool_str in client_install.stderr_text @@ -166,62 +177,61 @@ class TestNTPoptions(IntegrationTest): def test_replica_promotion_with_ntp_options(self): """ test to verify that replica promotion with ntp --ntp-server, - --ntp-pool and -N or --no-ntp option would fail + --ntp-pool and -N or --no-ntp option would fail """ - ntp_server = "1.pool.ntp.org" - ntp_pool = "pool.ntp.org" exp_str = "NTP configuration cannot be updated during promotion" tasks.install_master(self.master, setup_dns=False) tasks.install_client(self.master, self.replica) - try: - replica_install = self.replica.run_command( - ['ipa-replica-install', '-N'], raiseonerr=False) - assert replica_install.returncode == 1 - assert exp_str in replica_install.stderr_text - - replica_install = self.replica.run_command( - ['ipa-replica-install', '--ntp-server=%s' % ntp_server], - raiseonerr=False) - assert replica_install.returncode == 1 - assert exp_str in replica_install.stderr_text + replica_install = self.replica.run_command( + ['ipa-replica-install', '--no-ntp'], + raiseonerr=False) + assert replica_install.returncode == 1 + assert exp_str in replica_install.stderr_text - replica_install = self.replica.run_command( - ['ipa-replica-install', '--ntp-pool=%s' % ntp_pool], - raiseonerr=False) - assert replica_install.returncode == 1 - assert exp_str in replica_install.stderr_text + replica_install = self.replica.run_command( + ['ipa-replica-install', '--ntp-server=%s' % self.ntp_server1], + raiseonerr=False) + assert replica_install.returncode == 1 + assert exp_str in replica_install.stderr_text - finally: - tasks.uninstall_master(self.replica) - self.cleanup() + replica_install = self.replica.run_command( + ['ipa-replica-install', '--ntp-pool=%s' % self.ntp_pool], + raiseonerr=False) + assert replica_install.returncode == 1 + assert exp_str in replica_install.stderr_text def test_replica_promotion_without_ntp(self): """ test to verify that replica promotion without ntp options - - ipa-client install with ntp option - - ipa-replica without ntp option + - ipa-client-install with ntp option + - ipa-replica-install without ntp option will be successful """ - ntp_pool = "pool.ntp.org" exp_str = "ipa-replica-install command was successful" + expected_msg = "Configuration of chrony was changed by installer." + ntp_args = ['--ntp-pool=%s' % self.ntp_pool] - tasks.install_master(self.master, setup_dns=False) - tasks.install_client(self.master, self.replica, - extra_args=['--ntp-pool=%s' % ntp_pool]) + server_install = tasks.install_master(self.master, setup_dns=False, + extra_args=ntp_args) + assert expected_msg in server_install.stderr_text - replica_install = self.replica.run_command( - ['ipa-replica-install'], raiseonerr=False) + client_install = tasks.install_client(self.master, self.replica, + extra_args=ntp_args) + assert expected_msg in client_install.stderr_text + + replica_install = tasks.install_replica(self.master, self.replica, + promote=False) assert exp_str in replica_install.stderr_text - cmd = self.replica.run_command(['cat', paths.CHRONY_CONF]) - assert ntp_pool in cmd.stdout_text - tasks.uninstall_master(self.replica) + cmd = self.replica.run_command(['cat', paths.CHRONY_CONF]) + assert self.ntp_pool in cmd.stdout_text - def cleanup(self): + def teardown_method(self, method): """ - Uninstall ipa-server and ipa-client + Uninstall ipa-server, ipa-replica and ipa-client """ tasks.uninstall_client(self.client) + tasks.uninstall_master(self.replica) tasks.uninstall_master(self.master)