x/vmware-nsx
Code Issues Proposed changes

Merge "only destroy single namespace if router_id is set"

Browse Source
This commit is contained in:
Jenkins 2013-02-12 10:40:23 +00:00 committed by Gerrit Code Review
commit 50cd5255e8
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
quantum/agent/l3_agent.py
View File

@ -165,16 +165,23 @@ class L3NATAgent(manager.Manager):
self.fullsync = True self.fullsync = True
self.sync_sem = semaphore.Semaphore(1) self.sync_sem = semaphore.Semaphore(1)
if self.conf.use_namespaces: if self.conf.use_namespaces:
self._destroy_all_router_namespaces() self._destroy_router_namespaces(self.conf.router_id)
super(L3NATAgent, self).__init__(host=self.conf.host) super(L3NATAgent, self).__init__(host=self.conf.host)
def _destroy_all_router_namespaces(self): def _destroy_router_namespaces(self, only_router_id=None):
"""Destroy all router namespaces on the host to eliminate """Destroy router namespaces on the host to eliminate all stale
all stale linux devices, iptables rules, and namespaces. linux devices, iptables rules, and namespaces.
If only_router_id is passed, only destroy single namespace, to allow
for multiple l3 agents on the same host, without stepping on each
other's toes on init. This only makes sense if router_id is set.
""" """
root_ip = ip_lib.IPWrapper(self.root_helper) root_ip = ip_lib.IPWrapper(self.root_helper)
for ns in root_ip.get_namespaces(self.root_helper): for ns in root_ip.get_namespaces(self.root_helper):
if ns.startswith(NS_PREFIX): if ns.startswith(NS_PREFIX):
if only_router_id and not ns.endswith(only_router_id):
continue
try: try:
self._destroy_router_namespace(ns) self._destroy_router_namespace(ns)
except: except:

30
quantum/tests/unit/test_l3_agent.py
View File

@ -290,9 +290,35 @@ class TestBasicRouterOperations(unittest2.TestCase):
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
self.mock_ip.get_namespaces.return_value = ['qrouter-foo'] self.mock_ip.get_namespaces.return_value = ['qrouter-foo',
'qrouter-bar']
self.mock_ip.get_devices.return_value = [FakeDev('qr-aaaa'), self.mock_ip.get_devices.return_value = [FakeDev('qr-aaaa'),
FakeDev('qgw-aaaa')] FakeDev('qgw-aaaa')]
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
agent._destroy_all_router_namespaces()
agent._destroy_router_namespace = mock.MagicMock()
agent._destroy_router_namespaces()
self.assertEqual(agent._destroy_router_namespace.call_count, 2)
def testDestroyNamespaceWithRouterId(self):
class FakeDev(object):
def __init__(self, name):
self.name = name
self.conf.router_id = _uuid()
namespaces = ['qrouter-foo', 'qrouter-' + self.conf.router_id]
self.mock_ip.get_namespaces.return_value = namespaces
self.mock_ip.get_devices.return_value = [FakeDev('qr-aaaa'),
FakeDev('qgw-aaaa')]
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
agent._destroy_router_namespace = mock.MagicMock()
agent._destroy_router_namespaces(self.conf.router_id)
self.assertEqual(agent._destroy_router_namespace.call_count, 1)