From b692b09d532fff4790b235ec7ddffb484be2a0fc Mon Sep 17 00:00:00 2001
From: Richard Gooch <rg+github0@safe-mbox.com>
Date: Sat, 8 Dec 2018 08:28:13 -0800
Subject: [PATCH] vm-control: support creating VMs with multiple network
 interfaces/subnets.

---
 cmd/vm-control/createVm.go | 15 ++++++++-------
 cmd/vm-control/main.go     |  2 ++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cmd/vm-control/createVm.go b/cmd/vm-control/createVm.go
index d9793ad7..ca359c8e 100644
--- a/cmd/vm-control/createVm.go
+++ b/cmd/vm-control/createVm.go
@@ -96,13 +96,14 @@ func createVmOnHypervisor(hypervisor string, logger log.DebugLogger) error {
 	request := hyper_proto.CreateVmRequest{
 		DhcpTimeout: *dhcpTimeout,
 		VmInfo: hyper_proto.VmInfo{
-			Hostname:    *vmHostname,
-			MemoryInMiB: uint64(memory >> 20),
-			MilliCPUs:   *milliCPUs,
-			OwnerGroups: ownerGroups,
-			OwnerUsers:  ownerUsers,
-			Tags:        vmTags,
-			SubnetId:    *subnetId,
+			Hostname:           *vmHostname,
+			MemoryInMiB:        uint64(memory >> 20),
+			MilliCPUs:          *milliCPUs,
+			OwnerGroups:        ownerGroups,
+			OwnerUsers:         ownerUsers,
+			Tags:               vmTags,
+			SecondarySubnetIDs: secondarySubnetIDs,
+			SubnetId:           *subnetId,
 		},
 		MinimumFreeBytes: uint64(minFreeBytes),
 		RoundupPower:     *roundupPower,
diff --git a/cmd/vm-control/main.go b/cmd/vm-control/main.go
index fa9f25c5..706b12b4 100644
--- a/cmd/vm-control/main.go
+++ b/cmd/vm-control/main.go
@@ -50,6 +50,7 @@ var (
 	probePortNum = flag.Uint("probePortNum", 0, "Port number on VM to probe")
 	probeTimeout = flag.Duration("probeTimeout", time.Minute*5,
 		"Time to wait before timing out on probing VM port")
+	secondarySubnetIDs   flagutil.StringList
 	secondaryVolumeSizes flagutil.StringList
 	subnetId             = flag.String("subnetId", "",
 		"Subnet ID to launch VM in")
@@ -77,6 +78,7 @@ func init() {
 		"minimum number of free bytes in root volume")
 	flag.Var(&ownerGroups, "ownerGroups", "Groups who own the VM")
 	flag.Var(&ownerUsers, "ownerUsers", "Extra users who own the VM")
+	flag.Var(&secondarySubnetIDs, "secondarySubnetIDs", "Secondary Subnet IDs")
 	flag.Var(&secondaryVolumeSizes, "secondaryVolumeSizes",
 		"Sizes for secondary volumes")
 	flag.Var(&vmTags, "vmTags", "Tags to apply to VM")