Merge "Switches metering agent to stateless iptables" into stable/mitaka

This commit is contained in:
Jenkins 2016-04-12 11:04:29 +00:00 committed by Gerrit Code Review
commit 0dcc9afc6d
2 changed files with 10 additions and 0 deletions

View File

@ -73,6 +73,7 @@ class RouterWithMetering(object):
self.iptables_manager = iptables_manager.IptablesManager(
namespace=self.ns_name,
binary_name=WRAP_NAME,
state_less=True,
use_ipv6=ipv6_utils.is_enabled())
self.metering_labels = {}

View File

@ -106,6 +106,15 @@ class IptablesDriverTestCase(base.BaseTestCase):
self.metering = iptables_driver.IptablesMeteringDriver('metering',
cfg.CONF)
def test_create_stateless_iptables_manager(self):
routers = TEST_ROUTERS[:1]
self.metering.add_metering_label(None, routers)
self.iptables_cls.assert_called_with(
binary_name=mock.ANY,
namespace=mock.ANY,
state_less=True,
use_ipv6=mock.ANY)
def test_add_metering_label(self):
routers = TEST_ROUTERS[:1]