openstack/neutron
Code Issues Proposed changes

Merge "test_db_base_plugin_v2: Don't assume the order of fixed_ips"

Browse Source
This commit is contained in:
Jenkins 2015-06-04 12:08:31 +00:00 committed by Gerrit Code Review
commit e95510f8d1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/unit/db/test_db_base_plugin_v2.py
View File

@ -1868,7 +1868,6 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s
ip_version=6, ip_version=6,
ipv6_ra_mode=constants.IPV6_SLAAC) ipv6_ra_mode=constants.IPV6_SLAAC)
port = self._make_port(self.fmt, network['network']['id']) port = self._make_port(self.fmt, network['network']['id'])
self.assertEqual(len(port['port']['fixed_ips']), 2)
port_mac = port['port']['mac_address'] port_mac = port['port']['mac_address']
cidr_1 = v6_subnet_1['subnet']['cidr'] cidr_1 = v6_subnet_1['subnet']['cidr']
cidr_2 = v6_subnet_2['subnet']['cidr'] cidr_2 = v6_subnet_2['subnet']['cidr']
@ -1876,10 +1875,9 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s
port_mac)) port_mac))
eui_addr_2 = str(ipv6_utils.get_ipv6_addr_by_EUI64(cidr_2, eui_addr_2 = str(ipv6_utils.get_ipv6_addr_by_EUI64(cidr_2,
port_mac)) port_mac))
self.assertEqual(port['port']['fixed_ips'][0]['ip_address'], self.assertEqual({eui_addr_1, eui_addr_2},
eui_addr_1) {fixed_ip['ip_address'] for fixed_ip in
self.assertEqual(port['port']['fixed_ips'][1]['ip_address'], port['port']['fixed_ips']})
eui_addr_2)
def test_range_allocation(self): def test_range_allocation(self):
with self.subnet(gateway_ip='10.0.0.3', with self.subnet(gateway_ip='10.0.0.3',