From 093d1fc52edeadbe42ea9f68fac2a831d5a79bbb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 18 May 2009 12:23:39 -0700 Subject: [PATCH] xenserver: Delete code unneeded for openvswitch. openvswitch doesn't care about the ordering here. --- ...opt_xensource_libexec_interface-reconfigure | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure index 933f074d..f6458405 100755 --- a/xenserver/opt_xensource_libexec_interface-reconfigure +++ b/xenserver/opt_xensource_libexec_interface-reconfigure @@ -525,23 +525,7 @@ def get_bond_slaves_of_pif(pif): if not bondrec: raise Error("No bond record for bond master PIF") - # build a list of slave's pifs - slave_pifs = bondrec['slaves'] - - # Ensure any currently attached slaves are listed in the opposite order to the order in - # which they were attached. The first slave attached must be the last detached since - # the bond is using its MAC address. - try: - attached_slaves = open("/sys/class/net/%s/bonding/slaves" % pifrec['device']).readline().split() - for slave in attached_slaves: - partial_pifrec = {'host':host, 'device':slave} - slave_pif = db.get_pif_by_record(partial_pifrec) - slave_pifs.remove(slave_pif) - slave_pifs.insert(0, slave_pif) - except IOError: - pass - - return slave_pifs + return bondrec['slaves'] def get_vlan_slave_of_pif(pif): """Find the PIF which is the VLAN slave of pif. -- 2.30.2