saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #26137 from steverweber/vmware_macaddress_fix

Browse source 
use device mac address if vmtools not active
This commit is contained in:
Thomas S Hatch 2015-08-08 21:05:36 -06:00
commit 474a250414
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/cloud/clouds/vmware.py
View file

@ -946,7 +946,7 @@ def _format_instance_info_select(vm, selection):
def _format_instance_info(vm):
device_full_info = {}
device_mac_addresses = []
if "config.hardware.device" in vm:
for device in vm["config.hardware.device"]:
device_full_info[device.deviceInfo.label] = {
@ -957,9 +957,12 @@ def _format_instance_info(vm):
'unitNumber': device.unitNumber
}
if hasattr(device.backing, 'network'):
if hasattr(device, 'addressType'):
device_full_info[device.deviceInfo.label]['addressType'] = device.addressType
if hasattr(device, 'macAddress'):
device_full_info[device.deviceInfo.label]['macAddress'] = device.macAddress
device_mac_addresses.append(device.macAddress)
if hasattr(device, 'busNumber'):
device_full_info[device.deviceInfo.label]['busNumber'] = device.busNumber
@ -1004,6 +1007,9 @@ def _format_instance_info(vm):
ip_addresses.extend(net.ipAddress)
mac_addresses.append(net.macAddress)
if len(mac_addresses) == 0:
mac_addresses = device_mac_addresses
cpu = vm["config.hardware.numCPU"] if "config.hardware.numCPU" in vm else "N/A"
ram = "{0} MB".format(vm["config.hardware.memoryMB"]) if "config.hardware.memoryMB" in vm else "N/A"
vm_full_info = {