On Wed, Feb 15, 2012 at 05:38:28PM +0000, Dominic Curran wrote:
> > -----Original Message-----
> > From: Ben Pfaff [mailto:b...@nicira.com]
> > Sent: 15 February 2012 17:24
> > To: Rob Hoes
> > Cc: dev@openvswitch.org; Dominic Curran; Rob Hoes
> > Subject: Re: [ovs-dev] [PATCH 1/1] xenserver: Fix iteration of
> > dictionary
> >
> > On Wed, Feb 15, 2012 at 05:17:25PM +0000, Rob Hoes wrote:
> > > From: Dominic Curran <dominic.cur...@citrix.com>
> > >
> > > Fix bug in commit 3249bb907a1dab9b0
> > >
> > > Incorrectly assume that get_all_records_where() returned a list.
> > > It infact returns a disctionary and the list iteratory needs to
> > change
> > > to account for this.
> > > Thanks to Nicira for pointing this out.
> > >
> > > NIC-454.
> > >
> > > Signed-off-by: Rob Hoes <rob.h...@citrix.com>
> > > Reported-by: David Tsai <dt...@nicira.com>
> > > Signed-off-by: Dominic Curran <dominic.cur...@citrix.com>
> >
> > Now I'm confused. First, Dominic, I understand <gigamuf...@gmail.com>
> > to be your email address, but you've attached Rob Hoes's name to it in
> > your email headers. Second, who actually wrote this patch? Dominic,
> > did you write it or did Rob?
> >
> > Thanks,
> >
> > Ben.
>
> I know, I know, I've screwed up. Hang head in shame.
>
> Nicira suggested bug fix.
> I implemented/wrote the patch.
> RobH has OK'd the change.
>
> I thought 'git send-email' was going to put 'From: Rob Hoes
> <rob.h...@citrix.com>' where you told me to put it. I'm sorry. I
> certainly didn't think it was going to mangle my email with his name.
I understand now. Thanks.
You're the author of the patch, so there's no need for a From: line in
the body, since it can come from your email headers directly.
RobH did not write the patch and the patch did not flow through him, so
I converted the Signed-off-by: to an Acked-by:. (I think that there is
some provision in the system for some kind of centralized sign-off for
an organization, but I think that an Acked-by: represents what happened
here acceptably well.)
I applied the following to master and branch-1.[345]:
--8<--------------------------cut here-------------------------->8--
From: Dominic Curran <dominic.cur...@citrix.com>
Date: Wed, 15 Feb 2012 17:17:25 +0000
Subject: [PATCH] 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 <dt...@nicira.com>
Acked-by: Rob Hoes <rob.h...@citrix.com>
Signed-off-by: Dominic Curran <dominic.cur...@citrix.com>
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
AUTHORS | 2 +-
.../etc_xapi.d_plugins_openvswitch-cfg-update | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index cd7c9d3..58f7ecc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ Dan Wendlandt d...@nicira.com
Daniel Roman dro...@nicira.com
David Erickson deric...@stanford.edu
Devendra Naga devendra.a...@gmail.com
+Dominic Curran dominic.cur...@citrix.com
Edward Tomasz Napierała tr...@freebsd.org
Ethan Jackson et...@nicira.com
Gaetano Catalli gaetano.cata...@gmail.com
@@ -76,7 +77,6 @@ Bryan Osoro bos...@nicira.com
Cedric Hobbs ced...@nicira.com
Dave Walker davewal...@ubuntu.com
Derek Cormier derek.corm...@lab.ntt.co.jp
-Dominic Curran dominic.cur...@citrix.com
Duffie Cooley dcoo...@nicira.com
DK Moon dkm...@nicira.com
Edwin Chiu ec...@nicira.com
diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index a9a10e8..ef4d11a 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
--
1.7.2.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
