openstack
/
neutron
Code Issues Proposed changes

Merge "allow OVSDB connection schema to be configurable"

This commit is contained in:
Jenkins 2015-04-14 06:40:14 +00:00 committed by Gerrit Code Review
parent 4d671a29ac aa7567e8bb
commit e270fb41ae
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/ovsdb/impl_idl.py
View File

@ -120,7 +120,8 @@ class Transaction(api.Transaction):
class OvsdbIdl(api.API):
ovsdb_connection = connection.Connection(cfg.CONF.OVS.ovsdb_connection,
cfg.CONF.ovs_vsctl_timeout)
cfg.CONF.ovs_vsctl_timeout,
'Open_vSwitch')
def __init__(self, context):
super(OvsdbIdl, self).__init__(context)

6
neutron/agent/ovsdb/native/connection.py
View File

@ -49,19 +49,21 @@ class TransactionQueue(Queue.Queue, object):
class Connection(object):
def __init__(self, connection, timeout):
def __init__(self, connection, timeout, schema_name):
self.idl = None
self.connection = connection
self.timeout = timeout
self.txns = TransactionQueue(1)
self.lock = threading.Lock()
self.schema_name = schema_name
def start(self):
with self.lock:
if self.idl is not None:
return
helper = idlutils.get_schema_helper(self.connection)
helper = idlutils.get_schema_helper(self.connection,
self.schema_name)
helper.register_all()
self.idl = idl.Idl(self.connection, helper)
idlutils.wait_for_change(self.idl, self.timeout)

4
neutron/agent/ovsdb/native/idlutils.py
View File

@ -93,14 +93,14 @@ class ExceptionResult(object):
self.tb = tb
def get_schema_helper(connection):
def get_schema_helper(connection, schema_name):
err, strm = stream.Stream.open_block(
stream.Stream.open(connection))
if err:
raise Exception("Could not connect to %s" % (
connection,))
rpc = jsonrpc.Connection(strm)
req = jsonrpc.Message.create_request('get_schema', ['Open_vSwitch'])
req = jsonrpc.Message.create_request('get_schema', [schema_name])
err, resp = rpc.transact_block(req)
rpc.close()
if err: