openstack/neutron
Code Issues Proposed changes

Merge "Add check that external gw port exist when metering-agent adds a rule"

Browse Source
This commit is contained in:
Jenkins
2016-04-21 00:20:36 +00:00
committed by Gerrit Code Review
parent 41228d9adf f73dae0a65
commit 970fa5d37b
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/services/metering/drivers/iptables/iptables_driver.py
View File

@@ -135,7 +135,11 @@ class IptablesMeteringDriver(abstract_driver.MeteringAbstractDriver):
def _process_metering_label_rules(self, rm, rules, label_chain,
rules_chain):
im = rm.iptables_manager
ext_dev = self.get_external_device_name(rm.router['gw_port_id'])
ex_gw_port = rm.router.get('gw_port_id')
if not ex_gw_port:
return
ext_dev = self.get_external_device_name(ex_gw_port)
if not ext_dev:
return

30
neutron/tests/unit/services/metering/drivers/test_iptables.py
View File

@@ -166,6 +166,36 @@ class IptablesDriverTestCase(base.BaseTestCase):
self.v4filter_inst.assert_has_calls(calls)
def test_process_metering_label_rules_with_no_gateway_router(self):
routers = copy.deepcopy(TEST_ROUTERS)
for router in routers:
router['gw_port_id'] = None
self.metering.add_metering_label(None, routers)
calls = [mock.call.add_chain('neutron-meter-l-c5df2fe5-c60',
wrap=False),
mock.call.add_chain('neutron-meter-r-c5df2fe5-c60',
wrap=False),
mock.call.add_rule('neutron-meter-FORWARD', '-j '
'neutron-meter-r-c5df2fe5-c60',
wrap=False),
mock.call.add_rule('neutron-meter-l-c5df2fe5-c60',
'',
wrap=False),
mock.call.add_chain('neutron-meter-l-eeef45da-c60',
wrap=False),
mock.call.add_chain('neutron-meter-r-eeef45da-c60',
wrap=False),
mock.call.add_rule('neutron-meter-FORWARD', '-j '
'neutron-meter-r-eeef45da-c60',
wrap=False),
mock.call.add_rule('neutron-meter-l-eeef45da-c60',
'',
wrap=False)]
self.v4filter_inst.assert_has_calls(calls, any_order=False)
def test_add_metering_label_with_rules(self):
routers = copy.deepcopy(TEST_ROUTERS)
routers[1]['_metering_labels'][0]['rules'][0].update({