From 4b806b1c41bfd6067158064b82a794e9f79593fe Mon Sep 17 00:00:00 2001
From: Mahmood Ali <mahmood@hashicorp.com>
Date: Fri, 28 Feb 2020 14:18:45 -0500
Subject: [PATCH] tests: add tests for parsing cni fields

---
 command/agent/config_parse_test.go | 26 ++++++++++++++++++++++++++
 command/agent/testdata/basic.hcl   |  4 ++++
 command/agent/testdata/basic.json  |  3 +++
 3 files changed, 33 insertions(+)

diff --git a/command/agent/config_parse_test.go b/command/agent/config_parse_test.go
index 3ce173324..eb9691ef1 100644
--- a/command/agent/config_parse_test.go
+++ b/command/agent/config_parse_test.go
@@ -86,6 +86,9 @@ var basicConfig = &Config{
 		HostVolumes: []*structs.ClientHostVolumeConfig{
 			{Name: "tmp", Path: "/tmp"},
 		},
+		CNIPath:             "/tmp/cni_path",
+		BridgeNetworkName:   "custom_bridge_name",
+		BridgeNetworkSubnet: "custom_bridge_subnet",
 	},
 	Server: &ServerConfig{
 		Enabled:                true,
@@ -369,6 +372,29 @@ var nonoptConfig = &Config{
 	Sentinel:                  nil,
 }
 
+func TestConfig_ParseMerge(t *testing.T) {
+	t.Parallel()
+
+	path, err := filepath.Abs(filepath.Join(".", "testdata", "basic.hcl"))
+	require.NoError(t, err)
+
+	actual, err := ParseConfigFile(path)
+	require.NoError(t, err)
+
+	require.Equal(t, basicConfig.Client, actual.Client)
+
+	oldDefault := &Config{
+		Consul:    config.DefaultConsulConfig(),
+		Vault:     config.DefaultVaultConfig(),
+		Autopilot: config.DefaultAutopilotConfig(),
+		Client:    &ClientConfig{},
+		Server:    &ServerConfig{},
+	}
+	merged := oldDefault.Merge(actual)
+	require.Equal(t, basicConfig.Client, merged.Client)
+
+}
+
 func TestConfig_Parse(t *testing.T) {
 	t.Parallel()
 
diff --git a/command/agent/testdata/basic.hcl b/command/agent/testdata/basic.hcl
index 43b481ee9..a3d3bcb9e 100644
--- a/command/agent/testdata/basic.hcl
+++ b/command/agent/testdata/basic.hcl
@@ -95,6 +95,10 @@ client {
   host_volume "tmp" {
     path = "/tmp"
   }
+
+  cni_path              = "/tmp/cni_path"
+  bridge_network_name   = "custom_bridge_name"
+  bridge_network_subnet = "custom_bridge_subnet"
 }
 
 server {
diff --git a/command/agent/testdata/basic.json b/command/agent/testdata/basic.json
index b7575f02e..7048d681e 100644
--- a/command/agent/testdata/basic.json
+++ b/command/agent/testdata/basic.json
@@ -36,6 +36,8 @@
   "client": [
     {
       "alloc_dir": "/tmp/alloc",
+      "bridge_network_name": "custom_bridge_name",
+      "bridge_network_subnet": "custom_bridge_subnet",
       "chroot_env": [
         {
           "/opt/myapp/bin": "/bin",
@@ -44,6 +46,7 @@
       ],
       "client_max_port": 2000,
       "client_min_port": 1000,
+      "cni_path": "/tmp/cni_path",
       "cpu_total_compute": 4444,
       "disable_remote_exec": true,
       "enabled": true,