From 35e347cf92b13a374ff767653aa8629ccdb64a71 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 13 Jan 2016 14:05:30 +0000
Subject: [PATCH] Disable the use of 'net' in v2

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/service_schema_v2.json         |  1 -
 tests/acceptance/cli_test.py                  | 24 +++++++++++++++++++
 .../fixtures/net-container/docker-compose.yml |  7 ++++++
 tests/fixtures/net-container/v2-invalid.yml   | 10 ++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/net-container/docker-compose.yml
 create mode 100644 tests/fixtures/net-container/v2-invalid.yml

diff --git a/compose/config/service_schema_v2.json b/compose/config/service_schema_v2.json
index c911502fe..1e54c666b 100644
--- a/compose/config/service_schema_v2.json
+++ b/compose/config/service_schema_v2.json
@@ -89,7 +89,6 @@
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
-        "net": {"type": "string"},
         "pid": {"type": ["string", "null"]},
 
         "ports": {
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 1e31988b2..ceec400c9 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -422,6 +422,30 @@ class CLITestCase(DockerClientTestCase):
         self.assertEqual(len(db.containers()), 1)
         self.assertEqual(len(console.containers()), 0)
 
+    def test_up_with_net_is_invalid(self):
+        self.base_dir = 'tests/fixtures/net-container'
+
+        result = self.dispatch(
+            ['-f', 'v2-invalid.yml', 'up', '-d'],
+            returncode=1)
+
+        # TODO: fix validation error messages for v2 files
+        # assert "Unsupported config option for service 'web': 'net'" in exc.exconly()
+        assert "Unsupported config option" in result.stderr
+
+    def test_up_with_net_v1(self):
+        self.base_dir = 'tests/fixtures/net-container'
+        self.dispatch(['up', '-d'], None)
+
+        bar = self.project.get_service('bar')
+        bar_container = bar.containers()[0]
+
+        foo = self.project.get_service('foo')
+        foo_container = foo.containers()[0]
+
+        assert foo_container.get('HostConfig.NetworkMode') == \
+            'container:{}'.format(bar_container.id)
+
     def test_up_with_no_deps(self):
         self.base_dir = 'tests/fixtures/links-composefile'
         self.dispatch(['up', '-d', '--no-deps', 'web'], None)
diff --git a/tests/fixtures/net-container/docker-compose.yml b/tests/fixtures/net-container/docker-compose.yml
new file mode 100644
index 000000000..b5506e0e1
--- /dev/null
+++ b/tests/fixtures/net-container/docker-compose.yml
@@ -0,0 +1,7 @@
+foo:
+  image: busybox
+  command: top
+  net: "container:bar"
+bar:
+  image: busybox
+  command: top
diff --git a/tests/fixtures/net-container/v2-invalid.yml b/tests/fixtures/net-container/v2-invalid.yml
new file mode 100644
index 000000000..eac4b5f18
--- /dev/null
+++ b/tests/fixtures/net-container/v2-invalid.yml
@@ -0,0 +1,10 @@
+version: 2
+
+services:
+  foo:
+    image: busybox
+    command: top
+  bar:
+    image: busybox
+    command: top
+    net: "container:foo"