diff options
| author | Justin Pettit <jpettit@nicira.com> | 2011-02-11 12:35:35 -0800 |
|---|---|---|
| committer | Andrew Evans <aevans@nicira.com> | 2011-02-11 13:12:59 -0800 |
| commit | 34edeccfd8d4273844d12c85fe38ec47002c47cd (patch) | |
| tree | 06d016ce1932028098d1c94a2fafc176a8456d0c /xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py | |
| parent | 54f16a10f5bef5454e53c081c7633a83b09eda5d (diff) | |
| download | openvswitch-34edeccfd8d4273844d12c85fe38ec47002c47cd.tar.gz | |
xenserver: Remove support for XenServer versions older than 5.6 FP1.
Commit 404c169247b1c3ac2ebad887f0421478a6cef924 breaks compatibility with
XenServers older than 5.6 FP1. This commit removes the last vestiges of
support for those older XenServer versions.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py')
| -rw-r--r-- | xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index 928e6cefa..6a1d4edc8 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -1,5 +1,5 @@ # Copyright (c) 2008,2009 Citrix Systems, Inc. -# Copyright (c) 2009,2010 Nicira Networks. +# Copyright (c) 2009,2010,2011 Nicira Networks. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published @@ -465,10 +465,6 @@ class DatapathVswitch(Datapath): dpname = pif_bridge_name(self._dp) if pif_is_vlan(self._pif): - # XXX this is only needed on XS5.5, because XAPI misguidedly - # creates the fake bridge (via bridge ioctl) before it calls us. - vsctl_argv += ['--', '--if-exists', 'del-br', bridge] - # configure_datapath() set up the underlying datapath bridge. # Stack a VLAN bridge on top of it. vsctl_argv += ['--', '--may-exist', 'add-br', @@ -550,11 +546,6 @@ class DatapathVswitch(Datapath): bridge = pif_bridge_name(dp) - #nw = db().get_pif_record(self._pif)['network'] - #nwrec = db().get_network_record(nw) - #vsctl_argv += ['# deconfigure network-uuids'] - #vsctl_argv += ['--del-entry=bridge.%s.network-uuids=%s' % (bridge,nwrec['uuid'])] - log("deconfigure ipdev %s on %s" % (ipdev,bridge)) vsctl_argv += ["# deconfigure ipdev %s" % ipdev] vsctl_argv += datapath_deconfigure_ipdev(ipdev) |