cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix tabs

Browse source
This commit is contained in:
James Tanner 2016-08-01 22:47:26 -04:00
parent 5d2d0e0045
commit a3f415a892
1 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
cloud/vmware/vmware_guest_state.py
View file

@ -263,28 +263,25 @@ class PyVmomiHelper(object):
def set_powerstate(self, vm, state, force): def set_powerstate(self, vm, state, force):
""" """
Set the power status for a VM determined by the current and Set the power status for a VM determined by the current and
requested states. force is forceful requested states. force is forceful
""" """
facts = self.gather_facts(vm) facts = self.gather_facts(vm)
expected_state = state.replace('_', '').lower() expected_state = state.replace('_', '').lower()
current_state = facts['hw_power_status'].lower() current_state = facts['hw_power_status'].lower()
result = {} result = {}
# Need Force # Need Force
if not force and current_state not in ['poweredon', 'poweredoff']: if not force and current_state not in ['poweredon', 'poweredoff']:
return "VM is in %s power state. Force is required!" % current_state return "VM is in %s power state. Force is required!" % current_state
# State is already true # State is already true
if current_state == expected_state: if current_state == expected_state:
result['changed'] = False result['changed'] = False
result['failed'] = False result['failed'] = False
else:
else:
task = None task = None
try: try:
if expected_state == 'poweredoff': if expected_state == 'poweredoff':
task = vm.PowerOff() task = vm.PowerOff()
@ -341,9 +338,6 @@ class PyVmomiHelper(object):
mac = device.macAddress mac = device.macAddress
ips = list(device.ipAddress) ips = list(device.ipAddress)
netDict[mac] = ips netDict[mac] = ips
#facts['network'] = {}
#facts['network']['ipaddress_v4'] = None
#facts['network']['ipaddress_v6'] = None
for k,v in netDict.iteritems(): for k,v in netDict.iteritems():
for ipaddress in v: for ipaddress in v:
if ipaddress: if ipaddress:
@ -352,23 +346,21 @@ class PyVmomiHelper(object):
else: else:
facts['ipv4'] = ipaddress facts['ipv4'] = ipaddress
for idx,entry in enumerate(vm.config.hardware.device): for idx,entry in enumerate(vm.config.hardware.device):
if not hasattr(entry, 'macAddress'):
continue
if not hasattr(entry, 'macAddress'): factname = 'hw_eth' + str(idx)
continue facts[factname] = {
'addresstype': entry.addressType,
'label': entry.deviceInfo.label,
'macaddress': entry.macAddress,
'ipaddresses': netDict.get(entry.macAddress, None),
'macaddress_dash': entry.macAddress.replace(':', '-'),
'summary': entry.deviceInfo.summary,
}
facts['hw_interfaces'].append('eth'+str(idx))
factname = 'hw_eth' + str(idx)
facts[factname] = {
'addresstype': entry.addressType,
'label': entry.deviceInfo.label,
'macaddress': entry.macAddress,
'ipaddresses': netDict.get(entry.macAddress, None),
'macaddress_dash': entry.macAddress.replace(':', '-'),
'summary': entry.deviceInfo.summary,
}
facts['hw_interfaces'].append('eth'+str(idx))
#import epdb; epdb.st()
return facts return facts