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

Ben Pfaff blp at nicira.com
Fri Feb 11 18:40:45 UTC 2011


On Thu, Feb 10, 2011 at 10:09:00PM -0800, Andrew Evans wrote:
> Citrix have made modifications to the various interface configuration scripts
> that OVS replaces, so at present those modifications are lost when OVS is
> installed on e.g. XenServer 5.6.100. This commit applies those changes while
> preserving OVS-specific modifications that have been made in the interim.
> 
> One major change introduced by these updates is the removal of support for
> XenServer releases prior to 5.6.100.

This should be in the patch subject, since it is important.  Maybe:
xenserver: Merge upstream changes and drop pre-5.6.100 support.

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.

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?

	* interface-reconfigure itself is identical.  Excellent.

	* 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
 
 #
 # 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",
         }
 
     # override defaults with values from other-config whose keys being with "bond-"

	* InterfaceReconfigureVswitch.py has a difference at the end
          that was sent upstream, acked, and never applied upstream,
          so I've sent that one upstream again in a separate email.

I didn't really look over the xen-bugtool changes since we're going to
change it again soon anyway.

Thanks,

Ben.




More information about the dev mailing list