]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
test_db_base_plugin_v2: Don't assume the order of fixed_ips
authorYAMAMOTO Takashi <yamamoto@midokura.com>
Wed, 3 Jun 2015 13:21:52 +0000 (22:21 +0900)
committerYAMAMOTO Takashi <yamamoto@midokura.com>
Thu, 4 Jun 2015 04:12:18 +0000 (13:12 +0900)
Fixes test_ip_allocation_for_ipv6_2_subnet_slaac_mode
failures on my environment.

Change-Id: I18a9a177a60c364d79943a8d68b46fde3b9f5d74

neutron/tests/unit/db/test_db_base_plugin_v2.py

index cd381d7874b8978a292a08962a52d27612df812a..ff566b3d3832357361737e3adfa21aeb2907279d 100644 (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,
                                         ipv6_ra_mode=constants.IPV6_SLAAC)
         port = self._make_port(self.fmt, network['network']['id'])
-        self.assertEqual(len(port['port']['fixed_ips']), 2)
         port_mac = port['port']['mac_address']
         cidr_1 = v6_subnet_1['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))
         eui_addr_2 = str(ipv6_utils.get_ipv6_addr_by_EUI64(cidr_2,
                                                            port_mac))
-        self.assertEqual(port['port']['fixed_ips'][0]['ip_address'],
-                         eui_addr_1)
-        self.assertEqual(port['port']['fixed_ips'][1]['ip_address'],
-                         eui_addr_2)
+        self.assertEqual({eui_addr_1, eui_addr_2},
+                         {fixed_ip['ip_address'] for fixed_ip in
+                          port['port']['fixed_ips']})
 
     def test_range_allocation(self):
         with self.subnet(gateway_ip='10.0.0.3',