djpbessems/Go.NPP-Prepper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert OvfTransport changes;Add vApp enabled check
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Danny Bessems 2023-03-03 10:23:23 +01:00
parent aa2224db43
commit 7ccc722aa5
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@ -3,7 +3,7 @@ type: kubernetes
name: 'Golang Build'
environment:
BINARY_VERSION: v0.5.2
BINARY_VERSION: v0.5.1
clone:
disable: true

10
cmd/npp-prepper/main.go
View File

@ -28,10 +28,9 @@ var Commands struct {
Force bool `short:"f" long:"force"`
} // `command:"datacenter" alias:"dc" description:"Define a Network Protocol Profile within a datacenter"`
VirtualMachine struct {
Name string `short:"n" long:"name" description:"Name of virtual machine" required:"true"`
Datacenter string `long:"datacenter" description:"Name of datacenter" required:"true"`
Network string `long:"portgroup" description:"Name of network portgroup" required:"true"`
DisableOvfTransport bool `long:"disableovftransport" description:"Disable the OVF transport 'VMware Tools'"`
Name string `short:"n" long:"name" description:"Name of virtual machine" required:"true"`
Datacenter string `long:"datacenter" description:"Name of datacenter" required:"true"`
Network string `long:"portgroup" description:"Name of network portgroup" required:"true"`
} // `command:"virtualmachine" alias:"vm" description:"Configure a virtual machine for usage of Network Protocol Profiles"`
GuestOS struct {
} // `command:"guestos" alias:"os" description:"Configure guest OS network with allocated IP address"`
@ -45,7 +44,6 @@ func main() {
parser.AddCommand("vm", "", "", &Commands.VirtualMachine)
parser.AddCommand("guestos", "Configure guest OS network with allocated IP address", "", &Commands.GuestOS)
parser.AddCommand("os", "", "", &Commands.GuestOS)
_, err := parser.Parse()
if err != nil {
if flagsErr, ok := err.(*flags.Error); ok && flagsErr.Type == flags.ErrHelp {
@ -73,7 +71,7 @@ func main() {
case "guestos", "os":
// TODO
case "virtualmachine", "vm":
if err := hypervisor.SetVirtualMachineProperties(ctx, clt, Commands.VirtualMachine.Datacenter, Commands.VirtualMachine.Name, Commands.VirtualMachine.Network, Commands.VirtualMachine.DisableOvfTransport); err != nil {
if err := hypervisor.SetVirtualMachineProperties(ctx, clt, Commands.VirtualMachine.Datacenter, Commands.VirtualMachine.Name, Commands.VirtualMachine.Network); err != nil {
log.Fatalf("[ERROR] Could not apply vApp properties: %s", err)
}

50
pkg/hypervisor/virtualmachine.go
View File

@ -16,7 +16,7 @@ type vAPPProperty struct {
Value string
}
func SetVirtualMachineProperties(ctx context.Context, clt *vim25.Client, datacenter, virtualmachine, network string, disableovftransport bool) error {
func SetVirtualMachineProperties(ctx context.Context, clt *vim25.Client, datacenter, virtualmachine, network string) error {
finder := find.NewFinder(clt, true)
dc, err := finder.Datacenter(ctx, datacenter)
@ -36,31 +36,31 @@ func SetVirtualMachineProperties(ctx context.Context, clt *vim25.Client, datacen
vappconfig := &types.VmConfigSpec{
OvfEnvironmentTransport: []string{"com.vmware.guestInfo"},
}
if disableovftransport == true {
vappconfig = &types.VmConfigSpec{}
}
currentvappproperties := moref.Config.VAppConfig.GetVmConfigInfo().Property
for _, vappproperty := range currentvappproperties {
vappconfig.Property = append(vappconfig.Property, types.VAppPropertySpec{
ArrayUpdateSpec: types.ArrayUpdateSpec{
Operation: types.ArrayUpdateOperationAdd,
},
Info: &types.VAppPropertyInfo{
Key: vappproperty.Key,
ClassId: vappproperty.ClassId,
InstanceId: vappproperty.InstanceId,
Id: vappproperty.Id,
Category: vappproperty.Category,
Label: vappproperty.Label,
Type: vappproperty.Type,
TypeReference: vappproperty.TypeReference,
UserConfigurable: vappproperty.UserConfigurable,
DefaultValue: vappproperty.DefaultValue,
Value: vappproperty.Value,
Description: vappproperty.Description,
},
})
currentvappproperties := []types.VAppPropertyInfo{}
if moref.Config != nil {
currentvappproperties = moref.Config.VAppConfig.GetVmConfigInfo().Property
for _, vappproperty := range currentvappproperties {
vappconfig.Property = append(vappconfig.Property, types.VAppPropertySpec{
ArrayUpdateSpec: types.ArrayUpdateSpec{
Operation: types.ArrayUpdateOperationAdd,
},
Info: &types.VAppPropertyInfo{
Key: vappproperty.Key,
ClassId: vappproperty.ClassId,
InstanceId: vappproperty.InstanceId,
Id: vappproperty.Id,
Category: vappproperty.Category,
Label: vappproperty.Label,
Type: vappproperty.Type,
TypeReference: vappproperty.TypeReference,
UserConfigurable: vappproperty.UserConfigurable,
DefaultValue: vappproperty.DefaultValue,
Value: vappproperty.Value,
Description: vappproperty.Description,
},
})
}
}
newvappproperties := []vAPPProperty{