git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Python binaries to write comment in db show-log while updating database
[sliver-openvswitch.git]
/
xenserver
/
usr_share_openvswitch_scripts_ovs-xapi-sync
diff --git
a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index
7c78251
..
77c07bc
100755
(executable)
--- a/
xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/
xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@
-162,6
+162,7
@@
def set_or_delete(d, key, value):
def set_external_id(row, key, value):
def set_external_id(row, key, value):
+ row.verify("external_ids")
external_ids = row.external_ids
if set_or_delete(external_ids, key, value):
row.external_ids = external_ids
external_ids = row.external_ids
if set_or_delete(external_ids, key, value):
row.external_ids = external_ids
@@
-186,6
+187,7
@@
def update_fail_mode(row):
if fail_mode not in ['standalone', 'secure']:
fail_mode = 'standalone'
if fail_mode not in ['standalone', 'secure']:
fail_mode = 'standalone'
+ row.verify("fail_mode")
if row.fail_mode != fail_mode:
row.fail_mode = fail_mode
if row.fail_mode != fail_mode:
row.fail_mode = fail_mode
@@
-197,6
+199,7
@@
def update_in_band_mgmt(row):
dib = rec['other_config'].get('vswitch-disable-in-band')
dib = rec['other_config'].get('vswitch-disable-in-band')
+ row.verify("other_config")
other_config = row.other_config
if dib and dib not in ['true', 'false']:
vlog.warn('"%s" isn\'t a valid setting for '
other_config = row.other_config
if dib and dib not in ['true', 'false']:
vlog.warn('"%s" isn\'t a valid setting for '
@@
-358,6
+361,7
@@
def main():
iface_ids = new_iface_ids
vm_ids = new_vm_ids
iface_ids = new_iface_ids
vm_ids = new_vm_ids
+ txn.add_comment("ovs-xapi-sync: Updating records from XAPI")
txn.commit_block()
unixctl_server.close()
txn.commit_block()
unixctl_server.close()