ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4012 from rakutentech/rename-function 

provider/vsphere: Rename create* functions
This commit is contained in:
James Nugent 2015-11-22 11:34:42 +02:00
parent cf87ede5dd cb84b98ce4
commit 774ed1ded8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
builtin/providers/vsphere/resource_vsphere_virtual_machine.go
View File

@ -563,8 +563,8 @@ func addHardDisk(vm *object.VirtualMachine, size, iops int64, diskType string) e
} }
} }
// createNetworkDevice creates VirtualDeviceConfigSpec for Network Device. // buildNetworkDevice builds VirtualDeviceConfigSpec for Network Device.
func createNetworkDevice(f *find.Finder, label, adapterType string) (*types.VirtualDeviceConfigSpec, error) { func buildNetworkDevice(f *find.Finder, label, adapterType string) (*types.VirtualDeviceConfigSpec, error) {
network, err := f.Network(context.TODO(), "*"+label) network, err := f.Network(context.TODO(), "*"+label)
if err != nil { if err != nil {
return nil, err return nil, err
@ -608,8 +608,8 @@ func createNetworkDevice(f *find.Finder, label, adapterType string) (*types.Virt
} }
} }
// createVMRelocateSpec creates VirtualMachineRelocateSpec to set a place for a new VirtualMachine. // buildVMRelocateSpec builds VirtualMachineRelocateSpec to set a place for a new VirtualMachine.
func createVMRelocateSpec(rp *object.ResourcePool, ds *object.Datastore, vm *object.VirtualMachine) (types.VirtualMachineRelocateSpec, error) { func buildVMRelocateSpec(rp *object.ResourcePool, ds *object.Datastore, vm *object.VirtualMachine) (types.VirtualMachineRelocateSpec, error) {
var key int var key int
devices, err := vm.Device(context.TODO()) devices, err := vm.Device(context.TODO())
@ -655,8 +655,8 @@ func getDatastoreObject(client *govmomi.Client, f *object.DatacenterFolders, nam
return ref.Reference(), nil return ref.Reference(), nil
} }
// createStoragePlacementSpecCreate creates StoragePlacementSpec for create action. // buildStoragePlacementSpecCreate builds StoragePlacementSpec for create action.
func createStoragePlacementSpecCreate(f *object.DatacenterFolders, rp *object.ResourcePool, storagePod object.StoragePod, configSpec types.VirtualMachineConfigSpec) types.StoragePlacementSpec { func buildStoragePlacementSpecCreate(f *object.DatacenterFolders, rp *object.ResourcePool, storagePod object.StoragePod, configSpec types.VirtualMachineConfigSpec) types.StoragePlacementSpec {
vmfr := f.VmFolder.Reference() vmfr := f.VmFolder.Reference()
rpr := rp.Reference() rpr := rp.Reference()
spr := storagePod.Reference() spr := storagePod.Reference()
@ -674,8 +674,8 @@ func createStoragePlacementSpecCreate(f *object.DatacenterFolders, rp *object.Re
return sps return sps
} }
// createStoragePlacementSpecClone creates StoragePlacementSpec for clone action. // buildStoragePlacementSpecClone builds StoragePlacementSpec for clone action.
func createStoragePlacementSpecClone(c *govmomi.Client, f *object.DatacenterFolders, vm *object.VirtualMachine, rp *object.ResourcePool, storagePod object.StoragePod) types.StoragePlacementSpec { func buildStoragePlacementSpecClone(c *govmomi.Client, f *object.DatacenterFolders, vm *object.VirtualMachine, rp *object.ResourcePool, storagePod object.StoragePod) types.StoragePlacementSpec {
vmr := vm.Reference() vmr := vm.Reference()
vmfr := f.VmFolder.Reference() vmfr := f.VmFolder.Reference()
rpr := rp.Reference() rpr := rp.Reference()
@ -784,7 +784,7 @@ func (vm *virtualMachine) createVirtualMachine(c *govmomi.Client) error {
networkDevices := []types.BaseVirtualDeviceConfigSpec{} networkDevices := []types.BaseVirtualDeviceConfigSpec{}
for _, network := range vm.networkInterfaces { for _, network := range vm.networkInterfaces {
// network device // network device
nd, err := createNetworkDevice(finder, network.label, "e1000") nd, err := buildNetworkDevice(finder, network.label, "e1000")
if err != nil { if err != nil {
return err return err
} }
@ -821,7 +821,7 @@ func (vm *virtualMachine) createVirtualMachine(c *govmomi.Client) error {
sp := object.StoragePod{ sp := object.StoragePod{
object.NewFolder(c.Client, d), object.NewFolder(c.Client, d),
} }
sps := createStoragePlacementSpecCreate(dcFolders, resourcePool, sp, configSpec) sps := buildStoragePlacementSpecCreate(dcFolders, resourcePool, sp, configSpec)
datastore, err = findDatastore(c, sps) datastore, err = findDatastore(c, sps)
if err != nil { if err != nil {
return err return err
@ -938,7 +938,7 @@ func (vm *virtualMachine) deployVirtualMachine(c *govmomi.Client) error {
sp := object.StoragePod{ sp := object.StoragePod{
object.NewFolder(c.Client, d), object.NewFolder(c.Client, d),
} }
sps := createStoragePlacementSpecClone(c, dcFolders, template, resourcePool, sp) sps := buildStoragePlacementSpecClone(c, dcFolders, template, resourcePool, sp)
datastore, err = findDatastore(c, sps) datastore, err = findDatastore(c, sps)
if err != nil { if err != nil {
return err return err
@ -950,7 +950,7 @@ func (vm *virtualMachine) deployVirtualMachine(c *govmomi.Client) error {
} }
log.Printf("[DEBUG] datastore: %#v", datastore) log.Printf("[DEBUG] datastore: %#v", datastore)
relocateSpec, err := createVMRelocateSpec(resourcePool, datastore, template) relocateSpec, err := buildVMRelocateSpec(resourcePool, datastore, template)
if err != nil { if err != nil {
return err return err
} }
@ -961,7 +961,7 @@ func (vm *virtualMachine) deployVirtualMachine(c *govmomi.Client) error {
networkConfigs := []types.CustomizationAdapterMapping{} networkConfigs := []types.CustomizationAdapterMapping{}
for _, network := range vm.networkInterfaces { for _, network := range vm.networkInterfaces {
// network device // network device
nd, err := createNetworkDevice(finder, network.label, "vmxnet3") nd, err := buildNetworkDevice(finder, network.label, "vmxnet3")
if err != nil { if err != nil {
return err return err
} }
@ -1003,7 +1003,7 @@ func (vm *virtualMachine) deployVirtualMachine(c *govmomi.Client) error {
} }
log.Printf("[DEBUG] virtual machine config spec: %v", configSpec) log.Printf("[DEBUG] virtual machine config spec: %v", configSpec)
// create CustomizationSpec // build CustomizationSpec
customSpec := types.CustomizationSpec{ customSpec := types.CustomizationSpec{
Identity: &types.CustomizationLinuxPrep{ Identity: &types.CustomizationLinuxPrep{
HostName: &types.CustomizationFixedName{ HostName: &types.CustomizationFixedName{