From cbd3ca07c4644c62b3914cecfa60436a46d77836 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 16 Jan 2015 17:24:29 +0000
Subject: [PATCH] Handle Swarm-style prefixed names in Container.from_ps()

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 fig/container.py             | 15 ++++++++++++---
 fig/service.py               | 13 +------------
 tests/unit/container_test.py | 14 +++++++++++++-
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/fig/container.py b/fig/container.py
index 0ab755120..692145988 100644
--- a/fig/container.py
+++ b/fig/container.py
@@ -22,10 +22,8 @@ class Container(object):
         new_dictionary = {
             'Id': dictionary['Id'],
             'Image': dictionary['Image'],
+            'Name': '/' + get_container_name(dictionary),
         }
-        for name in dictionary.get('Names', []):
-            if len(name.split('/')) == 2:
-                new_dictionary['Name'] = name
         return cls(client, new_dictionary, **kwargs)
 
     @classmethod
@@ -170,3 +168,14 @@ class Container(object):
         if type(self) != type(other):
             return False
         return self.id == other.id
+
+
+def get_container_name(container):
+    if not container.get('Name') and not container.get('Names'):
+        return None
+    # inspect
+    if 'Name' in container:
+        return container['Name']
+    # ps
+    shortest_name = min(container['Names'], key=lambda n: len(n.split('/')))
+    return shortest_name.split('/')[-1]
diff --git a/fig/service.py b/fig/service.py
index 369d4e845..6743e1717 100644
--- a/fig/service.py
+++ b/fig/service.py
@@ -9,7 +9,7 @@ import sys
 
 from docker.errors import APIError
 
-from .container import Container
+from .container import Container, get_container_name
 from .progress_stream import stream_output, StreamOutputError
 
 log = logging.getLogger(__name__)
@@ -538,17 +538,6 @@ def parse_name(name):
     return ServiceName(project, service_name, int(suffix))
 
 
-def get_container_name(container):
-    if not container.get('Name') and not container.get('Names'):
-        return None
-    # inspect
-    if 'Name' in container:
-        return container['Name']
-    # ps
-    shortest_name = min(container['Names'], key=lambda n: len(n.split('/')))
-    return shortest_name.split('/')[-1]
-
-
 def parse_restart_spec(restart_config):
     if not restart_config:
         return None
diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py
index 18f7944eb..264681185 100644
--- a/tests/unit/container_test.py
+++ b/tests/unit/container_test.py
@@ -20,7 +20,7 @@ class ContainerTest(unittest.TestCase):
             "Ports": None,
             "SizeRw": 0,
             "SizeRootFs": 0,
-            "Names": ["/figtest_db_1"],
+            "Names": ["/figtest_db_1", "/figtest_web_1/db"],
             "NetworkSettings": {
                 "Ports": {},
             },
@@ -36,6 +36,18 @@ class ContainerTest(unittest.TestCase):
             "Name": "/figtest_db_1",
         })
 
+    def test_from_ps_prefixed(self):
+        self.container_dict['Names'] = ['/swarm-host-1' + n for n in self.container_dict['Names']]
+
+        container = Container.from_ps(None,
+                                      self.container_dict,
+                                      has_been_inspected=True)
+        self.assertEqual(container.dictionary, {
+            "Id": "abc",
+            "Image":"busybox:latest",
+            "Name": "/figtest_db_1",
+        })
+
     def test_environment(self):
         container = Container(None, {
             'Id': 'abc',