Skip to content

Commit

Permalink
Merge pull request #180 from pietern/vnc
Browse files Browse the repository at this point in the history
Expand vm.vnc command
  • Loading branch information
pietern committed Nov 20, 2014
2 parents 4d5ed87 + b28d6f4 commit c848630
Show file tree
Hide file tree
Showing 4 changed files with 375 additions and 47 deletions.
2 changes: 1 addition & 1 deletion govc/test/boot_order_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions govc/test/test_helper.bash
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down
Loading

0 comments on commit c848630

Please sign in to comment.