mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-05-31 21:39:10 -07:00
Bulk autopep8 (modules)
As agreed in 2017-12-07 Core meeting bulk fix pep8 issues Generated using: autopep8 1.3.3 (pycodestyle: 2.3.1) autopep8 -r --max-line-length 160 --in-place --ignore E305,E402,E722,E741 lib/ansible/modules Manually fix issues that autopep8 has introduced
This commit is contained in:
John Barker
John R Barker
parent
d13d7e9404
commit
c57a7f05e1
314 changed files with 3462 additions and 3383 deletions
|
|
@ -347,6 +347,7 @@ failed = False
|
|||
|
||||
class RHEVConn(object):
|
||||
'Connection to RHEV-M'
|
||||
|
||||
def __init__(self, module):
|
||||
self.module = module
|
||||
|
||||
|
|
@ -726,11 +727,11 @@ class RHEVConn(object):
|
|||
bond.append(ifacelist[slave])
|
||||
try:
|
||||
tmpiface = params.Bonding(
|
||||
slaves = params.Slaves(host_nic = bond),
|
||||
options = params.Options(
|
||||
option = [
|
||||
params.Option(name = 'miimon', value = '100'),
|
||||
params.Option(name = 'mode', value = '4')
|
||||
slaves=params.Slaves(host_nic=bond),
|
||||
options=params.Options(
|
||||
option=[
|
||||
params.Option(name='miimon', value='100'),
|
||||
params.Option(name='mode', value='4')
|
||||
]
|
||||
)
|
||||
)
|
||||
|
|
@ -741,16 +742,16 @@ class RHEVConn(object):
|
|||
return False
|
||||
try:
|
||||
tmpnetwork = params.HostNIC(
|
||||
network = params.Network(name = iface['network']),
|
||||
name = iface['name'],
|
||||
boot_protocol = iface['boot_protocol'],
|
||||
ip = params.IP(
|
||||
address = iface['ip'],
|
||||
netmask = iface['netmask'],
|
||||
gateway = iface['gateway']
|
||||
network=params.Network(name=iface['network']),
|
||||
name=iface['name'],
|
||||
boot_protocol=iface['boot_protocol'],
|
||||
ip=params.IP(
|
||||
address=iface['ip'],
|
||||
netmask=iface['netmask'],
|
||||
gateway=iface['gateway']
|
||||
),
|
||||
override_configuration = True,
|
||||
bonding = tmpiface)
|
||||
override_configuration=True,
|
||||
bonding=tmpiface)
|
||||
networklist.append(tmpnetwork)
|
||||
setMsg('Applying network ' + iface['name'])
|
||||
except Exception as e:
|
||||
|
|
@ -760,13 +761,13 @@ class RHEVConn(object):
|
|||
return False
|
||||
else:
|
||||
tmpnetwork = params.HostNIC(
|
||||
network = params.Network(name = iface['network']),
|
||||
name = iface['name'],
|
||||
boot_protocol = iface['boot_protocol'],
|
||||
ip = params.IP(
|
||||
address = iface['ip'],
|
||||
netmask = iface['netmask'],
|
||||
gateway = iface['gateway']
|
||||
network=params.Network(name=iface['network']),
|
||||
name=iface['name'],
|
||||
boot_protocol=iface['boot_protocol'],
|
||||
ip=params.IP(
|
||||
address=iface['ip'],
|
||||
netmask=iface['netmask'],
|
||||
gateway=iface['gateway']
|
||||
))
|
||||
networklist.append(tmpnetwork)
|
||||
setMsg('Applying network ' + iface['name'])
|
||||
|
|
@ -828,8 +829,8 @@ class RHEVConn(object):
|
|||
try:
|
||||
HOST.nics.setupnetworks(params.Action(
|
||||
force=True,
|
||||
check_connectivity = False,
|
||||
host_nics = params.HostNics(host_nic = networklist)
|
||||
check_connectivity=False,
|
||||
host_nics=params.HostNics(host_nic=networklist)
|
||||
))
|
||||
setMsg('nics are set')
|
||||
except Exception as e:
|
||||
|
|
@ -1008,24 +1009,24 @@ class RHEV(object):
|
|||
VM = self.conn.get_VM(name)
|
||||
if VM:
|
||||
vminfo = dict()
|
||||
vminfo['uuid'] = VM.id
|
||||
vminfo['name'] = VM.name
|
||||
vminfo['status'] = VM.status.state
|
||||
vminfo['cpu_cores'] = VM.cpu.topology.cores
|
||||
vminfo['uuid'] = VM.id
|
||||
vminfo['name'] = VM.name
|
||||
vminfo['status'] = VM.status.state
|
||||
vminfo['cpu_cores'] = VM.cpu.topology.cores
|
||||
vminfo['cpu_sockets'] = VM.cpu.topology.sockets
|
||||
vminfo['cpu_shares'] = VM.cpu_shares
|
||||
vminfo['memory'] = (int(VM.memory) // 1024 // 1024 // 1024)
|
||||
vminfo['mem_pol'] = (int(VM.memory_policy.guaranteed) // 1024 // 1024 // 1024)
|
||||
vminfo['os'] = VM.get_os().type_
|
||||
vminfo['del_prot'] = VM.delete_protected
|
||||
vminfo['cpu_shares'] = VM.cpu_shares
|
||||
vminfo['memory'] = (int(VM.memory) // 1024 // 1024 // 1024)
|
||||
vminfo['mem_pol'] = (int(VM.memory_policy.guaranteed) // 1024 // 1024 // 1024)
|
||||
vminfo['os'] = VM.get_os().type_
|
||||
vminfo['del_prot'] = VM.delete_protected
|
||||
try:
|
||||
vminfo['host'] = str(self.conn.get_Host_byid(str(VM.host.id)).name)
|
||||
vminfo['host'] = str(self.conn.get_Host_byid(str(VM.host.id)).name)
|
||||
except Exception:
|
||||
vminfo['host'] = None
|
||||
vminfo['boot_order'] = []
|
||||
vminfo['host'] = None
|
||||
vminfo['boot_order'] = []
|
||||
for boot_dev in VM.os.get_boot():
|
||||
vminfo['boot_order'].append(str(boot_dev.dev))
|
||||
vminfo['disks'] = []
|
||||
vminfo['disks'] = []
|
||||
for DISK in VM.disks.list():
|
||||
disk = dict()
|
||||
disk['name'] = DISK.name
|
||||
|
|
@ -1033,7 +1034,7 @@ class RHEV(object):
|
|||
disk['domain'] = str((self.conn.get_domain_byid(DISK.get_storage_domains().get_storage_domain()[0].id)).name)
|
||||
disk['interface'] = DISK.interface
|
||||
vminfo['disks'].append(disk)
|
||||
vminfo['ifaces'] = []
|
||||
vminfo['ifaces'] = []
|
||||
for NIC in VM.nics.list():
|
||||
iface = dict()
|
||||
iface['name'] = str(NIC.name)
|
||||
|
|
@ -1083,17 +1084,17 @@ class RHEV(object):
|
|||
bootselect = True
|
||||
|
||||
for disk in disks:
|
||||
diskname = name + "_Disk" + str(counter) + "_" + disk.get('name', '').replace('/', '_')
|
||||
disksize = disk.get('size', 1)
|
||||
diskdomain = disk.get('domain', None)
|
||||
diskname = name + "_Disk" + str(counter) + "_" + disk.get('name', '').replace('/', '_')
|
||||
disksize = disk.get('size', 1)
|
||||
diskdomain = disk.get('domain', None)
|
||||
if diskdomain is None:
|
||||
setMsg("`domain` is a required disk key.")
|
||||
setFailed()
|
||||
return False
|
||||
diskinterface = disk.get('interface', 'virtio')
|
||||
diskformat = disk.get('format', 'raw')
|
||||
diskinterface = disk.get('interface', 'virtio')
|
||||
diskformat = disk.get('format', 'raw')
|
||||
diskallocationtype = disk.get('thin', False)
|
||||
diskboot = disk.get('bootable', False)
|
||||
diskboot = disk.get('bootable', False)
|
||||
|
||||
if bootselect is False and counter == 0:
|
||||
diskboot = True
|
||||
|
|
@ -1175,7 +1176,7 @@ class RHEV(object):
|
|||
def setBootOrder(self, vmname, boot_order):
|
||||
self.__get_conn()
|
||||
VM = self.conn.get_VM(vmname)
|
||||
bootorder = []
|
||||
bootorder = []
|
||||
for boot_dev in VM.os.get_boot():
|
||||
bootorder.append(str(boot_dev.dev))
|
||||
|
||||
|
|
@ -1469,31 +1470,31 @@ def core(module):
|
|||
def main():
|
||||
global module
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
state = dict(default='present', choices=['ping', 'present', 'absent', 'up', 'down', 'restarted', 'cd', 'info']),
|
||||
user = dict(default="admin@internal"),
|
||||
password = dict(required=True, no_log=True),
|
||||
server = dict(default="127.0.0.1"),
|
||||
port = dict(default="443"),
|
||||
insecure_api = dict(default=False, type='bool'),
|
||||
name = dict(),
|
||||
image = dict(default=False),
|
||||
datacenter = dict(default="Default"),
|
||||
type = dict(default="server", choices=['server', 'desktop', 'host']),
|
||||
cluster = dict(default=''),
|
||||
vmhost = dict(default=False),
|
||||
vmcpu = dict(default="2"),
|
||||
vmmem = dict(default="1"),
|
||||
disks = dict(),
|
||||
osver = dict(default="rhel_6x64"),
|
||||
ifaces = dict(aliases=['nics', 'interfaces']),
|
||||
timeout = dict(default=False),
|
||||
mempol = dict(default="1"),
|
||||
vm_ha = dict(default=True),
|
||||
cpu_share = dict(default="0"),
|
||||
boot_order = dict(default=["network", "hd"]),
|
||||
del_prot = dict(default=True, type="bool"),
|
||||
cd_drive = dict(default=False)
|
||||
argument_spec=dict(
|
||||
state=dict(default='present', choices=['ping', 'present', 'absent', 'up', 'down', 'restarted', 'cd', 'info']),
|
||||
user=dict(default="admin@internal"),
|
||||
password=dict(required=True, no_log=True),
|
||||
server=dict(default="127.0.0.1"),
|
||||
port=dict(default="443"),
|
||||
insecure_api=dict(default=False, type='bool'),
|
||||
name=dict(),
|
||||
image=dict(default=False),
|
||||
datacenter=dict(default="Default"),
|
||||
type=dict(default="server", choices=['server', 'desktop', 'host']),
|
||||
cluster=dict(default=''),
|
||||
vmhost=dict(default=False),
|
||||
vmcpu=dict(default="2"),
|
||||
vmmem=dict(default="1"),
|
||||
disks=dict(),
|
||||
osver=dict(default="rhel_6x64"),
|
||||
ifaces=dict(aliases=['nics', 'interfaces']),
|
||||
timeout=dict(default=False),
|
||||
mempol=dict(default="1"),
|
||||
vm_ha=dict(default=True),
|
||||
cpu_share=dict(default="0"),
|
||||
boot_order=dict(default=["network", "hd"]),
|
||||
del_prot=dict(default=True, type="bool"),
|
||||
cd_drive=dict(default=False)
|
||||
),
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue