diff options
| -rw-r--r-- | cloud/misc/rhevm.py | 16 | ||||
| -rw-r--r-- | network/haproxy.py | 4 | ||||
| -rw-r--r-- | network/snmp_facts.py | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/cloud/misc/rhevm.py b/cloud/misc/rhevm.py index 68927a9c..6606101e 100644 --- a/cloud/misc/rhevm.py +++ b/cloud/misc/rhevm.py @@ -715,22 +715,22 @@ class RHEVConn(object): for iface in ifaces: try: setMsg('creating host interface ' + iface['name']) - if 'management' in iface.keys(): + if 'management' in iface: manageip = iface['ip'] - if 'boot_protocol' not in iface.keys(): - if 'ip' in iface.keys(): + if 'boot_protocol' not in iface: + if 'ip' in iface: iface['boot_protocol'] = 'static' else: iface['boot_protocol'] = 'none' - if 'ip' not in iface.keys(): + if 'ip' not in iface: iface['ip'] = '' - if 'netmask' not in iface.keys(): + if 'netmask' not in iface: iface['netmask'] = '' - if 'gateway' not in iface.keys(): + if 'gateway' not in iface: iface['gateway'] = '' - if 'network' in iface.keys(): - if 'bond' in iface.keys(): + if 'network' in iface: + if 'bond' in iface: bond = [] for slave in iface['bond']: bond.append(ifacelist[slave]) diff --git a/network/haproxy.py b/network/haproxy.py index 0d1db039..0ab17549 100644 --- a/network/haproxy.py +++ b/network/haproxy.py @@ -196,10 +196,10 @@ class HAProxy(object): """ Capture the output for a command """ - if not 'command' in self.command_results.keys(): + if 'command' not in self.command_results: self.command_results['command'] = [] self.command_results['command'].append(cmd) - if not 'output' in self.command_results.keys(): + if 'output' not in self.command_results: self.command_results['output'] = [] self.command_results['output'].append(output) diff --git a/network/snmp_facts.py b/network/snmp_facts.py index 28546dfc..1411b802 100644 --- a/network/snmp_facts.py +++ b/network/snmp_facts.py @@ -153,7 +153,7 @@ def lookup_adminstatus(int_adminstatus): 2: 'down', 3: 'testing' } - if int_adminstatus in adminstatus_options.keys(): + if int_adminstatus in adminstatus_options: return adminstatus_options[int_adminstatus] else: return "" @@ -168,7 +168,7 @@ def lookup_operstatus(int_operstatus): 6: 'notPresent', 7: 'lowerLayerDown' } - if int_operstatus in operstatus_options.keys(): + if int_operstatus in operstatus_options: return operstatus_options[int_operstatus] else: return "" |