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

Andrew Evans aevans at nicira.com
Fri Feb 11 19:44:11 UTC 2011


On 2/11/11 10:40 AM, Ben Pfaff wrote:
> On Thu, Feb 10, 2011 at 10:09:00PM -0800, Andrew Evans wrote:
> This should be in the patch subject, since it is important.  Maybe:
> xenserver: Merge upstream changes and drop pre-5.6.100 support.

Ok, done.

> 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.

> 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?

> 	* 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?

>  #
>  # 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.

thanks,

-Andrew




More information about the dev mailing list