openstack
/
neutron
Code Issues Proposed changes

Revert "DVR: Inter Tenant Traffic between networks not possible with shared net" 

This reverts commit d019790fe4.

Closes-Bug: #1783654
Change-Id: I4fd2610e185fb60cae62693cd4032ab700209b5f
(cherry picked from commit fd72643a61)
This commit is contained in:
Swaminathan Vasudevan 2018-08-23 05:54:17 +00:00
parent 2d47cb7d9a
commit b70afb5013
4 changed files with 36 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neutron/api/rpc/handlers/dvr_rpc.py
View File

@ -59,13 +59,6 @@ class DVRServerRpcApi(object):
return cctxt.call(context, 'get_ports_on_host_by_subnet', return cctxt.call(context, 'get_ports_on_host_by_subnet',
host=host, subnet=subnet) host=host, subnet=subnet)
@log_helpers.log_method_call
def get_network_info_for_id(self, context, network_id):
"""Get network info for DVR router ports."""
cctxt = self.client.prepare()
return cctxt.call(context, 'get_network_info_for_id',
network_id=network_id)
@log_helpers.log_method_call @log_helpers.log_method_call
def get_subnet_for_dvr(self, context, subnet, fixed_ips): def get_subnet_for_dvr(self, context, subnet, fixed_ips):
cctxt = self.client.prepare() cctxt = self.client.prepare()
@ -112,13 +105,6 @@ class DVRServerRpcCallback(object):
return self.plugin.get_ports_on_host_by_subnet(context, return self.plugin.get_ports_on_host_by_subnet(context,
host, subnet) host, subnet)
def get_network_info_for_id(self, context, **kwargs):
"""Get network info for DVR port."""
network_id = kwargs.get('network_id')
LOG.debug("DVR Agent requests network info for id %s", network_id)
net_filter = {'id': [network_id]}
return self.plugin.get_networks(context, filters=net_filter)
def get_subnet_for_dvr(self, context, **kwargs): def get_subnet_for_dvr(self, context, **kwargs):
fixed_ips = kwargs.get('fixed_ips') fixed_ips = kwargs.get('fixed_ips')
subnet = kwargs.get('subnet') subnet = kwargs.get('subnet')

29
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
View File

@ -427,27 +427,16 @@ class OVSDVRNeutronAgent(object):
br = self.tun_br br = self.tun_br
# TODO(vivek) remove the IPv6 related flows once SNAT is not # TODO(vivek) remove the IPv6 related flows once SNAT is not
# used for IPv6 DVR. # used for IPv6 DVR.
port_net_info = ( if ip_version == 4:
self.plugin_rpc.get_network_info_for_id( if subnet_info['gateway_ip']:
self.context, subnet_info.get('network_id'))) br.install_dvr_process_ipv4(
net_shared_only = ( vlan_tag=lvm.vlan, gateway_ip=subnet_info['gateway_ip'])
port_net_info[0]['shared'] and
not port_net_info[0]['router:external'])
if net_shared_only:
LOG.debug("Not applying DVR rules to tunnel bridge because %s "
"is a shared network", subnet_info.get('network_id'))
else: else:
if ip_version == 4: br.install_dvr_process_ipv6(
if subnet_info['gateway_ip']: vlan_tag=lvm.vlan, gateway_mac=subnet_info['gateway_mac'])
br.install_dvr_process_ipv4( br.install_dvr_process(
vlan_tag=lvm.vlan, vlan_tag=lvm.vlan, vif_mac=port.vif_mac,
gateway_ip=subnet_info['gateway_ip']) dvr_mac_address=self.dvr_mac_address)
else:
br.install_dvr_process_ipv6(
vlan_tag=lvm.vlan, gateway_mac=subnet_info['gateway_mac'])
br.install_dvr_process(
vlan_tag=lvm.vlan, vif_mac=port.vif_mac,
dvr_mac_address=self.dvr_mac_address)
# the dvr router interface is itself a port, so capture it # the dvr router interface is itself a port, so capture it
# queue this subnet to that port. A subnet appears only once as # queue this subnet to that port. A subnet appears only once as

7
neutron/tests/unit/api/rpc/handlers/test_dvr_rpc.py
View File

@ -46,13 +46,6 @@ class DVRServerRpcApiTestCase(base.BaseTestCase):
self.ctxt, 'get_ports_on_host_by_subnet', self.ctxt, 'get_ports_on_host_by_subnet',
host='foo_host', subnet='foo_subnet') host='foo_host', subnet='foo_subnet')
def test_get_network_info_for_id(self):
self.rpc.get_network_info_for_id(
self.ctxt, 'fake-network-id')
self.mock_cctxt.call.assert_called_with(
self.ctxt, 'get_network_info_for_id',
network_id='fake-network-id')
def test_get_subnet_for_dvr(self): def test_get_subnet_for_dvr(self):
self.rpc.get_subnet_for_dvr( self.rpc.get_subnet_for_dvr(
self.ctxt, 'foo_subnet', fixed_ips='foo_fixed_ips') self.ctxt, 'foo_subnet', fixed_ips='foo_fixed_ips')

97
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
View File

@ -2487,33 +2487,29 @@ class TestOvsDvrNeutronAgent(object):
return resp return resp
def _expected_install_dvr_process(self, lvid, port, ip_version, def _expected_install_dvr_process(self, lvid, port, ip_version,
gateway_ip, gateway_mac, shared=False): gateway_ip, gateway_mac):
if not shared: if ip_version == 4:
if ip_version == 4: ipvx_calls = [
ipvx_calls = [ mock.call.install_dvr_process_ipv4(
mock.call.install_dvr_process_ipv4(
vlan_tag=lvid,
gateway_ip=gateway_ip),
]
else:
ipvx_calls = [
mock.call.install_dvr_process_ipv6(
vlan_tag=lvid,
gateway_mac=gateway_mac),
]
return ipvx_calls + [
mock.call.install_dvr_process(
vlan_tag=lvid, vlan_tag=lvid,
dvr_mac_address=self.agent.dvr_agent.dvr_mac_address, gateway_ip=gateway_ip),
vif_mac=port.vif_mac,
),
] ]
else: else:
return [] ipvx_calls = [
mock.call.install_dvr_process_ipv6(
vlan_tag=lvid,
gateway_mac=gateway_mac),
]
return ipvx_calls + [
mock.call.install_dvr_process(
vlan_tag=lvid,
dvr_mac_address=self.agent.dvr_agent.dvr_mac_address,
vif_mac=port.vif_mac,
),
]
def _test_port_bound_for_dvr_on_vlan_network(self, device_owner, def _test_port_bound_for_dvr_on_vlan_network(self, device_owner,
ip_version=4, ip_version=4):
shared=False):
self._setup_for_dvr_test() self._setup_for_dvr_test()
if ip_version == 4: if ip_version == 4:
gateway_ip = '1.1.1.1' gateway_ip = '1.1.1.1'
@ -2536,12 +2532,7 @@ class TestOvsDvrNeutronAgent(object):
return_value={'gateway_ip': gateway_ip, return_value={'gateway_ip': gateway_ip,
'cidr': cidr, 'cidr': cidr,
'ip_version': ip_version, 'ip_version': ip_version,
'gateway_mac': gateway_mac, 'gateway_mac': gateway_mac}),\
'network_id': 'fake-id'}),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_network_info_for_id',
return_value=[{'shared': shared,
'router:external': False}]),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc, mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_ports_on_host_by_subnet', 'get_ports_on_host_by_subnet',
return_value=[]),\ return_value=[]),\
@ -2575,8 +2566,7 @@ class TestOvsDvrNeutronAgent(object):
lvid=lvid, lvid=lvid,
ip_version=ip_version, ip_version=ip_version,
gateway_ip=gateway_ip, gateway_ip=gateway_ip,
gateway_mac=gateway_mac, gateway_mac=gateway_mac)
shared=shared)
expected_on_int_br = [ expected_on_int_br = [
mock.call.provision_local_vlan( mock.call.provision_local_vlan(
port=int_ofp, port=int_ofp,
@ -2609,8 +2599,7 @@ class TestOvsDvrNeutronAgent(object):
self.assertFalse([], phys_br.mock_calls) self.assertFalse([], phys_br.mock_calls)
def _test_port_bound_for_dvr_on_vxlan_network(self, device_owner, def _test_port_bound_for_dvr_on_vxlan_network(self, device_owner,
ip_version=4, ip_version=4):
shared=False):
self._setup_for_dvr_test() self._setup_for_dvr_test()
if ip_version == 4: if ip_version == 4:
gateway_ip = '1.1.1.1' gateway_ip = '1.1.1.1'
@ -2633,12 +2622,7 @@ class TestOvsDvrNeutronAgent(object):
return_value={'gateway_ip': gateway_ip, return_value={'gateway_ip': gateway_ip,
'cidr': cidr, 'cidr': cidr,
'ip_version': ip_version, 'ip_version': ip_version,
'gateway_mac': gateway_mac, 'gateway_mac': gateway_mac}),\
'network_id': 'fake-id'}),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_network_info_for_id',
return_value=[{'shared': shared,
'router:external': False}]),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc, mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_ports_on_host_by_subnet', 'get_ports_on_host_by_subnet',
return_value=[]),\ return_value=[]),\
@ -2671,8 +2655,7 @@ class TestOvsDvrNeutronAgent(object):
lvid=lvid, lvid=lvid,
ip_version=ip_version, ip_version=ip_version,
gateway_ip=gateway_ip, gateway_ip=gateway_ip,
gateway_mac=gateway_mac, gateway_mac=gateway_mac)
shared=shared)
self.assertEqual(expected_on_int_br, int_br.mock_calls) self.assertEqual(expected_on_int_br, int_br.mock_calls)
self.assertEqual(expected_on_tun_br, tun_br.mock_calls) self.assertEqual(expected_on_tun_br, tun_br.mock_calls)
self.assertEqual([], phys_br.mock_calls) self.assertEqual([], phys_br.mock_calls)
@ -2707,16 +2690,6 @@ class TestOvsDvrNeutronAgent(object):
self._test_port_bound_for_dvr_on_vxlan_network( self._test_port_bound_for_dvr_on_vxlan_network(
device_owner=DEVICE_OWNER_COMPUTE, ip_version=6) device_owner=DEVICE_OWNER_COMPUTE, ip_version=6)
def test_port_bound_for_dvr_with_compute_ports_on_shared_network(self):
self._test_port_bound_for_dvr_on_vlan_network(
device_owner=DEVICE_OWNER_COMPUTE, shared=True)
self._test_port_bound_for_dvr_on_vlan_network(
device_owner=DEVICE_OWNER_COMPUTE, ip_version=6, shared=True)
self._test_port_bound_for_dvr_on_vxlan_network(
device_owner=DEVICE_OWNER_COMPUTE, shared=True)
self._test_port_bound_for_dvr_on_vxlan_network(
device_owner=DEVICE_OWNER_COMPUTE, ip_version=6, shared=True)
def test_port_bound_for_dvr_with_lbaas_vip_ports(self): def test_port_bound_for_dvr_with_lbaas_vip_ports(self):
self._test_port_bound_for_dvr_on_vlan_network( self._test_port_bound_for_dvr_on_vlan_network(
device_owner=n_const.DEVICE_OWNER_LOADBALANCER) device_owner=n_const.DEVICE_OWNER_LOADBALANCER)
@ -2810,8 +2783,7 @@ class TestOvsDvrNeutronAgent(object):
return_value={'gateway_ip': '1.1.1.1', return_value={'gateway_ip': '1.1.1.1',
'cidr': '1.1.1.0/24', 'cidr': '1.1.1.0/24',
'ip_version': 4, 'ip_version': 4,
'gateway_mac': 'aa:bb:cc:11:22:33', 'gateway_mac': 'aa:bb:cc:11:22:33'}),\
'network_id': 'faked-id'}),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc, mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_ports_on_host_by_subnet', 'get_ports_on_host_by_subnet',
return_value=[]),\ return_value=[]),\
@ -2875,12 +2847,7 @@ class TestOvsDvrNeutronAgent(object):
return_value={'gateway_ip': gateway_ip, return_value={'gateway_ip': gateway_ip,
'cidr': cidr, 'cidr': cidr,
'ip_version': ip_version, 'ip_version': ip_version,
'gateway_mac': gateway_mac, 'gateway_mac': gateway_mac}),\
'network_id': 'fake-id'}),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_network_info_for_id',
return_value=[{'shared': False,
'router:external': False}]),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc, mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_ports_on_host_by_subnet', 'get_ports_on_host_by_subnet',
return_value=[]),\ return_value=[]),\
@ -2985,12 +2952,7 @@ class TestOvsDvrNeutronAgent(object):
return_value={'gateway_ip': gateway_ip, return_value={'gateway_ip': gateway_ip,
'cidr': cidr, 'cidr': cidr,
'ip_version': ip_version, 'ip_version': ip_version,
'gateway_mac': gateway_mac, 'gateway_mac': gateway_mac}),\
'network_id': 'faked-id'}),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_network_info_for_id',
return_value=[{'shared': False,
'router:external': False}]),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc, mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_ports_on_host_by_subnet', 'get_ports_on_host_by_subnet',
return_value=[]),\ return_value=[]),\
@ -3105,12 +3067,7 @@ class TestOvsDvrNeutronAgent(object):
return_value={'gateway_ip': '1.1.1.1', return_value={'gateway_ip': '1.1.1.1',
'cidr': '1.1.1.0/24', 'cidr': '1.1.1.0/24',
'ip_version': 4, 'ip_version': 4,
'gateway_mac': gateway_mac, 'gateway_mac': gateway_mac}),\
'network_id': 'fake-id'}),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_network_info_for_id',
return_value=[{'shared': False,
'router:external': False}]),\
mock.patch.object(self.agent.dvr_agent.plugin_rpc, mock.patch.object(self.agent.dvr_agent.plugin_rpc,
'get_ports_on_host_by_subnet', 'get_ports_on_host_by_subnet',
return_value=[]),\ return_value=[]),\