Merge pull request #180 from pietern/vnc

Expand vm.vnc command
vmware · Nov 20, 2014 · c848630 · c848630
2 parents 4d5ed87 + b28d6f4
commit c848630
Show file tree

Hide file tree

Showing 4 changed files with 375 additions and 47 deletions.
diff --git a/govc/test/boot_order_test.sh b/govc/test/boot_order_test.sh
@@ -30,7 +30,7 @@ govc device.floppy.insert -vm $id $GOVC_TEST_IMG
 
 govc device.boot -vm $id -delay 1000 -order floppy,cdrom,ethernet,disk
 
-vnc=$(govc vm.vnc -vm $id -port 21122 -password govmomi | awk '{print $5}')
+vnc=$(govc vm.vnc -port 21122 -password govmomi -enable "${id}" | awk '{print $2}')
 
 echo "booting from floppy..."
 govc vm.power -on $id

diff --git a/govc/test/test_helper.bash b/govc/test/test_helper.bash
@@ -1,6 +1,7 @@
 GOVC_TEST_URL=${GOVC_TEST_URL-"https://root:vagrant@localhost:18443/sdk"}
 export GOVC_URL=$GOVC_TEST_URL
 export GOVC_DATASTORE=datastore1
+export GOVC_NETWORK="VM Network"
 export GOVC_INSECURE=true
 
 if [ -z "$BATS_TEST_DIRNAME" ]