diff options
| author | Lenka Doudova <ldoudova@redhat.com> | 2016-06-30 12:26:28 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-06-30 13:14:27 +0200 |
| commit | 1d9e1521c59a5b43c2322892ce5cbe8cceff2790 (patch) | |
| tree | 3442ab73161fd3442842b5b5467ecf753ebbbeef | |
| parent | 99339bf7892fcc1201e06e6a8105b0bb4681c4f4 (diff) | |
| download | freeipa-1d9e1521c59a5b43c2322892ce5cbe8cceff2790.tar.gz freeipa-1d9e1521c59a5b43c2322892ce5cbe8cceff2790.tar.xz freeipa-1d9e1521c59a5b43c2322892ce5cbe8cceff2790.zip | |
Tests: Remove DNS configuration from trust tests
Since DNS configuration is no longer needed for running trust tests, this method's contents are removed. Method is left empty as reference for others, should they have issues with DNS configuration.
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Oleg Fayans <ofayans@redhat.com>
| -rw-r--r-- | ipatests/test_integration/tasks.py | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 38218fa70..5be7cdae3 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -436,47 +436,11 @@ def install_adtrust(host): def configure_dns_for_trust(master, ad): """ - This configures DNS on IPA master according to the relationship of the - IPA's and AD's domains. + This method is intentionally left empty. Originally it served for DNS + configuration on IPA master according to the relationship of the IPA's + and AD's domains. """ - - def is_subdomain(subdomain, domain): - subdomain_unpacked = subdomain.split('.') - domain_unpacked = domain.split('.') - - subdomain_unpacked.reverse() - domain_unpacked.reverse() - - subdomain = False - - if len(subdomain_unpacked) > len(domain_unpacked): - subdomain = True - - for subdomain_segment, domain_segment in zip(subdomain_unpacked, - domain_unpacked): - subdomain = subdomain and subdomain_segment == domain_segment - - return subdomain - - kinit_admin(master) - - if is_subdomain(ad.domain.name, master.domain.name): - master.run_command(['ipa', 'dnsrecord-add', master.domain.name, - '%s.%s' % (ad.shortname, ad.netbios), - '--a-ip-address', ad.ip]) - - master.run_command(['ipa', 'dnsrecord-add', master.domain.name, - ad.netbios, - '--ns-hostname', - '%s.%s' % (ad.shortname, ad.netbios)]) - - master.run_command(['ipa', 'dnszone-mod', master.domain.name, - '--allow-transfer', ad.ip]) - else: - master.run_command(['ipa', 'dnsforwardzone-add', ad.domain.name, - '--forwarder', ad.ip, - '--forward-policy', 'only', - ]) + pass def establish_trust_with_ad(master, ad, extra_args=()): |