Skip to content

Commit

Permalink
xenserver: Fix list/map access for python3.
Browse files Browse the repository at this point in the history 
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
  • Loading branch information
@joestringer
joestringer committed Jun 7, 2016
1 parent 1ea636e commit ba9050f
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 29 deletions.
41 changes: 20 additions & 21 deletions xenserver/opt_xensource_libexec_InterfaceReconfigure.py
View file
Expand Up @@ -279,11 +279,10 @@ def _otherconfig_from_xml(n, attrs):
_NETWORK_XML_TAG = "network"
_POOL_XML_TAG = "pool"

_ETHTOOL_OTHERCONFIG_ATTRS = ['ethtool-%s' % x for x in 'autoneg', 'speed', 'duplex', 'rx', 'tx', 'sg', 'tso', 'ufo', 'gso', 'gro', 'lro' ]
_ETHTOOL_OTHERCONFIG_ATTRS = ['ethtool-%s' % x for x in ['autoneg', 'speed', 'duplex', 'rx', 'tx', 'sg', 'tso', 'ufo', 'gso', 'gro', 'lro'] ]

_PIF_OTHERCONFIG_ATTRS = [ 'domain', 'peerdns', 'defaultroute', 'mtu', 'static-routes' ] + \
[ 'bond-%s' % x for x in 'mode', 'miimon', 'downdelay',
'updelay', 'use_carrier', 'hashing-algorithm' ] + \
[ 'bond-%s' % x for x in ['mode', 'miimon', 'downdelay', 'updelay', 'use_carrier', 'hashing-algorithm'] ] + \
[ 'vlan-bug-workaround' ] + \
_ETHTOOL_OTHERCONFIG_ATTRS

Expand Down Expand Up @@ -387,7 +386,7 @@ def __read_xensource_inventory(self):
return dict(defs)

def __pif_on_host(self,pif):
return self.__pifs.has_key(pif)
return pif in self.__pifs

def __get_pif_records_from_xapi(self, session, host):
self.__pifs = {}
Expand All @@ -399,7 +398,7 @@ def __get_pif_records_from_xapi(self, session, host):
self.__pifs[p][f] = rec[f]
self.__pifs[p]['other_config'] = {}
for f in _PIF_OTHERCONFIG_ATTRS:
if not rec['other_config'].has_key(f): continue
if f not in rec['other_config']: continue
self.__pifs[p]['other_config'][f] = rec['other_config'][f]

def __get_vlan_records_from_xapi(self, session):
Expand Down Expand Up @@ -446,7 +445,7 @@ def __get_network_records_from_xapi(self, session):
self.__networks[n][f] = rec[f]
self.__networks[n]['other_config'] = {}
for f in _NETWORK_OTHERCONFIG_ATTRS:
if not rec['other_config'].has_key(f): continue
if f not in rec['other_config']: continue
self.__networks[n]['other_config'][f] = rec['other_config'][f]

def __get_pool_records_from_xapi(self, session):
Expand All @@ -460,7 +459,7 @@ def __get_pool_records_from_xapi(self, session):
self.__pools[p][f] = rec[f]

for f in _POOL_OTHERCONFIG_ATTRS:
if rec['other_config'].has_key(f):
if f in rec['other_config']:
self.__pools[p]['other_config'][f] = rec['other_config'][f]

def __to_xml(self, xml, parent, key, ref, rec, attrs):
Expand All @@ -471,7 +470,7 @@ def __to_xml(self, xml, parent, key, ref, rec, attrs):
e.setAttribute('ref', ref)

for n,v in rec.items():
if attrs.has_key(n):
if n in attrs:
h,_ = attrs[n]
h(xml, e, n, v)
else:
Expand Down Expand Up @@ -502,7 +501,7 @@ def __init__(self, session_ref=None, cache_file=None):
try:

inventory = self.__read_xensource_inventory()
assert(inventory.has_key('INSTALLATION_UUID'))
assert('INSTALLATION_UUID' in inventory)
log("host uuid is %s" % inventory['INSTALLATION_UUID'])

host = session.xenapi.host.get_by_uuid(inventory['INSTALLATION_UUID'])
Expand Down Expand Up @@ -628,13 +627,13 @@ def get_pif_by_bridge(self, bridge):
return answer

def get_pif_record(self, pif):
if self.__pifs.has_key(pif):
if pif in self.__pifs:
return self.__pifs[pif]
raise Error("Unknown PIF \"%s\"" % pif)
def get_all_pifs(self):
return self.__pifs
def pif_exists(self, pif):
return self.__pifs.has_key(pif)
return pif in self.__pifs

def get_management_pif(self):
""" Returns the management pif on host
Expand All @@ -646,25 +645,25 @@ def get_management_pif(self):
return None

def get_network_record(self, network):
if self.__networks.has_key(network):
if network in self.__networks:
return self.__networks[network]
raise Error("Unknown network \"%s\"" % network)

def get_bond_record(self, bond):
if self.__bonds.has_key(bond):
if bond in self.__bonds:
return self.__bonds[bond]
else:
return None

def get_vlan_record(self, vlan):
if self.__vlans.has_key(vlan):
if vlan in self.__vlans:
return self.__vlans[vlan]
else:
return None

def get_pool_record(self):
if len(self.__pools) > 0:
return self.__pools.values()[0]
return list(self.__pools.values())[0]

#
#
Expand All @@ -673,19 +672,19 @@ def get_pool_record(self):

def ethtool_settings(oc, defaults = {}):
settings = []
if oc.has_key('ethtool-speed'):
if 'ethtool-speed' in oc:
val = oc['ethtool-speed']
if val in ["10", "100", "1000"]:
settings += ['speed', val]
else:
log("Invalid value for ethtool-speed = %s. Must be 10|100|1000." % val)
if oc.has_key('ethtool-duplex'):
if 'ethtool-duplex' in oc:
val = oc['ethtool-duplex']
if val in ["half", "full"]:
settings += ['duplex', val]
else:
log("Invalid value for ethtool-duplex = %s. Must be half|full." % val)
if oc.has_key('ethtool-autoneg'):
if 'ethtool-autoneg' in oc:
val = oc['ethtool-autoneg']
if val in ["true", "on"]:
settings += ['autoneg', 'on']
Expand All @@ -695,7 +694,7 @@ def ethtool_settings(oc, defaults = {}):
log("Invalid value for ethtool-autoneg = %s. Must be on|true|off|false." % val)
offload = []
for opt in ("rx", "tx", "sg", "tso", "ufo", "gso", "gro", "lro"):
if oc.has_key("ethtool-" + opt):
if "ethtool-" + opt in oc:
val = oc["ethtool-" + opt]
if val in ["true", "on"]:
offload += [opt, 'on']
Expand All @@ -717,12 +716,12 @@ def mtu_setting(nw, type, oc):
mtu = None

nwrec = db().get_network_record(nw)
if nwrec.has_key('MTU'):
if 'MTU' in nwrec:
mtu = nwrec['MTU']
else:
mtu = "1500"

if oc.has_key('mtu'):
if 'mtu' in oc:
log("Override Network.MTU setting on bridge %s from %s.MTU is %s" % \
(nwrec['bridge'], type, mtu))
mtu = oc['mtu']
Expand Down
16 changes: 8 additions & 8 deletions xenserver/opt_xensource_libexec_interface-reconfigure
View file
Expand Up @@ -241,7 +241,7 @@ def ipdev_configure_static_routes(interface, oc, f):
172.16.0.0/15 via 192.168.0.3 dev xenbr1
172.18.0.0/16 via 192.168.0.4 dev xenbr1
"""
if oc.has_key('static-routes'):
if 'static-routes' in oc:
# The key is present - extract comma separates entries
lines = oc['static-routes'].split(',')
else:
Expand Down Expand Up @@ -306,7 +306,7 @@ def ipdev_configure_network(pif, dp):
log("Configuring %s using %s configuration" % (ipdev, mode))

oc = None
if pifrec.has_key('other_config'):
if 'other_config' in pifrec:
oc = pifrec['other_config']

dp.configure_ipdev(f)
Expand All @@ -324,7 +324,7 @@ def ipdev_configure_network(pif, dp):
else:
raise Error("Unknown ip-configuration-mode %s" % pifrec['ip_configuration_mode'])

if nwrec.has_key('other_config'):
if 'other_config' in nwrec:
settings,offload = ethtool_settings(nwrec['other_config'])
if len(settings):
f.write("ETHTOOL_OPTS=\"%s\"\n" % str.join(" ", settings))
Expand All @@ -338,10 +338,10 @@ def ipdev_configure_network(pif, dp):
f.write("MTU=%s\n" % mtu)


if pifrec.has_key('DNS') and pifrec['DNS'] != "":
if 'DNS' in pifrec and pifrec['DNS'] != "":
ServerList = pifrec['DNS'].split(",")
for i in range(len(ServerList)): f.write("DNS%d=%s\n" % (i+1, ServerList[i]))
if oc and oc.has_key('domain'):
if oc and 'domain' in oc:
f.write("DOMAIN='%s'\n" % oc['domain'].replace(',', ' '))

# There can be only one DNSDEV and one GATEWAYDEV in /etc/sysconfig/network.
Expand Down Expand Up @@ -375,13 +375,13 @@ def ipdev_configure_network(pif, dp):
for __pif in pifs_on_host:
__pifrec = db().get_pif_record(__pif)
__oc = __pifrec['other_config']
if __oc.has_key('peerdns') and __oc['peerdns'] == 'true':
if 'peerdns' in __oc and __oc['peerdns'] == 'true':
if peerdns_pif == None:
peerdns_pif = __pif
else:
log('Warning: multiple pifs with "peerdns=true" - choosing %s and ignoring %s' % \
(db().get_pif_record(peerdns_pif)['device'], __pifrec['device']))
if __oc.has_key('defaultroute') and __oc['defaultroute'] == 'true':
if 'defaultroute' in __oc and __oc['defaultroute'] == 'true':
if defaultroute_pif == None:
defaultroute_pif = __pif
else:
Expand Down Expand Up @@ -511,7 +511,7 @@ def action_force_rewrite(bridge, config):
elif mode != 'dhcp':
raise Usage("--mode must be either static or dhcp")

if config.has_key('vlan'):
if 'vlan' in config:
is_vlan = True
vlan_slave, vlan_vid = config['vlan'].split('.')
else:
Expand Down

0 comments on commit ba9050f

Please sign in to comment.