From d83d31889ea937524db798aa8260638036503764 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 19 Jan 2017 16:05:13 -0800
Subject: [PATCH] Remove external_name from volume def in config output

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/serialize.py                 |  7 ++++++-
 tests/acceptance/cli_test.py                | 14 ++++++++++++++
 tests/fixtures/volumes/docker-compose.yml   |  2 ++
 tests/fixtures/volumes/external-volumes.yml | 16 ++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/volumes/docker-compose.yml
 create mode 100644 tests/fixtures/volumes/external-volumes.yml

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index 05ac0d60d..9ea287a46 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -32,6 +32,11 @@ def denormalize_config(config):
         if 'external_name' in net_conf:
             del net_conf['external_name']
 
+    volumes = config.volumes.copy()
+    for vol_name, vol_conf in volumes.items():
+        if 'external_name' in vol_conf:
+            del vol_conf['external_name']
+
     version = config.version
     if version == V1:
         version = V2_1
@@ -40,7 +45,7 @@ def denormalize_config(config):
         'version': version,
         'services': services,
         'networks': networks,
-        'volumes': config.volumes,
+        'volumes': volumes,
     }
 
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index b9766226d..287c043c0 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -262,6 +262,20 @@ class CLITestCase(DockerClientTestCase):
             }
         }
 
+    def test_config_external_volume(self):
+        self.base_dir = 'tests/fixtures/volumes'
+        result = self.dispatch(['-f', 'external-volumes.yml', 'config'])
+        json_result = yaml.load(result.stdout)
+        assert 'volumes' in json_result
+        assert json_result['volumes'] == {
+            'foo': {
+                'external': True
+            },
+            'bar': {
+                'external': {'name': 'some_bar'}
+            }
+        }
+
     def test_config_v1(self):
         self.base_dir = 'tests/fixtures/v1-config'
         result = self.dispatch(['config'])
diff --git a/tests/fixtures/volumes/docker-compose.yml b/tests/fixtures/volumes/docker-compose.yml
new file mode 100644
index 000000000..da711ac42
--- /dev/null
+++ b/tests/fixtures/volumes/docker-compose.yml
@@ -0,0 +1,2 @@
+version: '2.1'
+services: {}
diff --git a/tests/fixtures/volumes/external-volumes.yml b/tests/fixtures/volumes/external-volumes.yml
new file mode 100644
index 000000000..05c6c4844
--- /dev/null
+++ b/tests/fixtures/volumes/external-volumes.yml
@@ -0,0 +1,16 @@
+version: "2.1"
+
+services:
+  web:
+    image: busybox
+    command: top
+    volumes:
+      - foo:/var/lib/
+      - bar:/etc/
+
+volumes:
+  foo:
+    external: true
+  bar:
+    external:
+      name: some_bar