openstack
/
ovsdbapp
Code Issues Proposed changes

Re-add TimeoutException

This commit is contained in:
Terry Wilson 2017-02-24 18:24:33 -05:00
parent e299f86d06
commit 27c733e281
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ovsdbapp/exceptions.py
View File

@ -48,3 +48,7 @@ class OvsdbAppException(Exception):
:returns: Always returns False.
"""
return False
class TimeoutException(OvsdbAppException):
message = "Commands %(commands)s exceeded timeout %(timeout)d seconds"

12
ovsdbapp/impl_idl.py
View File

@ -61,10 +61,8 @@ class Transaction(api.Transaction):
try:
result = self.results.get(timeout=self.timeout)
except Queue.Empty:
raise api.TimeoutException(
"Commands %(commands)s exceeded timeout %(timeout)d "
"seconds" % {'commands': self.commands,
'timeout': self.timeout})
raise api.TimeoutException(commands=self.commands,
timeout=self.timeout)
if isinstance(result, idlutils.ExceptionResult):
if self.log_errors:
LOG.error(result.tb)
@ -161,10 +159,8 @@ class NeutronOVSDBTransaction(Transaction):
self.api.idl.wait(self.ovsdb_connection.poller)
self.ovsdb_connection.poller.block()
else:
raise api.TimeoutException(
"Commands %(commands)s exceeded timeout %(timeout)d "
"seconds post-commit" % {'commands': self.commands,
'timeout': self.timeout})
raise api.TimeoutException(commands=self.commands,
timeout=self.timeout)
def post_commit_failed_interfaces(self, txn):
failed = []