IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed segment naming in topology tests

Browse Source 
As the segment name is a stochastic valu, which can have either of the two
nodes as the left node, we need to adapt the tests to not expect some
particular segment name but rather to calculate it dynamically based on node
names and the output of topologysegment-find ipa call

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Oleg Fayans 2016-08-24 13:48:56 +02:00 committed by Martin Basti
parent d13a4c2f39
commit 49fbbb0641
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ipatests/test_integration/test_topology.py
View File

@ -15,6 +15,18 @@ from ipatests.util import assert_deepequal
config = get_global_config() config = get_global_config()
reasoning = "Topology plugin disabled due to domain level 0" reasoning = "Topology plugin disabled due to domain level 0"
def find_segment(master, replica):
result = master.run_command(['ipa', 'topologysegment-find',
DOMAIN_SUFFIX_NAME]).stdout_text
segment_re = re.compile('Left node: (?P<left>\S+)\n.*Right node: '
'(?P<right>\S+)\n')
allsegments = segment_re.findall(result)
for segment in allsegments:
if master.hostname in segment and replica.hostname in segment:
return '-to-'.join(segment)
@pytest.mark.skipif(config.domain_level == 0, reason=reasoning) @pytest.mark.skipif(config.domain_level == 0, reason=reasoning)
class TestTopologyOptions(IntegrationTest): class TestTopologyOptions(IntegrationTest):
num_replicas = 2 num_replicas = 2
@ -25,6 +37,7 @@ class TestTopologyOptions(IntegrationTest):
'\s+Connectivity: (?P<connectivity>\S+)') '\s+Connectivity: (?P<connectivity>\S+)')
segment_re = re.compile("\n".join(rawsegment_re)) segment_re = re.compile("\n".join(rawsegment_re))
noentries_re = re.compile("Number of entries returned (\d+)") noentries_re = re.compile("Number of entries returned (\d+)")
segmentnames_re = re.compile('.*Segment name: (\S+?)\n.*')
@classmethod @classmethod
def install(cls, mh): def install(cls, mh):
@ -62,15 +75,11 @@ class TestTopologyOptions(IntegrationTest):
tasks.kinit_admin(self.master) tasks.kinit_admin(self.master)
result1 = self.master.run_command(['ipa', 'topologysegment-find', result1 = self.master.run_command(['ipa', 'topologysegment-find',
DOMAIN_SUFFIX_NAME]).stdout_text DOMAIN_SUFFIX_NAME]).stdout_text
first_segment_name = "%s-to-%s" % (self.master.hostname, segment_name = self.segmentnames_re.findall(result1)[0]
self.replicas[0].hostname) assert(self.master.hostname in segment_name), (
expected_segment = { "Segment %s does not contain master hostname" % segment_name)
'connectivity': 'both', assert(self.replicas[0].hostname in segment_name), (
'leftnode': self.master.hostname, "Segment %s does not contain replica hostname" % segment_name)
'name': first_segment_name,
'rightnode': self.replicas[0].hostname}
firstsegment = self.tokenize_topologies(result1)[0]
assert_deepequal(expected_segment, firstsegment)
tasks.install_replica(self.master, self.replicas[1], setup_ca=False, tasks.install_replica(self.master, self.replicas[1], setup_ca=False,
setup_dns=False) setup_dns=False)
# We need to make sure topology information is consistent across all # We need to make sure topology information is consistent across all
@ -117,8 +126,10 @@ class TestTopologyOptions(IntegrationTest):
"%s: segment not found" % segment['name']) "%s: segment not found" % segment['name'])
# Remove master <-> replica2 segment and make sure that the changes get # Remove master <-> replica2 segment and make sure that the changes get
# there through replica1 # there through replica1
deleteme = "%s-to-%s" % (self.master.hostname, # Since segment name can be one of master-to-replica2 or
self.replicas[1].hostname) # replica2-to-master, we need to determine the segment name dynamically
deleteme = find_segment(self.master, self.replicas[1])
returncode, error = tasks.destroy_segment(self.master, deleteme) returncode, error = tasks.destroy_segment(self.master, deleteme)
assert returncode == 0, error assert returncode == 0, error
# Wait till replication ends and make sure replica1 does not have # Wait till replication ends and make sure replica1 does not have