View | Details | Raw Unified | Return to bug 55391 | Differences between
and this patch

Collapse All | Expand All

(-)a/test/ucs-test/tests/60_umc/75_ipchange_basic.py (-1 / +18 lines)
 Lines 23-36   def test_ipchange_basic(udm, ucr): Link Here 
23
	lo = utils.get_ldap_connection()
23
	lo = utils.get_ldap_connection()
24
	computer_object = lo.get(computer)
24
	computer_object = lo.get(computer)
25
	print(computer_object)
25
	print(computer_object)
26
27
	iface = ucr.get('interfaces/primary', 'eth0')
28
29
	## Test change IPv4 address
26
	ip = computer_object['aRecord']
30
	ip = computer_object['aRecord']
27
	utils.verify_ldap_object(computer, {'aRecord': ip})
31
	utils.verify_ldap_object(computer, {'aRecord': ip})
28
32
29
	new_ip = '1.2.3.4'
33
	new_ip = '1.2.3.4'
30
34
31
	iface = ucr.get('interfaces/primary', 'eth0')
32
	client = Client(ucr.get('ldap/master'), '%s$' % computerName, 'univention')
35
	client = Client(ucr.get('ldap/master'), '%s$' % computerName, 'univention')
33
	client.umc_command('ip/change', {'ip': new_ip, 'oldip': ip[0].decode('UTF-8'), 'netmask': ucr.get('interfaces/%s/netmask' % iface), 'role': role})
36
	client.umc_command('ip/change', {'ip': new_ip, 'oldip': ip[0].decode('UTF-8'), 'netmask': ucr.get('interfaces/%s/netmask' % iface), 'role': role})
34
37
35
	utils.wait_for_replication()
38
	utils.wait_for_replication()
36
	utils.verify_ldap_object(computer, {'aRecord': [new_ip]}, strict=True)
39
	utils.verify_ldap_object(computer, {'aRecord': [new_ip]}, strict=True)
40
41
	## Test change IPv6 address
42
	if ucr.get('interfaces/%s/ipv6/default/prefix' % iface):
43
		ip = computer_object['aAAARecord']
44
		utils.verify_ldap_object(computer, {'aAAARecord': ip})
45
46
		new_ip = 'fdff:1:2:3::4'
47
		new_ip = 'fdff:0001:0002:0003:0000:0000:0000:0004'
48
49
		client = Client(ucr.get('ldap/master'), '%s$' % computerName, 'univention')
50
		client.umc_command('ip/change', {'ip': new_ip, 'oldip': ip[0].decode('UTF-8'), 'netmask': ucr.get('interfaces/%s/ipv6/default/prefix' % iface), 'role': role})
51
52
		utils.wait_for_replication()
53
		utils.verify_ldap_object(computer, {'aAAARecord': [new_ip]}, strict=True)
(-)a/test/ucs-test/tests/60_umc/76_ipchange_ucs_sso (-1 / +29 lines)
 Lines 45-50   if __name__ == '__main__': Link Here 
45
		lo = utils.get_ldap_connection()
45
		lo = utils.get_ldap_connection()
46
		computer_object = lo.get(computer)
46
		computer_object = lo.get(computer)
47
		print(computer_object)
47
		print(computer_object)
48
49
		iface = ucr.get('interfaces/primary', 'eth0')
50
51
		# Test change IPv4 address
48
		ip = computer_object['aRecord']
52
		ip = computer_object['aRecord']
49
		utils.verify_ldap_object(computer, {'aRecord': ip})
53
		utils.verify_ldap_object(computer, {'aRecord': ip})
50
54
 Lines 58-64   if __name__ == '__main__': Link Here 
58
		try:
62
		try:
59
			new_ip = '1.2.3.10'
63
			new_ip = '1.2.3.10'
60
64
61
			iface = ucr.get('interfaces/primary', 'eth0')
62
			client = Client(ucr.get('ldap/master'), '%s$' % computerName, 'univention')
65
			client = Client(ucr.get('ldap/master'), '%s$' % computerName, 'univention')
63
			client.umc_command('ip/change', {'ip': new_ip, 'oldip': ip[0].decode('UTF-8'), 'netmask': ucr.get('interfaces/%s/netmask' % iface), 'role': role})
66
			client.umc_command('ip/change', {'ip': new_ip, 'oldip': ip[0].decode('UTF-8'), 'netmask': ucr.get('interfaces/%s/netmask' % iface), 'role': role})
64
67
 Lines 67-69   if __name__ == '__main__': Link Here 
67
			utils.verify_ldap_object(ucs_sso_dn, {'aRecord': ips + [new_ip]}, strict=True)
70
			utils.verify_ldap_object(ucs_sso_dn, {'aRecord': ips + [new_ip]}, strict=True)
68
		finally:
71
		finally:
69
			lo.modify(ucs_sso_dn, [('aRecord', lo.get(ucs_sso_dn).get('aRecord'), ips)])
72
			lo.modify(ucs_sso_dn, [('aRecord', lo.get(ucs_sso_dn).get('aRecord'), ips)])
73
74
		# Test change IPv6 address
75
		if ucr.get('interfaces/%s/ipv6/default/prefix' % iface):
76
			ip = computer_object['aAAARecord']
77
			utils.verify_ldap_object(computer, {'aAAARecord': ip})
78
79
			for ucs_sso_dn, ucs_sso_object in lo.search('relativeDomainName=ucs-sso', unique=True, required=True):
80
				ips = ucs_sso_object.get('aAAARecord')
81
				break
82
			else:
83
				raise ValueError('no ucs-sso host found.')
84
85
			lo.modify(ucs_sso_dn, [('aAAARecord', ips, ips + ip)])
86
			try:
87
				new_ip = 'fdff:1:2:3:10'
88
				new_ip = 'fdff:0001:0002:0003:0000:0000:0000:0010'
89
90
				client = Client(ucr.get('ldap/master'), '%s$' % computerName, 'univention')
91
				client.umc_command('ip/change', {'ip': new_ip, 'oldip': ip[0].decode('UTF-8'), 'netmask': ucr.get('interfaces/%s/ipv6/default/prefix' % iface), 'role': role})
92
93
				utils.wait_for_replication()
94
				utils.verify_ldap_object(computer, {'aAAARecord': [new_ip]}, strict=True)
95
				utils.verify_ldap_object(ucs_sso_dn, {'aAAARecord': ips + [new_ip]}, strict=True)
96
			finally:
97
				lo.modify(ucs_sso_dn, [('aAAARecord', lo.get(ucs_sso_dn).get('aAAARecord'), ips)])

Return to bug 55391