iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependency to govmomi 0.17

This commit is contained in:
Michael Kuzmin 2018-05-12 14:19:17 +03:00
parent 6d77fea25e
commit 903febc4ea
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Gopkg.lock generated
View File

@ -194,6 +194,7 @@
".", ".",
"find", "find",
"list", "list",
"nfc",
"object", "object",
"property", "property",
"session", "session",
@ -207,8 +208,8 @@
"vim25/types", "vim25/types",
"vim25/xml" "vim25/xml"
] ]
revision = "b63044e5f833781eb7b305bc035392480ee06a82" revision = "123ed177021588bac57b5c87c1a84270ddf2eca8"
version = "v0.15.0" version = "v0.17.1"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -270,6 +271,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "adae0b19fa6fd48440ded469329ce77fcaf433c61f699d2405d87ad75650f551" inputs-digest = "4e43d31e08e37dfb7449ddb1cc361b739f2b65e95d3e560d4e31d40fbabab044"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

2
Gopkg.toml
View File

@ -4,7 +4,7 @@
[[constraint]] [[constraint]]
name = "github.com/vmware/govmomi" name = "github.com/vmware/govmomi"
version = "=0.15.0" version = "~0.17"
[[override]] [[override]]
name = "github.com/masterzen/azure-sdk-for-go" name = "github.com/masterzen/azure-sdk-for-go"

6
clone/builder_acc_test.go
View File

@ -348,12 +348,12 @@ func checkHardware(t *testing.T) builderT.TestCheckFunc {
t.Errorf("VM should have 2 CPU sockets, got %v", cpuSockets) t.Errorf("VM should have 2 CPU sockets, got %v", cpuSockets)
} }
cpuReservation := vmInfo.Config.CpuAllocation.GetResourceAllocationInfo().Reservation cpuReservation := *vmInfo.Config.CpuAllocation.Reservation
if cpuReservation != 1000 { if cpuReservation != 1000 {
t.Errorf("VM should have CPU reservation for 1000 Mhz, got %v", cpuReservation) t.Errorf("VM should have CPU reservation for 1000 Mhz, got %v", cpuReservation)
} }
cpuLimit := vmInfo.Config.CpuAllocation.GetResourceAllocationInfo().Limit cpuLimit := *vmInfo.Config.CpuAllocation.Limit
if cpuLimit != 1500 { if cpuLimit != 1500 {
t.Errorf("VM should have CPU reservation for 1500 Mhz, got %v", cpuLimit) t.Errorf("VM should have CPU reservation for 1500 Mhz, got %v", cpuLimit)
} }
@ -363,7 +363,7 @@ func checkHardware(t *testing.T) builderT.TestCheckFunc {
t.Errorf("VM should have 2048 MB of RAM, got %v", ram) t.Errorf("VM should have 2048 MB of RAM, got %v", ram)
} }
ramReservation := vmInfo.Config.MemoryAllocation.GetResourceAllocationInfo().Reservation ramReservation := *vmInfo.Config.MemoryAllocation.Reservation
if ramReservation != 1024 { if ramReservation != 1024 {
t.Errorf("VM should have RAM reservation for 1024 MB, got %v", ramReservation) t.Errorf("VM should have RAM reservation for 1024 MB, got %v", ramReservation)
} }

6
driver/vm.go
View File

@ -248,12 +248,12 @@ func (vm *VirtualMachine) Configure(config *HardwareConfig) error {
confSpec.MemoryMB = config.RAM confSpec.MemoryMB = config.RAM
var cpuSpec types.ResourceAllocationInfo var cpuSpec types.ResourceAllocationInfo
cpuSpec.Reservation = config.CPUReservation cpuSpec.Reservation = &config.CPUReservation
cpuSpec.Limit = config.CPULimit cpuSpec.Limit = &config.CPULimit
confSpec.CpuAllocation = &cpuSpec confSpec.CpuAllocation = &cpuSpec
var ramSpec types.ResourceAllocationInfo var ramSpec types.ResourceAllocationInfo
ramSpec.Reservation = config.RAMReservation ramSpec.Reservation = &config.RAMReservation
confSpec.MemoryAllocation = &ramSpec confSpec.MemoryAllocation = &ramSpec
confSpec.MemoryReservationLockedToMax = &config.RAMReserveAll confSpec.MemoryReservationLockedToMax = &config.RAMReserveAll

6
driver/vm_clone_acc_test.go
View File

@ -134,12 +134,12 @@ func configureCheck(t *testing.T, vm *VirtualMachine, _ *CloneConfig) {
t.Errorf("VM should have %v CPU sockets, got %v", hwConfig.CPUs, cpuSockets) t.Errorf("VM should have %v CPU sockets, got %v", hwConfig.CPUs, cpuSockets)
} }
cpuReservation := vmInfo.Config.CpuAllocation.GetResourceAllocationInfo().Reservation cpuReservation := *vmInfo.Config.CpuAllocation.Reservation
if cpuReservation != hwConfig.CPUReservation { if cpuReservation != hwConfig.CPUReservation {
t.Errorf("VM should have CPU reservation for %v Mhz, got %v", hwConfig.CPUReservation, cpuReservation) t.Errorf("VM should have CPU reservation for %v Mhz, got %v", hwConfig.CPUReservation, cpuReservation)
} }
cpuLimit := vmInfo.Config.CpuAllocation.GetResourceAllocationInfo().Limit cpuLimit := *vmInfo.Config.CpuAllocation.Limit
if cpuLimit != hwConfig.CPULimit { if cpuLimit != hwConfig.CPULimit {
t.Errorf("VM should have CPU reservation for %v Mhz, got %v", hwConfig.CPULimit, cpuLimit) t.Errorf("VM should have CPU reservation for %v Mhz, got %v", hwConfig.CPULimit, cpuLimit)
} }
@ -149,7 +149,7 @@ func configureCheck(t *testing.T, vm *VirtualMachine, _ *CloneConfig) {
t.Errorf("VM should have %v MB of RAM, got %v", hwConfig.RAM, ram) t.Errorf("VM should have %v MB of RAM, got %v", hwConfig.RAM, ram)
} }
ramReservation := vmInfo.Config.MemoryAllocation.GetResourceAllocationInfo().Reservation ramReservation := *vmInfo.Config.MemoryAllocation.Reservation
if ramReservation != hwConfig.RAMReservation { if ramReservation != hwConfig.RAMReservation {
t.Errorf("VM should have RAM reservation for %v MB, got %v", hwConfig.RAMReservation, ramReservation) t.Errorf("VM should have RAM reservation for %v MB, got %v", hwConfig.RAMReservation, ramReservation)
} }

6
iso/builder_acc_test.go
View File

@ -130,12 +130,12 @@ func checkHardware(t *testing.T) builderT.TestCheckFunc {
t.Errorf("VM should have 2 CPU sockets, got %v", cpuSockets) t.Errorf("VM should have 2 CPU sockets, got %v", cpuSockets)
} }
cpuReservation := vmInfo.Config.CpuAllocation.GetResourceAllocationInfo().Reservation cpuReservation := *vmInfo.Config.CpuAllocation.Reservation
if cpuReservation != 1000 { if cpuReservation != 1000 {
t.Errorf("VM should have CPU reservation for 1000 Mhz, got %v", cpuReservation) t.Errorf("VM should have CPU reservation for 1000 Mhz, got %v", cpuReservation)
} }
cpuLimit := vmInfo.Config.CpuAllocation.GetResourceAllocationInfo().Limit cpuLimit := *vmInfo.Config.CpuAllocation.Limit
if cpuLimit != 1500 { if cpuLimit != 1500 {
t.Errorf("VM should have CPU reservation for 1500 Mhz, got %v", cpuLimit) t.Errorf("VM should have CPU reservation for 1500 Mhz, got %v", cpuLimit)
} }
@ -145,7 +145,7 @@ func checkHardware(t *testing.T) builderT.TestCheckFunc {
t.Errorf("VM should have 2048 MB of RAM, got %v", ram) t.Errorf("VM should have 2048 MB of RAM, got %v", ram)
} }
ramReservation := vmInfo.Config.MemoryAllocation.GetResourceAllocationInfo().Reservation ramReservation := *vmInfo.Config.MemoryAllocation.Reservation
if ramReservation != 1024 { if ramReservation != 1024 {
t.Errorf("VM should have RAM reservation for 1024 MB, got %v", ramReservation) t.Errorf("VM should have RAM reservation for 1024 MB, got %v", ramReservation)
} }