Merge "Avoid empty "vsctl" transactions" into stable/stein
This commit is contained in:
commit
f419724bca
|
@ -911,11 +911,12 @@ class OVSBridge(BaseOVS):
|
||||||
'qos').execute(check_error=False)
|
'qos').execute(check_error=False)
|
||||||
qos = self.find_qos(port_name)
|
qos = self.find_qos(port_name)
|
||||||
queue = self.find_queue(port_name, QOS_DEFAULT_QUEUE)
|
queue = self.find_queue(port_name, QOS_DEFAULT_QUEUE)
|
||||||
with self.ovsdb.transaction(check_error=True) as txn:
|
|
||||||
if qos:
|
if qos:
|
||||||
txn.add(self.ovsdb.db_destroy('QoS', qos['_uuid']))
|
self.ovsdb.db_destroy('QoS',
|
||||||
|
qos['_uuid']).execute(check_error=True)
|
||||||
if queue:
|
if queue:
|
||||||
txn.add(self.ovsdb.db_destroy('Queue', queue['_uuid']))
|
self.ovsdb.db_destroy('Queue',
|
||||||
|
queue['_uuid']).execute(check_error=True)
|
||||||
|
|
||||||
def set_controller_field(self, field, value):
|
def set_controller_field(self, field, value):
|
||||||
attr = [(field, value)]
|
attr = [(field, value)]
|
||||||
|
|
Loading…
Reference in New Issue