mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-05 08:45:23 +00:00
Code Issues Releases Wiki Activity

python: Send old values of the updated cols in notify for update2

Browse Source 
When python IDL calls the "notify" function after processing the "update2"
message from ovsdb-server, it is suppose to send the old values of the
updated columns as the last parameter. But the recent commit "897c8064"
sends the updated values. This breaks the behaviour.
This patch fixes this issue. It also updates the description of
the 'updates' param of the notify function to make it more clear.

Fixes: 897c8064 ("python: move Python idl to work with monitor_cond")
Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Numan Siddique
2016-07-26 23:28:14 +05:30
committed by Ben Pfaff
parent d2fa6c676a
commit a7261bf7ac
3 changed files with 162 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
python/ovs/db/idl.py
View File

@@ -333,7 +333,8 @@ class Idl(object):
:type event: ROW_CREATE, ROW_UPDATE, or ROW_DELETE
:param row: The row as it is after the operation has occured
:type row: Row
:param updates: For updates, row with only updated columns
:param updates: For updates, row with only old values of the changed
columns
:type updates: Row
"""
@@ -511,9 +512,10 @@ class Idl(object):
if not row:
raise error.Error('Modify non-existing row')
self.__apply_diff(table, row, row_update['modify'])
old_row_diff_json = self.__apply_diff(table, row,
row_update['modify'])
self.notify(ROW_UPDATE, row,
Row.from_json(self, table, uuid, row_update['modify']))
Row.from_json(self, table, uuid, old_row_diff_json))
changed = True
else:
raise error.Error('<row-update> unknown operation',
@@ -576,7 +578,8 @@ class Idl(object):
row_update[column.name] = self.__column_name(column)
def __apply_diff(self, table, row, row_diff):
for column_name, datum_json in six.iteritems(row_diff):
old_row_diff_json = {}
for column_name, datum_diff_json in six.iteritems(row_diff):
column = table.columns.get(column_name)
if not column:
# XXX rate-limit
@@ -585,17 +588,21 @@ class Idl(object):
continue
try:
datum = ovs.db.data.Datum.from_json(column.type, datum_json)
datum_diff = ovs.db.data.Datum.from_json(column.type,
datum_diff_json)
except error.Error as e:
# XXX rate-limit
vlog.warn("error parsing column %s in table %s: %s"
% (column_name, table.name, e))
continue
datum = row._data[column_name].diff(datum)
old_row_diff_json[column_name] = row._data[column_name].to_json()
datum = row._data[column_name].diff(datum_diff)
if datum != row._data[column_name]:
row._data[column_name] = datum
return old_row_diff_json
def __row_update(self, table, row, row_json):
changed = False
for column_name, datum_json in six.iteritems(row_json):