remove commented code and fixed formatting
This commit is contained in:
Davis Phillips
Matt Clay
parent
995cc2cd2d
commit
ebdd9cf1a5
1 changed files with 77 additions and 83 deletions
|
|
@ -724,105 +724,99 @@ class PyVmomiHelper(object):
|
||||||
int(self.params['hardware']['memory_mb'])
|
int(self.params['hardware']['memory_mb'])
|
||||||
|
|
||||||
# lets try and assign a static ip addresss
|
# lets try and assign a static ip addresss
|
||||||
if 'customize' in self.params:
|
if self.params['customize'] is True:
|
||||||
ip_settings = list()
|
ip_settings = list()
|
||||||
|
if self.params['ips'] and self.params['network']:
|
||||||
for ip_string in self.params['ips']:
|
for ip_string in self.params['ips']:
|
||||||
ip = IPAddress(self.params['ips'])
|
ip = IPAddress(self.params['ips'])
|
||||||
|
for network in self.params['networks']:
|
||||||
|
if ip in IPNetwork(network):
|
||||||
|
self.params['networks'][network]['ip'] = str(ip)
|
||||||
|
ipnet = IPNetwork(network)
|
||||||
|
self.params['networks'][network]['subnet_mask'] = str(
|
||||||
|
ipnet.netmask
|
||||||
|
)
|
||||||
|
ip_settings.append(self.params['networks'][network])
|
||||||
|
|
||||||
for network in self.params['networks']:
|
key = 0
|
||||||
|
network = get_obj(self.content, [vim.Network], ip_settings[key]['network'])
|
||||||
|
datacenter = get_obj(self.content, [vim.Datacenter], self.params['datacenter'])
|
||||||
|
# get the folder where VMs are kept for this datacenter
|
||||||
|
destfolder = datacenter.vmFolder
|
||||||
|
|
||||||
if ip in IPNetwork(network):
|
cluster = get_obj(self.content, [vim.ClusterComputeResource],self.params['cluster'])
|
||||||
self.params['networks'][network]['ip'] = str(ip)
|
|
||||||
ipnet = IPNetwork(network)
|
|
||||||
self.params['networks'][network]['subnet_mask'] = str(
|
|
||||||
ipnet.netmask
|
|
||||||
)
|
|
||||||
ip_settings.append(self.params['networks'][network])
|
|
||||||
|
|
||||||
|
devices = []
|
||||||
|
adaptermaps = []
|
||||||
|
|
||||||
network = get_obj(self.content, [vim.Network], ip_settings[0]['network'])
|
try:
|
||||||
datacenter = get_obj(self.content, [vim.Datacenter], self.params['datacenter'])
|
for device in template.config.hardware.device:
|
||||||
# get the folder where VMs are kept for this datacenter
|
if hasattr(device, 'addressType'):
|
||||||
destfolder = datacenter.vmFolder
|
nic = vim.vm.device.VirtualDeviceSpec()
|
||||||
|
nic.operation = vim.vm.device.VirtualDeviceSpec.Operation.remove
|
||||||
|
nic.device = device
|
||||||
|
devices.append(nic)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
cluster = get_obj(self.content, [vim.ClusterComputeResource],self.params['cluster'])
|
# single device support
|
||||||
|
nic = vim.vm.device.VirtualDeviceSpec()
|
||||||
|
nic.operation = vim.vm.device.VirtualDeviceSpec.Operation.add
|
||||||
|
nic.device = vim.vm.device.VirtualVmxnet3()
|
||||||
|
nic.device.wakeOnLanEnabled = True
|
||||||
|
nic.device.addressType = 'assigned'
|
||||||
|
nic.device.deviceInfo = vim.Description()
|
||||||
|
nic.device.deviceInfo.label = 'Network Adapter %s' % (key + 1)
|
||||||
|
|
||||||
|
nic.device.deviceInfo.summary = ip_settings[key]['network']
|
||||||
|
nic.device.backing = vim.vm.device.VirtualEthernetCard.NetworkBackingInfo()
|
||||||
|
nic.device.backing.network = get_obj(self.content, [vim.Network], ip_settings[key]['network'])
|
||||||
|
|
||||||
devices = []
|
nic.device.backing.deviceName = ip_settings[key]['network']
|
||||||
adaptermaps = []
|
nic.device.connectable = vim.vm.device.VirtualDevice.ConnectInfo()
|
||||||
|
nic.device.connectable.startConnected = True
|
||||||
|
nic.device.connectable.allowGuestControl = True
|
||||||
|
devices.append(nic)
|
||||||
|
|
||||||
|
# Update the spec with the added NIC
|
||||||
|
clonespec_kwargs['config'].deviceChange = devices
|
||||||
|
|
||||||
try:
|
guest_map = vim.vm.customization.AdapterMapping()
|
||||||
for device in template.config.hardware.device:
|
guest_map.adapter = vim.vm.customization.IPSettings()
|
||||||
|
guest_map.adapter.ip = vim.vm.customization.FixedIp()
|
||||||
|
guest_map.adapter.ip.ipAddress = str(ip_settings[key]['ip'])
|
||||||
|
guest_map.adapter.subnetMask = str(ip_settings[key]['subnet_mask'])
|
||||||
|
|
||||||
if hasattr(device, 'addressType'):
|
try:
|
||||||
nic = vim.vm.device.VirtualDeviceSpec()
|
guest_map.adapter.gateway = ip_settings[key]['gateway']
|
||||||
nic.operation = \
|
except:
|
||||||
vim.vm.device.VirtualDeviceSpec.Operation.remove
|
pass
|
||||||
nic.device = device
|
|
||||||
devices.append(nic)
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# for key, ip in enumerate(ip_settings):
|
try:
|
||||||
# VM device
|
guest_map.adapter.dnsDomain = self.params['domain']
|
||||||
# single device support
|
except:
|
||||||
key = 0
|
pass
|
||||||
nic = vim.vm.device.VirtualDeviceSpec()
|
|
||||||
nic.operation = vim.vm.device.VirtualDeviceSpec.Operation.add
|
|
||||||
nic.device = vim.vm.device.VirtualVmxnet3()
|
|
||||||
nic.device.wakeOnLanEnabled = True
|
|
||||||
nic.device.addressType = 'assigned'
|
|
||||||
nic.device.deviceInfo = vim.Description()
|
|
||||||
nic.device.deviceInfo.label = 'Network Adapter %s' % (key + 1)
|
|
||||||
|
|
||||||
nic.device.deviceInfo.summary = ip_settings[key]['network']
|
adaptermaps.append(guest_map)
|
||||||
nic.device.backing = vim.vm.device.VirtualEthernetCard.NetworkBackingInfo()
|
|
||||||
nic.device.backing.network = get_obj(self.content, [vim.Network], ip_settings[key]['network'])
|
|
||||||
|
|
||||||
nic.device.backing.deviceName = ip_settings[key]['network']
|
# DNS settings
|
||||||
nic.device.connectable = vim.vm.device.VirtualDevice.ConnectInfo()
|
globalip = vim.vm.customization.GlobalIPSettings()
|
||||||
nic.device.connectable.startConnected = True
|
globalip.dnsServerList = self.params['dns_servers']
|
||||||
nic.device.connectable.allowGuestControl = True
|
globalip.dnsSuffixList = str(self.params['domain'])
|
||||||
devices.append(nic)
|
|
||||||
|
|
||||||
clonespec_kwargs['config'].deviceChange = devices
|
# Hostname settings
|
||||||
|
ident = vim.vm.customization.LinuxPrep()
|
||||||
|
ident.domain = str(self.params['domain'])
|
||||||
|
ident.hostName = vim.vm.customization.FixedName()
|
||||||
|
ident.hostName.name = self.params['name']
|
||||||
|
|
||||||
guest_map = vim.vm.customization.AdapterMapping()
|
customspec = vim.vm.customization.Specification()
|
||||||
guest_map.adapter = vim.vm.customization.IPSettings()
|
customspec.nicSettingMap = adaptermaps
|
||||||
guest_map.adapter.ip = vim.vm.customization.FixedIp()
|
customspec.globalIPSettings = globalip
|
||||||
guest_map.adapter.ip.ipAddress = str(ip_settings[key]['ip'])
|
customspec.identity = ident
|
||||||
guest_map.adapter.subnetMask = str(ip_settings[key]['subnet_mask'])
|
|
||||||
|
|
||||||
try:
|
clonespec = vim.vm.CloneSpec(**clonespec_kwargs)
|
||||||
guest_map.adapter.gateway = ip_settings[key]['gateway']
|
clonespec.customization = customspec
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
try:
|
|
||||||
guest_map.adapter.dnsDomain = self.params['domain']
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
adaptermaps.append(guest_map)
|
|
||||||
|
|
||||||
# DNS settings
|
|
||||||
globalip = vim.vm.customization.GlobalIPSettings()
|
|
||||||
globalip.dnsServerList = self.params['dns_servers']
|
|
||||||
globalip.dnsSuffixList = str(self.params['domain'])
|
|
||||||
|
|
||||||
# Hostname settings
|
|
||||||
ident = vim.vm.customization.LinuxPrep()
|
|
||||||
ident.domain = str(self.params['domain'])
|
|
||||||
ident.hostName = vim.vm.customization.FixedName()
|
|
||||||
ident.hostName.name = self.params['name']
|
|
||||||
|
|
||||||
customspec = vim.vm.customization.Specification()
|
|
||||||
customspec.nicSettingMap = adaptermaps
|
|
||||||
customspec.globalIPSettings = globalip
|
|
||||||
customspec.identity = ident
|
|
||||||
|
|
||||||
clonespec = vim.vm.CloneSpec(**clonespec_kwargs)
|
|
||||||
clonespec.customization = customspec
|
|
||||||
|
|
||||||
clonespec = vim.vm.CloneSpec(**clonespec_kwargs)
|
clonespec = vim.vm.CloneSpec(**clonespec_kwargs)
|
||||||
task = template.Clone(folder=destfolder, name=self.params['name'], spec=clonespec)
|
task = template.Clone(folder=destfolder, name=self.params['name'], spec=clonespec)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue