x
/
group-based-policy
Code Issues Proposed changes

A VM could be associated with multiple ports 

This could happen for example if a VM is associated
with 2 different ports which are under 2 different
subnets/networks respectively.

Change-Id: I0afb1fdc972a4d8b4a966c9b527037ac0c9bfd41
This commit is contained in:
Kent Wu 2019-08-06 16:09:38 -07:00
parent 9827010bc7
commit 92d32b66a8
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gbpservice/neutron/plugins/ml2plus/drivers/apic_aim/mechanism_driver.py
View File

@ -340,11 +340,10 @@ class ApicMechanismDriver(api_plus.MechanismDriver,
models_v2.Port.id))
query += lambda q: q.filter(
models_v2.Port.device_id == sa.bindparam('device_id'))
port = query(session).params(
device_id=device_id).one_or_none()
if port:
port_id, = port
update_ports.append(port_id)
port_ids = [p[0] for p in
query(session).params(device_id=device_id)]
if port_ids:
update_ports.extend(port_ids)
if update_ports:
self._notify_port_update_bulk(self.admin_context, update_ports)

28
gbpservice/neutron/tests/unit/plugins/ml2plus/test_apic_aim.py
View File

@ -2083,6 +2083,34 @@ class TestAimMapping(ApicAimTestCase):
self.driver._set_vm_name_update,
self.db_session, None, 'host_id1', current_time)
# This is just to test the port notification part for a VM
# being associated with 2 ports
self._register_agent('h1', AGENT_CONF_OPFLEX)
net1 = self._make_network(self.fmt, 'net1', True)
net_id = net1['network']['id']
self._make_subnet(self.fmt, net1, '10.0.1.1', '10.0.1.0/24')
port1_id = self._make_port(self.fmt, net_id)['port']['id']
net2 = self._make_network(self.fmt, 'net2', True)
net_id = net2['network']['id']
self._make_subnet(self.fmt, net2, '20.0.1.1', '20.0.1.0/24')
port2_id = self._make_port(self.fmt, net_id)['port']['id']
self._bind_port_to_host(port1_id, 'h1')
self._bind_port_to_host(port2_id, 'h1')
self.driver._notify_port_update = mock.Mock()
vm.id = 'someid'
vm.name = 'somename'
self.nova_client.return_value = [vm]
self.driver._update_nova_vm_name_cache()
exp_calls = [
mock.call(mock.ANY, port1_id),
mock.call(mock.ANY, port2_id)]
self._check_call_list(exp_calls,
self.driver._notify_port_update.call_args_list)
def test_multi_scope_routing_with_unscoped_pools(self):
self._test_multi_scope_routing(True)