x/vmware-nsx
Code Issues Proposed changes

Fix router firewall interface tests

Browse Source 
Tests 'test_router_interfaces_with_update_firewall' and
'test_router_interfaces_different_tenants_update_firewall'
were indeterminately failing because comparsion between two lists
which are not sorted and the order of items in the list
depended on the router port list order, as it returns from the database query.

This patch fix this problem by sorting the return ports ciders list.

Signed-off-by: Roey Chen <roeyc@vmware.com>
Change-Id: I90c68f30ac43e7fe8c1f635d38bde08e418ed3b8
This commit is contained in:
Roey Chen 2015-01-01 05:03:45 -08:00
parent 71c12d0f92
commit be7564875e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py
View File

@ -1257,7 +1257,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
subnet_qry = context.session.query(models_v2.Subnet)
subnet = subnet_qry.filter_by(id=ip.subnet_id).one()
cidrs.append(subnet.cidr)
return cidrs
return sorted(cidrs)
def _get_nat_rules(self, context, router):
fip_qry = context.session.query(l3_db.FloatingIP)

14
vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py
View File

@ -1343,8 +1343,6 @@ class TestL3NatTestCase(L3NatTest,
yield update_edge
def test_router_interfaces_with_update_firewall(self):
#TODO(kobis): unskip
self.skipTest('resolve value order problem')
with mock.patch.object(edge_utils, "update_firewall") as firewall:
with self.router() as r:
s1_cidr = '10.0.0.0/24'
@ -1361,12 +1359,13 @@ class TestL3NatTestCase(L3NatTest,
r['router']['id'],
s2['subnet']['id'],
None)
expected_cidrs = sorted([s1_cidr, s2_cidr])
expected_fw = {
'firewall_rule_list': [
{'action': 'allow',
'enabled': True,
'source_ip_address': [s2_cidr, s1_cidr],
'destination_ip_address': [s2_cidr, s1_cidr]}]}
'source_ip_address': expected_cidrs,
'destination_ip_address': expected_cidrs}]}
firewall.assert_called_once_with(
mock.ANY, mock.ANY, mock.ANY,
expected_fw, allow_external=True)
@ -1380,8 +1379,6 @@ class TestL3NatTestCase(L3NatTest,
None)
def test_router_interfaces_different_tenants_update_firewall(self):
#TODO(kobis): unskip
self.skipTest('resolve value order problem')
tenant_id = _uuid()
other_tenant_id = _uuid()
with mock.patch.object(edge_utils, "update_firewall") as firewall:
@ -1406,12 +1403,13 @@ class TestL3NatTestCase(L3NatTest,
s1['subnet']['id'],
None,
tenant_id=tenant_id)
expected_cidrs = sorted([s1_cidr, s2_cidr])
expected_fw = {
'firewall_rule_list': [
{'action': 'allow',
'enabled': True,
'source_ip_address': [s1_cidr, s2_cidr],
'destination_ip_address': [s1_cidr, s2_cidr]}]}
'source_ip_address': expected_cidrs,
'destination_ip_address': expected_cidrs}]}
firewall.assert_called_once_with(
mock.ANY, mock.ANY, mock.ANY,
expected_fw, allow_external=True)