Merge pull request moby#30742 from yongtang/29975-compose-network-att…

…achable Add compose support of `attachable` in networks
Projjol-zz · Feb 6, 2017 · e06ae6f · e06ae6f
2 parents 0113128 + cf4b7a5
commit e06ae6f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 9 deletions.
diff --git a/cli/compose/convert/compose.go b/cli/compose/convert/compose.go
@@ -61,10 +61,11 @@ func Networks(namespace Namespace, networks networkMap, servicesNetworks map[str
 		}
 
 		createOpts := types.NetworkCreate{
-			Labels:   AddStackLabel(namespace, network.Labels),
-			Driver:   network.Driver,
-			Options:  network.DriverOpts,
-			Internal: network.Internal,
+			Labels:     AddStackLabel(namespace, network.Labels),
+			Driver:     network.Driver,
+			Options:    network.DriverOpts,
+			Internal:   network.Internal,
+			Attachable: network.Attachable,
 		}
 
 		if network.Ipam.Driver != "" || len(network.Ipam.Config) > 0 {

diff --git a/cli/compose/convert/compose_test.go b/cli/compose/convert/compose_test.go
@@ -30,9 +30,10 @@ func TestAddStackLabel(t *testing.T) {
 func TestNetworks(t *testing.T) {
 	namespace := Namespace{name: "foo"}
 	serviceNetworks := map[string]struct{}{
-		"normal":  {},
-		"outside": {},
-		"default": {},
+		"normal":        {},
+		"outside":       {},
+		"default":       {},
+		"attachablenet": {},
 	}
 	source := networkMap{
 		"normal": composetypes.NetworkConfig{
@@ -58,6 +59,10 @@ func TestNetworks(t *testing.T) {
 				Name:     "special",
 			},
 		},
+		"attachablenet": composetypes.NetworkConfig{
+			Driver:     "overlay",
+			Attachable: true,
+		},
 	}
 	expected := map[string]types.NetworkCreate{
 		"default": {
@@ -83,6 +88,13 @@ func TestNetworks(t *testing.T) {
 				"something":    "labeled",
 			},
 		},
+		"attachablenet": {
+			Driver:     "overlay",
+			Attachable: true,
+			Labels: map[string]string{
+				LabelNamespace: "foo",
+			},
+		},
 	}
 
 	networks, externals := Networks(namespace, source, serviceNetworks)

diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
@@ -799,3 +799,29 @@ type servicesByName []types.ServiceConfig
 func (sbn servicesByName) Len() int           { return len(sbn) }
 func (sbn servicesByName) Swap(i, j int)      { sbn[i], sbn[j] = sbn[j], sbn[i] }
 func (sbn servicesByName) Less(i, j int) bool { return sbn[i].Name < sbn[j].Name }
+
+func TestLoadAttachableNetwork(t *testing.T) {
+	config, err := loadYAML(`
+version: "3.1"
+networks:
+  mynet1:
+    driver: overlay
+    attachable: true
+  mynet2:
+    driver: bridge
+`)
+	assert.NoError(t, err)
+
+	expected := map[string]types.NetworkConfig{
+		"mynet1": {
+			Driver:     "overlay",
+			Attachable: true,
+		},
+		"mynet2": {
+			Driver:     "bridge",
+			Attachable: false,
+		},
+	}
+
+	assert.Equal(t, expected, config.Networks)
+}