From c3776cae0f33958c7fb442003e91e6f91cc4dc3c Mon Sep 17 00:00:00 2001
From: David Watson <david@bashton.com>
Date: Mon, 16 Feb 2015 17:04:56 +0000
Subject: [PATCH 1/2] Update Instance Template network definition to match
 changes to Instances.

---
 resource_compute_instance_template.go      | 52 +++++++++++++---------
 resource_compute_instance_template_test.go | 16 ++++---
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/resource_compute_instance_template.go b/resource_compute_instance_template.go
index 074e4569..13c5a0b0 100644
--- a/resource_compute_instance_template.go
+++ b/resource_compute_instance_template.go
@@ -133,22 +133,30 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 				},
 			},
 
-			"network": &schema.Schema{
+			"network_interface": &schema.Schema{
 				Type:     schema.TypeList,
-				Required: true,
+				Optional: true,
 				ForceNew: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						"source": &schema.Schema{
+						"network": &schema.Schema{
 							Type:     schema.TypeString,
-							ForceNew: true,
 							Required: true,
+							ForceNew: true,
 						},
 
-						"address": &schema.Schema{
-							Type:     schema.TypeString,
-							ForceNew: true,
+						"access_config": &schema.Schema{
+							Type:     schema.TypeList,
 							Optional: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"nat_ip": &schema.Schema{
+										Type:     schema.TypeString,
+										Computed: true,
+										Optional: true,
+									},
+								},
+							},
 						},
 					},
 				},
@@ -290,31 +298,35 @@ func buildDisks(d *schema.ResourceData, meta interface{}) []*compute.AttachedDis
 
 func buildNetworks(d *schema.ResourceData, meta interface{}) (error, []*compute.NetworkInterface) {
 	// Build up the list of networks
-	networksCount := d.Get("network.#").(int)
-	networks := make([]*compute.NetworkInterface, 0, networksCount)
+	networksCount := d.Get("network_interface.#").(int)
+	networkInterfaces := make([]*compute.NetworkInterface, 0, networksCount)
 	for i := 0; i < networksCount; i++ {
-		prefix := fmt.Sprintf("network.%d", i)
+		prefix := fmt.Sprintf("network_interface.%d", i)
 
 		source := "global/networks/default"
-		if v, ok := d.GetOk(prefix + ".source"); ok {
+		if v, ok := d.GetOk(prefix + ".network"); ok {
 			if v.(string) != "default" {
 				source = v.(string)
 			}
 		}
 
-		// Build the interface
+		// Build the networkInterface
 		var iface compute.NetworkInterface
-		iface.AccessConfigs = []*compute.AccessConfig{
-			&compute.AccessConfig{
-				Type:  "ONE_TO_ONE_NAT",
-				NatIP: d.Get(prefix + ".address").(string),
-			},
-		}
 		iface.Network = source
 
-		networks = append(networks, &iface)
+		accessConfigsCount := d.Get(prefix + ".access_config.#").(int)
+		iface.AccessConfigs = make([]*compute.AccessConfig, accessConfigsCount)
+		for j := 0; j < accessConfigsCount; j++ {
+			acPrefix := fmt.Sprintf("%s.access_config.%d", prefix, j)
+			iface.AccessConfigs[j] = &compute.AccessConfig{
+				Type:  "ONE_TO_ONE_NAT",
+				NatIP: d.Get(acPrefix + ".nat_ip").(string),
+			}
+		}
+
+		networkInterfaces = append(networkInterfaces, &iface)
 	}
-	return nil, networks
+	return nil, networkInterfaces
 }
 
 func resourceComputeInstanceTemplateCreate(d *schema.ResourceData, meta interface{}) error {
diff --git a/resource_compute_instance_template_test.go b/resource_compute_instance_template_test.go
index 74133089..b7aaecd5 100644
--- a/resource_compute_instance_template_test.go
+++ b/resource_compute_instance_template_test.go
@@ -214,8 +214,8 @@ resource "google_compute_instance_template" "foobar" {
 		boot = true
 	}
 
-	network {
-		source = "default"
+	network_interface {
+		network = "default"
 	}
 
 	metadata {
@@ -241,9 +241,11 @@ resource "google_compute_instance_template" "foobar" {
 		source_image = "debian-7-wheezy-v20140814"
 	}
 
-	network {
-		source = "default"
-		address = "${google_compute_address.foo.address}"
+	network_interface {
+		network = "default"
+		access_config {
+			nat_ip = "${google_compute_address.foo.address}"
+		}
 	}
 
 	metadata {
@@ -268,8 +270,8 @@ resource "google_compute_instance_template" "foobar" {
 		boot = false
 	}
 
-	network {
-		source = "default"
+	network_interface {
+		network = "default"
 	}
 
 	metadata {

From 2187833dee29e4e401cc42efd7162040f2e8b00e Mon Sep 17 00:00:00 2001
From: David Watson <david@bashton.com>
Date: Thu, 19 Feb 2015 11:43:18 +0000
Subject: [PATCH 2/2] Remove old todo comment.

---
 resource_compute_instance_template.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resource_compute_instance_template.go b/resource_compute_instance_template.go
index 13c5a0b0..89e49e71 100644
--- a/resource_compute_instance_template.go
+++ b/resource_compute_instance_template.go
@@ -48,7 +48,6 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 				ForceNew: true,
 			},
 
-			// TODO: Constraint either source or other disk params
 			"disk": &schema.Schema{
 				Type:     schema.TypeList,
 				Required: true,