vcsim: allow VM PowerOff when Host is in maintenance mode

e67b1b1 prevented all VM power ops when host is in MM, we should only prevent PowerOn. Issue #2633
vmware · Oct 20, 2021 · 6de12ab · 6de12ab
1 parent d99e995
commit 6de12ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/govc/test/vm.bats b/govc/test/vm.bats
@@ -1130,13 +1130,16 @@ load test_helper
   run govc object.collect -s vm/DC0_H0_VM0 guest.ipAddress
   assert_success 10.0.0.45
 
-  run govc vm.power -off DC0_H0_VM0
-  assert_success
-
   host=$(govc ls -L "$(govc object.collect -s vm/DC0_H0_VM0 runtime.host)")
   run govc host.maintenance.enter "$host"
   assert_success
 
+  run govc vm.power -off DC0_H0_VM0
+  assert_success
+
+  run govc vm.power -on DC0_H0_VM0
+  assert_failure # InvalidState
+
   run govc vm.customize -vm DC0_H0_VM0 -ip 10.0.0.45 -netmask 255.255.0.0 -type Linux
   assert_failure # InvalidState
 

diff --git a/simulator/virtual_machine.go b/simulator/virtual_machine.go
@@ -1445,10 +1445,6 @@ func (c *powerVMTask) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
 		}
 	}
 
-	if c.VirtualMachine.hostInMM(c.ctx) {
-		return nil, new(types.InvalidState)
-	}
-
 	var boot types.AnyType
 	if c.state == types.VirtualMachinePowerStatePoweredOn {
 		boot = time.Now()
@@ -1457,6 +1453,10 @@ func (c *powerVMTask) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
 	event := c.event()
 	switch c.state {
 	case types.VirtualMachinePowerStatePoweredOn:
+		if c.VirtualMachine.hostInMM(c.ctx) {
+			return nil, new(types.InvalidState)
+		}
+
 		c.run.start(c.ctx, c.VirtualMachine)
 		c.ctx.postEvent(
 			&types.VmStartingEvent{VmEvent: event},