From fa009a68bd204c96ca9da6bcd40aa7883ff78a3e Mon Sep 17 00:00:00 2001
From: Yusuke KUOKA <ykuoka@gmail.com>
Date: Tue, 24 Apr 2018 11:27:16 +0900
Subject: [PATCH] try to fix tests

---
 core/controlplane/cluster/cluster.go |  2 +-
 model/subnets.go                     | 13 +++++++++++++
 test/integration/maincluster_test.go |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/controlplane/cluster/cluster.go b/core/controlplane/cluster/cluster.go
index ee539a52e..b75bdf3a6 100644
--- a/core/controlplane/cluster/cluster.go
+++ b/core/controlplane/cluster/cluster.go
@@ -128,7 +128,7 @@ func NewCluster(cfgRef *config.Cluster, opts config.StackTemplateOptions, plugin
 
 	// Import all the managed subnets from the network stack
 	var err error
-	cfg.Subnets, err = cfg.Subnets.ImportFromNetworkStack()
+	cfg.Subnets, err = cfg.Subnets.ImportFromNetworkStackRetainingNames()
 	if err != nil {
 		return nil, fmt.Errorf("failed to import subnets from network stack: %v", err)
 	}
diff --git a/model/subnets.go b/model/subnets.go
index e13516a62..a92287b59 100644
--- a/model/subnets.go
+++ b/model/subnets.go
@@ -30,7 +30,20 @@ func (ss Subnets) ImportFromNetworkStack() (Subnets, error) {
 			} else {
 				result[i] = NewPublicSubnetFromFn(az, stackOutputName)
 			}
+		} else {
+			result[i] = s
 		}
 	}
 	return result, nil
 }
+
+func (ss Subnets) ImportFromNetworkStackRetainingNames() (Subnets, error) {
+	result, err := ss.ImportFromNetworkStack()
+	if err != nil {
+		return result, err
+	}
+	for i, s := range ss {
+		result[i].Name = s.Name
+	}
+	return result, nil
+}
diff --git a/test/integration/maincluster_test.go b/test/integration/maincluster_test.go
index 98596ef98..18432cf60 100644
--- a/test/integration/maincluster_test.go
+++ b/test/integration/maincluster_test.go
@@ -3431,6 +3431,8 @@ worker:
 				stackTemplateOptions.RootStackTemplateTmplFile = "../../core/root/config/templates/stack-template.json"
 				stackTemplateOptions.NodePoolStackTemplateTmplFile = "../../core/nodepool/config/templates/stack-template.json"
 				stackTemplateOptions.ControlPlaneStackTemplateTmplFile = "../../core/controlplane/config/templates/stack-template.json"
+				stackTemplateOptions.NetworkStackTemplateTmplFile = "../../core/network/config/templates/stack-template.json"
+				stackTemplateOptions.EtcdStackTemplateTmplFile = "../../core/etcd/config/templates/stack-template.json"
 
 				cluster, err := root.ClusterFromConfig(providedConfig, stackTemplateOptions, false)
 				if err != nil {