openstack
/
neutron
Code Issues Proposed changes

Merge "Avoid empty "vsctl" transactions" into stable/stein

This commit is contained in:
Zuul 2020-07-01 01:42:11 +00:00 committed by Gerrit Code Review
parent 6dfc35680f ca11545e06
commit f419724bca
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/agent/common/ovs_lib.py
View File

@ -911,11 +911,12 @@ class OVSBridge(BaseOVS):
'qos').execute(check_error=False)
qos = self.find_qos(port_name)
queue = self.find_queue(port_name, QOS_DEFAULT_QUEUE)
with self.ovsdb.transaction(check_error=True) as txn:
if qos:
txn.add(self.ovsdb.db_destroy('QoS', qos['_uuid']))
if queue:
txn.add(self.ovsdb.db_destroy('Queue', queue['_uuid']))
if qos:
self.ovsdb.db_destroy('QoS',
qos['_uuid']).execute(check_error=True)
if queue:
self.ovsdb.db_destroy('Queue',
queue['_uuid']).execute(check_error=True)
def set_controller_field(self, field, value):
attr = [(field, value)]