x/vmware-nsx
Code Issues Proposed changes

Remove use_namespaces from RouterInfo Property

Browse Source 
The use_namespaces property is a property of the agent, not the
router.  The router doesn't need to know if namespaces are in use by
the agent.

Change-Id: I50a1069fc654eeaafaa4098d926ae9e96e5d400f
This commit is contained in:
Carl Baldwin 2014-10-17 04:13:49 +00:00
parent 8b806c6771
commit ca15b5e9d1
8 changed files with 60 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/l3_agent.py
View File

@ -243,7 +243,7 @@ class LinkLocalAllocator(object):
class RouterInfo(l3_ha_agent.RouterMixin): class RouterInfo(l3_ha_agent.RouterMixin):
def __init__(self, router_id, root_helper, use_namespaces, router, def __init__(self, router_id, root_helper, router,
use_ipv6=False, ns_name=None): use_ipv6=False, ns_name=None):
self.router_id = router_id self.router_id = router_id
self.ex_gw_port = None self.ex_gw_port = None
@ -254,7 +254,6 @@ class RouterInfo(l3_ha_agent.RouterMixin):
self.floating_ips = set() self.floating_ips = set()
self.floating_ips_dict = {} self.floating_ips_dict = {}
self.root_helper = root_helper self.root_helper = root_helper
self.use_namespaces = use_namespaces
# Invoke the setter for establishing initial SNAT action # Invoke the setter for establishing initial SNAT action
self.router = router self.router = router
self.ns_name = ns_name self.ns_name = ns_name
@ -757,7 +756,6 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
if self.conf.use_namespaces else None) if self.conf.use_namespaces else None)
ri = RouterInfo(router_id=router_id, ri = RouterInfo(router_id=router_id,
root_helper=self.root_helper, root_helper=self.root_helper,
use_namespaces=self.conf.use_namespaces,
router=router, router=router,
use_ipv6=self.use_ipv6, use_ipv6=self.use_ipv6,
ns_name=ns_name) ns_name=ns_name)

2
neutron/services/firewall/agents/l3reference/firewall_l3_agent.py
View File

@ -106,7 +106,7 @@ class FWaaSL3AgentRpcCallback(api.FWaaSAgentRpcCallbackMixin):
# the router - but this is not yet populated in router_info # the router - but this is not yet populated in router_info
if rid not in self.router_info: if rid not in self.router_info:
continue continue
if self.router_info[rid].use_namespaces: if self.conf.use_namespaces:
router_ns = self.router_info[rid].ns_name router_ns = self.router_info[rid].ns_name
if router_ns in local_ns_list: if router_ns in local_ns_list:
router_info_list.append(self.router_info[rid]) router_info_list.append(self.router_info[rid])

3
neutron/services/firewall/agents/varmour/varmour_router.py
View File

@ -59,8 +59,7 @@ class vArmourL3NATAgent(l3_agent.L3NATAgent,
def _router_added(self, router_id, router): def _router_added(self, router_id, router):
LOG.debug(_("_router_added: %s"), router_id) LOG.debug(_("_router_added: %s"), router_id)
ri = l3_agent.RouterInfo(router_id, self.root_helper, ri = l3_agent.RouterInfo(router_id, self.root_helper, router)
self.conf.use_namespaces, router)
self.router_info[router_id] = ri self.router_info[router_id] = ri
super(vArmourL3NATAgent, self).process_router_add(ri) super(vArmourL3NATAgent, self).process_router_add(ri)

49
neutron/tests/unit/services/firewall/agents/l3reference/test_firewall_l3_agent.py
View File

@ -333,66 +333,41 @@ class TestFwaasL3AgentRpcCallback(base.BaseTestCase):
ctx, ctx,
fake_firewall_list[0]['id']) fake_firewall_list[0]['id'])
def _prepare_router_data(self, use_namespaces): def _prepare_router_data(self):
router = {'id': str(uuid.uuid4()), 'tenant_id': str(uuid.uuid4())} router = {'id': str(uuid.uuid4()), 'tenant_id': str(uuid.uuid4())}
ns = "ns-" + router['id'] ns = "ns-" + router['id']
return l3_agent.RouterInfo(router['id'], self.conf.root_helper, return l3_agent.RouterInfo(router['id'], self.conf.root_helper,
use_namespaces, router=router, ns_name=ns) router=router, ns_name=ns)
def _get_router_info_list_with_namespace_helper(self, def _get_router_info_list_helper(self, use_namespaces):
router_use_namespaces): self.conf.set_override('use_namespaces', use_namespaces)
self.conf.set_override('use_namespaces', True) ri = self._prepare_router_data()
ri = self._prepare_router_data(
use_namespaces=router_use_namespaces)
routers = [ri.router] routers = [ri.router]
self.api.router_info = {ri.router_id: ri} self.api.router_info = {ri.router_id: ri}
with mock.patch.object(ip_lib.IPWrapper, with mock.patch.object(ip_lib.IPWrapper,
'get_namespaces') as mock_get_namespaces: 'get_namespaces') as mock_get_namespaces:
mock_get_namespaces.return_value = ri.ns_name mock_get_namespaces.return_value = []
router_info_list = self.api._get_router_info_list_for_tenant( router_info_list = self.api._get_router_info_list_for_tenant(
routers, routers,
ri.router['tenant_id']) ri.router['tenant_id'])
self.assertEqual([ri], router_info_list) if use_namespaces:
mock_get_namespaces.assert_called_once_with( mock_get_namespaces.assert_called_once_with(self.conf.root_helper)
self.conf.root_helper)
def _get_router_info_list_without_namespace_helper(self,
router_use_namespaces):
self.conf.set_override('use_namespaces', False)
ri = self._prepare_router_data(
use_namespaces=router_use_namespaces)
routers = [ri.router]
self.api.router_info = {ri.router_id: ri}
router_info_list = self.api._get_router_info_list_for_tenant(
routers,
ri.router['tenant_id'])
if router_use_namespaces:
self.assertFalse(router_info_list) self.assertFalse(router_info_list)
else: else:
self.assertEqual([ri], router_info_list) self.assertEqual([ri], router_info_list)
def test_get_router_info_list_for_tenant_for_namespaces_enabled(self):
self._get_router_info_list_with_namespace_helper(
router_use_namespaces=True)
def test_get_router_info_list_for_tenant_for_namespaces_disabled(self): def test_get_router_info_list_for_tenant_for_namespaces_disabled(self):
self._get_router_info_list_without_namespace_helper( self._get_router_info_list_helper(use_namespaces=False)
router_use_namespaces=False)
def test_get_router_info_list_tenant_with_namespace_router_without(self): def test_get_router_info_list_for_tenant(self):
self._get_router_info_list_with_namespace_helper( self._get_router_info_list_helper(use_namespaces=True)
router_use_namespaces=False)
def test_get_router_info_list_tenant_without_namespace_router_with(self):
self._get_router_info_list_without_namespace_helper(
router_use_namespaces=True)
def _get_router_info_list_router_without_router_info_helper(self, def _get_router_info_list_router_without_router_info_helper(self,
rtr_with_ri): rtr_with_ri):
self.conf.set_override('use_namespaces', True) self.conf.set_override('use_namespaces', True)
# ri.router with associated router_info (ri) # ri.router with associated router_info (ri)
# rtr2 has no router_info # rtr2 has no router_info
ri = self._prepare_router_data(use_namespaces=True) ri = self._prepare_router_data()
rtr2 = {'id': str(uuid.uuid4()), 'tenant_id': ri.router['tenant_id']} rtr2 = {'id': str(uuid.uuid4()), 'tenant_id': ri.router['tenant_id']}
routers = [rtr2] routers = [rtr2]
self.api.router_info = {} self.api.router_info = {}

2
neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py
View File

@ -143,7 +143,7 @@ class TestVarmourRouter(base.BaseTestCase):
router['enable_snat'] = enable_snat router['enable_snat'] = enable_snat
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
return ri return ri
def test_agent_add_internal_network(self): def test_agent_add_internal_network(self):

2
neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py
View File

@ -151,7 +151,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
router['enable_snat'] = enable_snat router['enable_snat'] = enable_snat
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
return ri return ri
def _add_firewall_rules(self, fw, rule_count=1): def _add_firewall_rules(self, fw, rule_count=1):

14
neutron/tests/unit/services/vpn/test_vpn_agent.py
View File

@ -95,7 +95,7 @@ class TestVPNAgent(base.BaseTestCase):
router_id = _uuid() router_id = _uuid()
ns = "ns-" + router_id ns = "ns-" + router_id
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper,
self.conf.use_namespaces, {}, ns_name=ns) {}, ns_name=ns)
self.agent.router_info = {router_id: ri} self.agent.router_info = {router_id: ri}
namespace = self.agent.get_namespace(router_id) namespace = self.agent.get_namespace(router_id)
self.assertTrue(namespace.endswith(router_id)) self.assertTrue(namespace.endswith(router_id))
@ -103,8 +103,7 @@ class TestVPNAgent(base.BaseTestCase):
def test_add_nat_rule(self): def test_add_nat_rule(self):
router_id = _uuid() router_id = _uuid()
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, {})
self.conf.use_namespaces, {})
iptables = mock.Mock() iptables = mock.Mock()
ri.iptables_manager.ipv4['nat'] = iptables ri.iptables_manager.ipv4['nat'] = iptables
self.agent.router_info = {router_id: ri} self.agent.router_info = {router_id: ri}
@ -123,8 +122,7 @@ class TestVPNAgent(base.BaseTestCase):
def test_remove_rule(self): def test_remove_rule(self):
router_id = _uuid() router_id = _uuid()
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, {})
self.conf.use_namespaces, {})
iptables = mock.Mock() iptables = mock.Mock()
ri.iptables_manager.ipv4['nat'] = iptables ri.iptables_manager.ipv4['nat'] = iptables
self.agent.router_info = {router_id: ri} self.agent.router_info = {router_id: ri}
@ -142,8 +140,7 @@ class TestVPNAgent(base.BaseTestCase):
def test_iptables_apply(self): def test_iptables_apply(self):
router_id = _uuid() router_id = _uuid()
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, {})
self.conf.use_namespaces, {})
iptables = mock.Mock() iptables = mock.Mock()
ri.iptables_manager = iptables ri.iptables_manager = iptables
self.agent.router_info = {router_id: ri} self.agent.router_info = {router_id: ri}
@ -170,8 +167,7 @@ class TestVPNAgent(base.BaseTestCase):
mock.patch( mock.patch(
'neutron.agent.linux.iptables_manager.IptablesManager').start() 'neutron.agent.linux.iptables_manager.IptablesManager').start()
router_id = _uuid() router_id = _uuid()
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, {},
self.conf.use_namespaces, {},
ns_name="qrouter-%s" % router_id) ns_name="qrouter-%s" % router_id)
ri.router = { ri.router = {
'id': router_id, 'id': router_id,

86
neutron/tests/unit/test_l3_agent.py
View File

@ -405,7 +405,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
router = prepare_router_data(num_internal_ports=2) router = prepare_router_data(num_internal_ports=2)
router_id = router['id'] router_id = router['id']
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
cidr = '99.0.1.9/24' cidr = '99.0.1.9/24'
mac = 'ca:fe:de:ad:be:ef' mac = 'ca:fe:de:ad:be:ef'
@ -432,8 +432,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
def test_router_info_create(self): def test_router_info_create(self):
id = _uuid() id = _uuid()
ns = "ns-" + id ns = "ns-" + id
ri = l3_agent.RouterInfo(id, self.conf.root_helper, ri = l3_agent.RouterInfo(id, self.conf.root_helper, {}, ns_name=ns)
self.conf.use_namespaces, {}, ns_name=ns)
self.assertTrue(ri.ns_name.endswith(id)) self.assertTrue(ri.ns_name.endswith(id))
@ -451,8 +450,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
'routes': [], 'routes': [],
'gw_port': ex_gw_port} 'gw_port': ex_gw_port}
ns = "ns-" + id ns = "ns-" + id
ri = l3_agent.RouterInfo(id, self.conf.root_helper, ri = l3_agent.RouterInfo(id, self.conf.root_helper, router, ns_name=ns)
self.conf.use_namespaces, router, ns_name=ns)
self.assertTrue(ri.ns_name.endswith(id)) self.assertTrue(ri.ns_name.endswith(id))
self.assertEqual(ri.router, router) self.assertEqual(ri.router, router)
@ -524,7 +522,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
def _test_external_gateway_action(self, action, router): def _test_external_gateway_action(self, action, router):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router, router=router,
ns_name=agent.get_ns_name(router['id'])) ns_name=agent.get_ns_name(router['id']))
# Special setup for dvr routers # Special setup for dvr routers
if router.get('distributed'): if router.get('distributed'):
@ -595,7 +593,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
router = prepare_router_data(num_internal_ports=2) router = prepare_router_data(num_internal_ports=2)
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router, router=router,
ns_name=agent.get_ns_name(router['id'])) ns_name=agent.get_ns_name(router['id']))
interface_name, ex_gw_port = self._prepare_ext_gw_test(agent) interface_name, ex_gw_port = self._prepare_ext_gw_test(agent)
@ -622,7 +620,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
agent_mode, expected_call_count): agent_mode, expected_call_count):
router = prepare_router_data(num_internal_ports=2) router = prepare_router_data(num_internal_ports=2)
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
interface_name, ex_gw_port = self._prepare_ext_gw_test(agent) interface_name, ex_gw_port = self._prepare_ext_gw_test(agent)
agent._external_gateway_added = mock.Mock() agent._external_gateway_added = mock.Mock()
@ -666,8 +664,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
self.conf.set_override('use_namespaces', False) self.conf.set_override('use_namespaces', False)
router_id = _uuid() router_id = _uuid()
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, {})
self.conf.use_namespaces, {})
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
floating_ip = '20.0.0.101' floating_ip = '20.0.0.101'
interface_name = agent.get_external_device_name(router_id) interface_name = agent.get_external_device_name(router_id)
@ -706,9 +703,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
self.conf.set_override('use_namespaces', False) self.conf.set_override('use_namespaces', False)
router_id = _uuid() router_id = _uuid()
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, {})
self.conf.use_namespaces,
{})
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
fake_route1 = {'destination': '135.207.0.0/16', fake_route1 = {'destination': '135.207.0.0/16',
@ -754,9 +749,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router_id = _uuid() router_id = _uuid()
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, ri = l3_agent.RouterInfo(router_id, self.conf.root_helper, {})
self.conf.use_namespaces,
{})
ri.router = {} ri.router = {}
fake_old_routes = [] fake_old_routes = []
@ -822,7 +815,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data(num_internal_ports=4) router = prepare_router_data(num_internal_ports=4)
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
test_port = { test_port = {
'mac_address': '00:12:23:34:45:56', 'mac_address': '00:12:23:34:45:56',
'fixed_ips': [{'subnet_id': _get_subnet_id( 'fixed_ips': [{'subnet_id': _get_subnet_id(
@ -848,7 +841,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
subnet_ids = [_get_subnet_id(port) for port in subnet_ids = [_get_subnet_id(port) for port in
router[l3_constants.INTERFACE_KEY]] router[l3_constants.INTERFACE_KEY]]
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
# Test Basic cases # Test Basic cases
port = agent.get_internal_port(ri, subnet_ids[0]) port = agent.get_internal_port(ri, subnet_ids[0])
@ -877,7 +870,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
router = prepare_router_data(num_internal_ports=2) router = prepare_router_data(num_internal_ports=2)
router['distributed'] = True router['distributed'] = True
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
ports = ri.router.get(l3_constants.INTERFACE_KEY, []) ports = ri.router.get(l3_constants.INTERFACE_KEY, [])
test_ports = [{'mac_address': '00:11:22:33:44:55', test_ports = [{'mac_address': '00:11:22:33:44:55',
'device_owner': 'network:dhcp', 'device_owner': 'network:dhcp',
@ -928,7 +921,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
def test__update_arp_entry_with_no_subnet(self): def test__update_arp_entry_with_no_subnet(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
ri = l3_agent.RouterInfo( ri = l3_agent.RouterInfo(
'foo_router_id', mock.ANY, True, 'foo_router_id', mock.ANY,
{'distributed': True, 'gw_port_host': HOSTNAME}) {'distributed': True, 'gw_port_host': HOSTNAME})
with mock.patch.object(l3_agent.ip_lib, 'IPDevice') as f: with mock.patch.object(l3_agent.ip_lib, 'IPDevice') as f:
agent._update_arp_entry(ri, mock.ANY, mock.ANY, agent._update_arp_entry(ri, mock.ANY, mock.ANY,
@ -956,13 +949,13 @@ class TestBasicRouterOperations(base.BaseTestCase):
def test_process_cent_router(self): def test_process_cent_router(self):
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
self._test_process_router(ri) self._test_process_router(ri)
def test_process_dist_router(self): def test_process_dist_router(self):
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
subnet_id = _get_subnet_id(router[l3_constants.INTERFACE_KEY][0]) subnet_id = _get_subnet_id(router[l3_constants.INTERFACE_KEY][0])
ri.router['distributed'] = True ri.router['distributed'] = True
ri.router['_snat_router_interfaces'] = [{ ri.router['_snat_router_interfaces'] = [{
@ -1051,7 +1044,7 @@ class TestBasicRouterOperations(base.BaseTestCase):
{'destination': '8.8.8.8/32', 'nexthop': '35.4.0.10'}, {'destination': '8.8.8.8/32', 'nexthop': '35.4.0.10'},
{'destination': '8.8.4.4/32', 'nexthop': '35.4.0.11'}] {'destination': '8.8.4.4/32', 'nexthop': '35.4.0.11'}]
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
ri.router = router ri.router = router
with contextlib.nested(mock.patch.object(agent, with contextlib.nested(mock.patch.object(agent,
'_spawn_metadata_proxy'), '_spawn_metadata_proxy'),
@ -1145,7 +1138,7 @@ vrrp_instance VR_1 {
router = prepare_router_data(enable_snat=True) router = prepare_router_data(enable_snat=True)
router[l3_constants.FLOATINGIP_KEY] = fake_floatingips['floatingips'] router[l3_constants.FLOATINGIP_KEY] = fake_floatingips['floatingips']
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
ri.iptables_manager.ipv4['nat'] = mock.MagicMock() ri.iptables_manager.ipv4['nat'] = mock.MagicMock()
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
self._test_process_router_floating_ip_addresses_add(ri, agent) self._test_process_router_floating_ip_addresses_add(ri, agent)
@ -1163,7 +1156,7 @@ vrrp_instance VR_1 {
router[l3_constants.FLOATINGIP_KEY] = fake_floatingips['floatingips'] router[l3_constants.FLOATINGIP_KEY] = fake_floatingips['floatingips']
router['distributed'] = True router['distributed'] = True
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
ri.iptables_manager.ipv4['nat'] = mock.MagicMock() ri.iptables_manager.ipv4['nat'] = mock.MagicMock()
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
agent.host = HOSTNAME agent.host = HOSTNAME
@ -1286,7 +1279,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data(enable_snat=True) router = prepare_router_data(enable_snat=True)
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
# Process with NAT # Process with NAT
agent.process_router(ri) agent.process_router(ri)
@ -1308,7 +1301,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data(enable_snat=False) router = prepare_router_data(enable_snat=False)
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
# Process without NAT # Process without NAT
agent.process_router(ri) agent.process_router(ri)
@ -1330,7 +1323,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
# Process with NAT # Process with NAT
agent.process_router(ri) agent.process_router(ri)
@ -1356,7 +1349,7 @@ vrrp_instance VR_1 {
gw_port = router['gw_port'] gw_port = router['gw_port']
router['gw_port'] = None router['gw_port'] = None
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
agent.process_router(ri) agent.process_router(ri)
orig_nat_rules = ri.iptables_manager.ipv4['nat'].rules[:] orig_nat_rules = ri.iptables_manager.ipv4['nat'].rules[:]
@ -1364,7 +1357,7 @@ vrrp_instance VR_1 {
# Get NAT rules with the gw_port # Get NAT rules with the gw_port
router['gw_port'] = gw_port router['gw_port'] = gw_port
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
with mock.patch.object( with mock.patch.object(
agent, agent,
'external_gateway_nat_rules') as external_gateway_nat_rules: 'external_gateway_nat_rules') as external_gateway_nat_rules:
@ -1379,7 +1372,7 @@ vrrp_instance VR_1 {
self, router, ra_mode=None, addr_mode=None): self, router, ra_mode=None, addr_mode=None):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
# Process with NAT # Process with NAT
agent.process_router(ri) agent.process_router(ri)
@ -1437,7 +1430,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
# Process with NAT # Process with NAT
agent.process_router(ri) agent.process_router(ri)
@ -1460,7 +1453,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data(num_internal_ports=2) router = prepare_router_data(num_internal_ports=2)
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
# Process with NAT # Process with NAT
agent.process_router(ri) agent.process_router(ri)
@ -1483,7 +1476,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
ri.router = router ri.router = router
agent.process_router(ri) agent.process_router(ri)
@ -1502,7 +1495,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
with mock.patch.object( with mock.patch.object(
l3_agent.L3NATAgent, l3_agent.L3NATAgent,
@ -1528,7 +1521,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
# add an internal port # add an internal port
agent.process_router(ri) agent.process_router(ri)
@ -1569,7 +1562,7 @@ vrrp_instance VR_1 {
'port_id': router[l3_constants.INTERFACE_KEY][0]['id']}] 'port_id': router[l3_constants.INTERFACE_KEY][0]['id']}]
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
agent.process_router(ri) agent.process_router(ri)
# Assess the call for putting the floating IP up was performed # Assess the call for putting the floating IP up was performed
@ -1602,7 +1595,7 @@ vrrp_instance VR_1 {
'port_id': router[l3_constants.INTERFACE_KEY][0]['id']}] 'port_id': router[l3_constants.INTERFACE_KEY][0]['id']}]
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent.external_gateway_added = mock.Mock() agent.external_gateway_added = mock.Mock()
agent.process_router(ri) agent.process_router(ri)
# Assess the call for putting the floating IP into Error # Assess the call for putting the floating IP into Error
@ -1613,7 +1606,7 @@ vrrp_instance VR_1 {
def test_handle_router_snat_rules_distributed_without_snat_manager(self): def test_handle_router_snat_rules_distributed_without_snat_manager(self):
ri = l3_agent.RouterInfo( ri = l3_agent.RouterInfo(
'foo_router_id', mock.ANY, True, {'distributed': True}) 'foo_router_id', mock.ANY, {'distributed': True})
ri.iptables_manager = mock.Mock() ri.iptables_manager = mock.Mock()
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
@ -1644,8 +1637,7 @@ vrrp_instance VR_1 {
def test_handle_router_snat_rules_add_rules(self): def test_handle_router_snat_rules_add_rules(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
ri = l3_agent.RouterInfo(_uuid(), self.conf.root_helper, ri = l3_agent.RouterInfo(_uuid(), self.conf.root_helper, {})
self.conf.use_namespaces, {})
ex_gw_port = {'fixed_ips': [{'ip_address': '192.168.1.4'}]} ex_gw_port = {'fixed_ips': [{'ip_address': '192.168.1.4'}]}
internal_cidrs = ['10.0.0.0/24'] internal_cidrs = ['10.0.0.0/24']
ri.router = {'distributed': False} ri.router = {'distributed': False}
@ -1684,7 +1676,6 @@ vrrp_instance VR_1 {
router = prepare_router_data(enable_snat=True, num_internal_ports=1) router = prepare_router_data(enable_snat=True, num_internal_ports=1)
ri = l3_agent.RouterInfo(router['id'], ri = l3_agent.RouterInfo(router['id'],
self.conf.root_helper, self.conf.root_helper,
self.conf.use_namespaces,
router=router) router=router)
internal_ports = ri.router.get(l3_constants.INTERFACE_KEY, []) internal_ports = ri.router.get(l3_constants.INTERFACE_KEY, [])
@ -1732,7 +1723,6 @@ vrrp_instance VR_1 {
del router['gw_port'] del router['gw_port']
ri = l3_agent.RouterInfo(router['id'], ri = l3_agent.RouterInfo(router['id'],
self.conf.root_helper, self.conf.root_helper,
self.conf.use_namespaces,
router=router) router=router)
self.mock_ip.get_devices.return_value = stale_devlist self.mock_ip.get_devices.return_value = stale_devlist
@ -2070,7 +2060,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
port_id = _uuid() port_id = _uuid()
dvr_gw_port = {'fixed_ips': [{'ip_address': '20.0.0.30', dvr_gw_port = {'fixed_ips': [{'ip_address': '20.0.0.30',
@ -2131,7 +2121,7 @@ vrrp_instance VR_1 {
'port_id': _uuid()} 'port_id': _uuid()}
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
rtr_2_fip_name = agent.get_rtr_int_device_name(ri.router_id) rtr_2_fip_name = agent.get_rtr_int_device_name(ri.router_id)
fip_2_rtr_name = agent.get_fip_int_device_name(ri.router_id) fip_2_rtr_name = agent.get_fip_int_device_name(ri.router_id)
@ -2151,7 +2141,7 @@ vrrp_instance VR_1 {
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = prepare_router_data() router = prepare_router_data()
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
agent_gw_port = {'fixed_ips': [{'ip_address': '20.0.0.30', agent_gw_port = {'fixed_ips': [{'ip_address': '20.0.0.30',
'subnet_id': _uuid()}], 'subnet_id': _uuid()}],
'subnet': {'gateway_ip': '20.0.0.1'}, 'subnet': {'gateway_ip': '20.0.0.1'},
@ -2187,7 +2177,7 @@ vrrp_instance VR_1 {
fip_cidr = '11.22.33.44/24' fip_cidr = '11.22.33.44/24'
ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
self.conf.use_namespaces, router=router) router=router)
ri.dist_fip_count = 2 ri.dist_fip_count = 2
ri.floating_ips_dict['11.22.33.44'] = FIP_PRI ri.floating_ips_dict['11.22.33.44'] = FIP_PRI
ri.fip_2_rtr = '11.22.33.42' ri.fip_2_rtr = '11.22.33.42'
@ -2302,7 +2292,7 @@ class TestL3AgentEventHandler(base.BaseTestCase):
cfg.CONF.set_override('debug', True) cfg.CONF.set_override('debug', True)
self.external_process_p.stop() self.external_process_p.stop()
ri = l3_agent.RouterInfo(router_id, None, True, None) ri = l3_agent.RouterInfo(router_id, None, None)
try: try:
with mock.patch(ip_class_path) as ip_mock: with mock.patch(ip_class_path) as ip_mock:
self.agent._spawn_metadata_proxy(ri.router_id, ri.ns_name) self.agent._spawn_metadata_proxy(ri.router_id, ri.ns_name)