Signed-off-by: Jason Kölker <[email protected]>
---
ryu/services/protocols/ovsdb/client.py | 6 +++++-
ryu/services/protocols/ovsdb/manager.py | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ryu/services/protocols/ovsdb/client.py
b/ryu/services/protocols/ovsdb/client.py
index 525b432..ef532b3 100644
--- a/ryu/services/protocols/ovsdb/client.py
+++ b/ryu/services/protocols/ovsdb/client.py
@@ -192,7 +192,7 @@ class RemoteOvsdb(app_manager.RyuApp):
event.EventPortUpdated]
@classmethod
- def factory(cls, sock, address, *args, **kwargs):
+ def factory(cls, sock, address, probe_interval=None, *args, **kwargs):
ovs_stream = stream.Stream(sock, None, None)
connection = jsonrpc.Connection(ovs_stream)
schemas = discover_schemas(connection)
@@ -205,6 +205,10 @@ class RemoteOvsdb(app_manager.RyuApp):
fsm.enable(now())
fsm.set_passive(True, now())
fsm.set_max_tries(-1)
+
+ if probe_interval is not None:
+ fsm.set_probe_interval(probe_interval)
+
fsm.connected(now())
session = jsonrpc.Session(fsm, connection)
diff --git a/ryu/services/protocols/ovsdb/manager.py
b/ryu/services/protocols/ovsdb/manager.py
index afe949f..631f28b 100644
--- a/ryu/services/protocols/ovsdb/manager.py
+++ b/ryu/services/protocols/ovsdb/manager.py
@@ -26,6 +26,7 @@ from ryu.controller import handler
opts = (cfg.StrOpt('address', default='0.0.0.0', help='OVSDB address'),
cfg.IntOpt('port', default=6640, help='OVSDB port'),
+ cfg.IntOpt('probe-interval', help='OVSDB reconnect probe interval'),
cfg.StrOpt('mngr-privkey', default=None, help='manager private key'),
cfg.StrOpt('mngr-cert', default=None, help='manager certificate'),
cfg.ListOpt('whitelist', default=[],
@@ -43,6 +44,7 @@ class OVSDB(app_manager.RyuApp):
super(OVSDB, self).__init__(*args, **kwargs)
self._address = self.CONF.ovsdb.address
self._port = self.CONF.ovsdb.port
+ self._probe_interval = self.CONF.ovsdb.probe_interval
self._clients = {}
def _accept(self, server):
@@ -89,7 +91,8 @@ class OVSDB(app_manager.RyuApp):
return self.send_event(client_name, ev)
def _start_remote(self, sock, client_address):
- app = client.RemoteOvsdb.factory(sock, client_address)
+ app = client.RemoteOvsdb.factory(sock, client_address,
+ probe_interval=self._probe_interval)
if app:
self._clients[app.name] = app
--
2.7.2
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
