openstack
/
dragonflow
Code Issues Proposed changes

OVSDB monitor to filter port update events 

OVSDB monitor should only dispatch events for ports that are attached to
the br-int bridge. The controller need not be notified of other ports.

Change-Id: I2ef8a1a55a07f48f1a81852b3fb52fcfae99b49f
Closes-Bug: 1561517
This commit is contained in:
Omer Anson 2016-03-24 15:57:00 +02:00
parent 452d378f32
commit 0fe30b699d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dragonflow/db/drivers/ovsdb_vswitch_impl.py
View File

@ -16,7 +16,7 @@
import ryu.contrib.ovs.json
from ryu.contrib.ovs.jsonrpc import Message
from dragonflow._i18n import _LE
from dragonflow._i18n import _LE, _LI
from dragonflow.common import constants
from dragonflow.common import exceptions as df_exceptions
from dragonflow.common import utils as df_utils
@ -58,7 +58,7 @@ class OvsdbSwitchApi(api_vswitch.SwitchApi):
self.ovsdb.start()
self.idl = self.ovsdb.idl
ovsdb_monitor = OvsdbMonitor(self.ip, self.port, self.nb_api)
ovsdb_monitor = OvsdbMonitor(self.ip, self.port, self.nb_api, self.idl)
ovsdb_monitor.daemonize()
def transaction(self, check_error=False, log_errors=True, **kwargs):
@ -268,7 +268,7 @@ class OvsdbMonitor(object):
TYPE_BRIDGE_PORT = 3
TYPE_PATCH_PORT = 4
def __init__(self, ip, port, nb_api):
def __init__(self, ip, port, nb_api, idl):
super(OvsdbMonitor, self).__init__()
self.ip = ip
self.port = port
@ -278,6 +278,7 @@ class OvsdbMonitor(object):
self.sock = None
self.monitor_request_id = None
self.nb_api = nb_api
self.idl = idl
self._daemon = df_utils.DFDaemon()
def daemonize(self):
@ -334,6 +335,10 @@ class OvsdbMonitor(object):
return
for row_uuid, table_row in six.iteritems(table_rows):
if not self._is_handle_interface_update(row_uuid):
LOG.info(_LI("Skipping port id %s"), row_uuid)
continue
new = table_row.get(OvsdbMonitor.MSG_STATUS_NEW)
old = table_row.get(OvsdbMonitor.MSG_STATUS_OLD)
@ -352,6 +357,10 @@ class OvsdbMonitor(object):
self.parse_interface(_interface, new)
self.notify_update_local_interface(_interface, "create")
def _is_handle_interface_update(self, interface_uuid):
br_int = idlutils.row_by_value(self.idl, 'Bridge', 'name', 'br-int')
return interface_uuid in br_int.ports
def get_interface_type(self, input_dict):
interface_type = input_dict.get(OvsdbMonitor.INTERFACE_FIELD_TYPE)
interface_name = input_dict.get(OvsdbMonitor.INTERFACE_FIELD_NAME)