From 756ef14edc824ce2c52a2eb636c4884c95652e1e Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Tue, 26 Apr 2016 17:30:04 +0100
Subject: [PATCH] Fix format of 'restart' option in 'config' output

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 compose/config/serialize.py               | 26 +++++++++++++++++-----
 compose/config/types.py                   |  9 ++++++++
 tests/acceptance/cli_test.py              | 27 +++++++++++++++++++++++
 tests/fixtures/restart/docker-compose.yml | 14 ++++++++++++
 4 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 tests/fixtures/restart/docker-compose.yml

diff --git a/compose/config/serialize.py b/compose/config/serialize.py
index be6ba7204..1b498c016 100644
--- a/compose/config/serialize.py
+++ b/compose/config/serialize.py
@@ -19,12 +19,14 @@ yaml.SafeDumper.add_representer(types.VolumeSpec, serialize_config_type)
 
 
 def serialize_config(config):
-    services = {service.pop('name'): service for service in config.services}
-
-    if config.version == V1:
-        for service_dict in services.values():
-            if 'network_mode' not in service_dict:
-                service_dict['network_mode'] = 'bridge'
+    denormalized_services = [
+        denormalize_service_dict(service_dict, config.version)
+        for service_dict in config.services
+    ]
+    services = {
+        service_dict.pop('name'): service_dict
+        for service_dict in denormalized_services
+    }
 
     output = {
         'version': V2_0,
@@ -38,3 +40,15 @@ def serialize_config(config):
         default_flow_style=False,
         indent=2,
         width=80)
+
+
+def denormalize_service_dict(service_dict, version):
+    service_dict = service_dict.copy()
+
+    if 'restart' in service_dict:
+        service_dict['restart'] = types.serialize_restart_spec(service_dict['restart'])
+
+    if version == V1 and 'network_mode' not in service_dict:
+        service_dict['network_mode'] = 'bridge'
+
+    return service_dict
diff --git a/compose/config/types.py b/compose/config/types.py
index fc3347c86..e6a3dea05 100644
--- a/compose/config/types.py
+++ b/compose/config/types.py
@@ -7,6 +7,8 @@ from __future__ import unicode_literals
 import os
 from collections import namedtuple
 
+import six
+
 from compose.config.config import V1
 from compose.config.errors import ConfigurationError
 from compose.const import IS_WINDOWS_PLATFORM
@@ -89,6 +91,13 @@ def parse_restart_spec(restart_config):
     return {'Name': name, 'MaximumRetryCount': int(max_retry_count)}
 
 
+def serialize_restart_spec(restart_spec):
+    parts = [restart_spec['Name']]
+    if restart_spec['MaximumRetryCount']:
+        parts.append(six.text_type(restart_spec['MaximumRetryCount']))
+    return ':'.join(parts)
+
+
 def parse_extra_hosts(extra_hosts_config):
     if not extra_hosts_config:
         return {}
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index f7c958dd8..515acb042 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -190,6 +190,33 @@ class CLITestCase(DockerClientTestCase):
         }
         assert output == expected
 
+    def test_config_restart(self):
+        self.base_dir = 'tests/fixtures/restart'
+        result = self.dispatch(['config'])
+        assert yaml.load(result.stdout) == {
+            'version': '2.0',
+            'services': {
+                'never': {
+                    'image': 'busybox',
+                    'restart': 'no',
+                },
+                'always': {
+                    'image': 'busybox',
+                    'restart': 'always',
+                },
+                'on-failure': {
+                    'image': 'busybox',
+                    'restart': 'on-failure',
+                },
+                'on-failure-5': {
+                    'image': 'busybox',
+                    'restart': 'on-failure:5',
+                },
+            },
+            'networks': {},
+            'volumes': {},
+        }
+
     def test_config_v1(self):
         self.base_dir = 'tests/fixtures/v1-config'
         result = self.dispatch(['config'])
diff --git a/tests/fixtures/restart/docker-compose.yml b/tests/fixtures/restart/docker-compose.yml
new file mode 100644
index 000000000..2d10aa397
--- /dev/null
+++ b/tests/fixtures/restart/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "2"
+services:
+  never:
+    image: busybox
+    restart: "no"
+  always:
+    image: busybox
+    restart: always
+  on-failure:
+    image: busybox
+    restart: on-failure
+  on-failure-5:
+    image: busybox
+    restart: "on-failure:5"