From 54418a0f1722e5b8a464907895b29c736ded9f0f Mon Sep 17 00:00:00 2001 From: Dominic Curran Date: Wed, 15 Feb 2012 17:17:25 +0000 Subject: xenserver: Fix iteration of dictionary. Fix bug in commit 3249bb907a1dab9b0, which incorrectly assumed that get_all_records_where() returned a list. It in fact returns a dictionary and the list iteratory needs to change to account for this. Thanks to Nicira for pointing this out. NIC-454. Reported-by: David Tsai Acked-by: Rob Hoes Signed-off-by: Dominic Curran Signed-off-by: Ben Pfaff --- AUTHORS | 1 + xenserver/etc_xapi.d_plugins_openvswitch-cfg-update | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 47c764847..7b2774bf5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,6 +12,7 @@ Chuck Short zulcss@ubuntu.com Dan Wendlandt dan@nicira.com Daniel Roman droman@nicira.com David Erickson derickso@stanford.edu +Dominic Curran dominic.curran@citrix.com Ethan Jackson ethan@nicira.com Gaetano Catalli gaetano.catalli@gmail.com Glen Gibb grg@stanford.edu diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update index a9a10e83f..ef4d11a8e 100755 --- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update @@ -100,7 +100,7 @@ def update(session, args): pool_mgmt_macs = {} if new_controller: recs = session.xenapi.PIF.get_all_records_where('field "management"="true"') - for rec in recs: + for rec in recs.itervalues(): pool_mgmt_macs[rec.get('MAC')] = rec.get('device') dib_changed = False -- cgit v1.2.1