Here is an incremental. Thanks for the reviews.
Ethan
---
.../usr_share_openvswitch_scripts_ovs-xapi-sync | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index 28acad8..0296621 100755
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -125,7 +125,7 @@ def call_vsctl(args):
def set_external_id(table, record, key, value):
if value:
- col = 'external-ids:"' + key + '"="' + value + '"'
+ col = 'external-ids:"%s"="%s"' % (key, value)
call_vsctl(["set", table, record, col])
else:
call_vsctl(["remove", table, record, "external-ids", key])
@@ -244,12 +244,12 @@ def update_tap_from_vif(idl, tap_name, vif_name):
tap = None
vif = None
- for i in ifaces:
- name = str(ifaces[i].name).strip('"')
+ for i in ifaces.values():
+ name = i.name.as_scalar().strip('"')
if name == tap_name:
- tap = ifaces[i]
+ tap = i
elif name == vif_name:
- vif = ifaces[i]
+ vif = i
if vif and tap:
vxid = vif.external_ids
--
1.7.5.2
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
