openstack
/
networking-l2gw
Code Issues Proposed changes

Merge "Retain ucast_macs_remote if l2gw connection exists"

Browse Source
changes/85/344085/3
Jenkins 7 years ago committed by Gerrit Code Review
parent 462566dd77 cdded15b4d
commit 870d70b317
2 changed files with 76 additions and 33 deletions
Show Stats Download Patch File Download Diff File

23
networking_l2gw/services/l2gateway/service_drivers/rpc_l2gw.py
Unescape Escape View File

@ -246,19 +246,16 @@ class L2gwRpcDriver(service_drivers.L2gwDriver):
'logical_switch_uuid':
logical_switch_uuid,
'ovsdb_identifier': ovsdb_identifier}
rec_dict = {'logical_switch_id': logical_switch_uuid,
'ovsdb_identifier': ovsdb_identifier}
if len(db.get_all_vlan_bindings_by_logical_switch(
context, rec_dict)) > 1:
if from_l2gw_plugin:
ls = logical_switch.get('name')
l2gateway_connections = (
self.service_plugin.
get_l2_gateway_connections(
context,
filters={'network_id': [ls]}))
if len(l2gateway_connections) > 1:
continue
if from_l2gw_plugin:
ls = logical_switch.get('name')
l2gateway_connections = (
self.service_plugin.
get_l2_gateway_connections(
context,
filters={'network_id': [ls]}))
if len(l2gateway_connections) > 1:
continue
ucast_mac_remote = (
db.get_ucast_mac_remote_by_mac_and_ls(
context, record_dict))

86
networking_l2gw/tests/unit/services/l2gateway/service_drivers/test_rpc_l2gw.py
Unescape Escape View File

@ -577,11 +577,8 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
'delete_vif_from_gateway')
@mock.patch.object(db,
'get_logical_switch_by_name')
@mock.patch.object(db,
'get_all_vlan_bindings_by_logical_switch',
return_value=[1, 2])
def test_delete_port_mac_for_multiple_vlan_bindings(
self, get_vlan_binding, get_ls, delete_rpc, get_mac, get_all_ls):
self, get_ls, delete_rpc, get_mac, get_all_ls):
fake_port_list = [{'network_id': 'fake_network_id',
'device_owner': 'fake_owner',
'mac_address': 'fake_mac',
@ -591,8 +588,6 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
fake_logical_switch_list = [fake_logical_switch_dict]
lg_dict = {'logical_switch_name': 'fake_network_id',
'ovsdb_identifier': 'fake_ovsdb_id'}
fake_rec_dict = {'logical_switch_id': 'fake_uuid',
'ovsdb_identifier': 'fake_ovsdb_id'}
get_all_ls.return_value = fake_logical_switch_list
get_ls.return_value = fake_logical_switch_dict
with mock.patch.object(self.service_plugin,
@ -601,7 +596,6 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
self.plugin.delete_port_mac(self.context, fake_port_list)
self.assertFalse(get_all_ls.called)
get_ls.assert_called_with(self.context, lg_dict)
get_vlan_binding.assert_called_with(self.context, fake_rec_dict)
self.assertFalse(get_mac.called)
self.assertFalse(delete_rpc.called)
@ -898,10 +892,7 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
@mock.patch.object(db,
'get_ucast_mac_remote_by_mac_and_ls',
return_value=True)
@mock.patch.object(db,
'get_all_vlan_bindings_by_logical_switch',
return_value=[1])
def test_delete_port_mac_with_list(self, get_vlan_binding,
def test_delete_port_mac_with_list(self,
get_mac, get_ls):
network_id = 'fake_network_id'
fake_port_dict = {'network_id': 'fake_network_id',
@ -914,8 +905,6 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
fake_dict = {'mac': 'fake_mac',
'logical_switch_uuid': 'fake_uuid',
'ovsdb_identifier': 'fake_ovsdb_id'}
fake_rec_dict = {'logical_switch_id': 'fake_uuid',
'ovsdb_identifier': 'fake_ovsdb_id'}
get_ls.return_value = fake_logical_switch_list
with mock.patch.object(self.plugin.agent_rpc,
'delete_vif_from_gateway') as delete_rpc, \
@ -925,10 +914,72 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
self.plugin.delete_port_mac(self.context, fake_port_dict)
get_ls.assert_called_with(self.context, network_id)
get_mac.assert_called_with(self.context, fake_dict)
get_vlan_binding.assert_called_with(self.context, fake_rec_dict)
delete_rpc.assert_called_with(
self.context, 'fake_ovsdb_id', 'fake_uuid', ['fake_mac'])
@mock.patch.object(db,
'get_logical_switch_by_name')
@mock.patch.object(db,
'get_all_logical_switches_by_name')
@mock.patch.object(db,
'get_ucast_mac_remote_by_mac_and_ls',
return_value=True)
def test_delete_port_mac_for_single_l2gw_connection(self,
get_mac, get_ls,
get_ls_by_name):
fake_port_dict = {'network_id': 'fake_network_id',
'device_owner': 'fake_owner',
'mac_address': 'fake_mac',
'ovsdb_identifier': 'fake_ovsdb_id'}
fake_port_list = [fake_port_dict]
fake_rec_dict = {'uuid': 'fake_network_id',
'ovsdb_identifier': 'fake_ovsdb_id'}
fake_dict = {'logical_switch_name': 'fake_network_id',
'ovsdb_identifier': 'fake_ovsdb_id'}
fake_ucast_mac_and_ls = {'mac': 'fake_mac',
'logical_switch_uuid': 'fake_network_id',
'ovsdb_identifier': 'fake_ovsdb_id'}
get_ls_by_name.return_value = fake_rec_dict
with mock.patch.object(self.plugin.agent_rpc,
'delete_vif_from_gateway') as delete_rpc, \
mock.patch.object(self.service_plugin,
'get_l2_gateway_connections',
return_value=[1]):
self.plugin.delete_port_mac(self.context, fake_port_list)
get_ls_by_name.assert_called_with(self.context, fake_dict)
get_ls.assert_not_called()
get_mac.assert_called_with(self.context, fake_ucast_mac_and_ls)
delete_rpc.assert_called_with(
self.context, 'fake_ovsdb_id', 'fake_network_id', ['fake_mac'])
@mock.patch.object(db,
'get_logical_switch_by_name')
@mock.patch.object(db,
'get_all_logical_switches_by_name')
@mock.patch.object(db,
'get_ucast_mac_remote_by_mac_and_ls',
return_value=True)
def test_delete_port_mac_for_multiple_l2gw_connection(self,
get_mac, get_ls,
get_ls_by_name):
fake_port_dict = {'network_id': 'fake_network_id',
'device_owner': 'fake_owner',
'mac_address': 'fake_mac',
'ovsdb_identifier': 'fake_ovsdb_id'}
fake_port_list = [fake_port_dict]
fake_rec_dict = {'logical_switch_name': 'fake_network_id',
'ovsdb_identifier': 'fake_ovsdb_id'}
with mock.patch.object(self.plugin.agent_rpc,
'delete_vif_from_gateway') as delete_rpc, \
mock.patch.object(self.service_plugin,
'get_l2_gateway_connections',
return_value=[1, 2]):
self.plugin.delete_port_mac(self.context, fake_port_list)
get_ls_by_name.assert_called_with(self.context, fake_rec_dict)
get_ls.assert_not_called()
get_mac.assert_not_called()
delete_rpc.assert_not_called()
@mock.patch.object(db,
'get_all_logical_switches_by_name')
@mock.patch.object(db,
@ -952,8 +1003,6 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
fake_dict = {'mac': 'fake_mac',
'logical_switch_uuid': 'fake_uuid',
'ovsdb_identifier': 'fake_ovsdb_id'}
fake_rec_dict = {'logical_switch_id': 'fake_uuid',
'ovsdb_identifier': 'fake_ovsdb_id'}
get_all_ls.return_value = fake_logical_switch_dict
get_ls.return_value = fake_logical_switch_dict
with mock.patch.object(self.plugin.agent_rpc,
@ -962,7 +1011,6 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
self.assertFalse(get_all_ls.called)
get_ls.assert_called_with(self.context, lg_dict)
get_mac.assert_called_with(self.context, fake_dict)
get_vlan_binding.assert_called_with(self.context, fake_rec_dict)
delete_rpc.assert_called_with(
self.context, 'fake_ovsdb_id', 'fake_uuid', ['fake_mac'])
@ -973,9 +1021,7 @@ class TestL2gwRpcDriver(test_plugin.Ml2PluginV2TestCase):
return_value=True)
@mock.patch.object(db, 'add_pending_ucast_mac_remote')
@mock.patch.object(db, 'get_logical_switch_by_name')
@mock.patch.object(db,
'get_all_vlan_bindings_by_logical_switch')
def test_delete_port_mac_with_ovsdb_server_down(self, get_vlan_binding,
def test_delete_port_mac_with_ovsdb_server_down(self,
get_ls, add_pending_mac,
get_mac, get_all_ls):
"Test case to test delete_port_mac when the OVSDB server is down."

Write Preview
Loading…
Cancel
Save