[ovs-dev] [PATCH] xenserver: Merge changes to scripts from XenServer 5.6.100.

Ben Pfaff blp at nicira.com
Fri Feb 11 20:17:44 UTC 2011


On Fri, Feb 11, 2011 at 11:44:11AM -0800, Andrew Evans wrote:
> On 2/11/11 10:40 AM, Ben Pfaff wrote:
> > This commit should update the documentation to remove references to
> > XenServer 5.5 and 5.6 support.  At least INSTALL.Linux and
> > INSTALL.XenServer need to be updated.
> 
> Justin was doing that, but I'll roll his changes into my patch.

Unless you've already done that, don't bother--we might as well use
Justin's patch directly, ideally applying it before yours but really
it doesn't matter much.

> > Comparing the scripts that this commit produces against the upstream
> > 5.6.100 scripts, I see the following differences:
> > 
> > 	* etc_xensource_scripts_vif has just whitespace differences.
> >           Can you fix those up?
> 
> Those are the only lines that use tabs for indentation. Justin cleaned
> those up in a previous commit. Shouldn't we ask Citrix to merge those
> cleanups?

I guess I don't feel particularly eager about pushing whitespace
changes upstream.  It takes time, for questionable benefit.  I'd
rather just adopt their version, since the whitespace changes make no
functional difference.

> > 	* The following difference in InterfaceReconfigure.py appears
> >           to be for compatibility with pre-5.6.100 that wouldn't have
> >           a tunnel_access_PIF_of field, so I think that we could
> >           revert this difference now.
> > 
> > @@ -826,7 +871,8 @@
> >  # Tunnel PIFs
> >  #
> >  def pif_is_tunnel(pif):
> > -    return len(db().get_pif_record(pif)['tunnel_access_PIF_of']) > 0
> > +    rec = db().get_pif_record(pif)
> > +    return rec.has_key('tunnel_access_PIF_of') and len(rec['tunnel_access_PIF_of']) > 0
> 
> This breaks the unit test with a KeyError. I guess the test just needs
> to be updated?

Yes, I imagine that the PIF records in the test just need to have
empty tunnel_access_PIF_of added.

> >  #
> >  # Datapath base class
> > 
> > 	* The following difference in InterfaceReconfigureBridge.py
> >           seems gratuitous to me.  Can we remove it?
> > 
> > --- /dev/fd/63	2011-02-11 10:38:29.777853980 -0800
> > +++ opt_xensource_libexec_InterfaceReconfigureBridge.py	2011-02-11 09:57:45.000000000 -0800
> > @@ -350,6 +350,7 @@
> >          "downdelay": "200",
> >          "updelay": "31000",
> >          "use_carrier": "1",
> > +        "hashing-algorithm": "src_mac",
> >          }
> 
> That's from Ethan's commit 2776e4086038071f25e67579fc4215ef95ea26a6 on
> Fri Jan 28 16:53:06 2011 -0800. I assume LACP will break without it.

I doubt it.  Ethan?




More information about the dev mailing list