Merge "Fix identity v2 catalog list"

Jenkins · openstack-gerrit · commit 0efc8668bf85 · 2015-03-08T17:59:09.000Z
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
@@ -26,8 +26,9 @@
 def _format_endpoints(eps=None):
     if not eps:
         return ""
+    ret = ''
     for index, ep in enumerate(eps):
-        ret = eps[index]['region'] + '\n'
+        ret += eps[index]['region'] + '\n'
         for url in ['publicURL', 'internalURL', 'adminURL']:
             ret += "  %s: %s\n" % (url, eps[index]['publicURL'])
     return ret
diff --git a/openstackclient/tests/identity/v2_0/test_catalog.py b/openstackclient/tests/identity/v2_0/test_catalog.py
@@ -23,11 +23,18 @@ class TestCatalog(utils.TestCommand):
         'id': 'qwertyuiop',
         'type': 'compute',
         'name': 'supernova',
-        'endpoints': [{
-            'region': 'onlyone',
-            'publicURL': 'https://public.example.com',
-            'adminURL': 'https://admin.example.com',
-        }],
+        'endpoints': [
+            {
+                'region': 'one',
+                'publicURL': 'https://public.one.example.com',
+                'adminURL': 'https://admin.one.example.com',
+            },
+            {
+                'region': 'two',
+                'publicURL': 'https://public.two.example.com',
+                'adminURL': 'https://admin.two.example.com',
+            },
+        ],
     }
 
     def setUp(self):
@@ -66,9 +73,12 @@ def test_catalog_list(self):
         datalist = ((
             'supernova',
             'compute',
-            'onlyone\n  publicURL: https://public.example.com\n  '
-            'internalURL: https://public.example.com\n  '
-            'adminURL: https://public.example.com\n',
+            'one\n  publicURL: https://public.one.example.com\n  '
+            'internalURL: https://public.one.example.com\n  '
+            'adminURL: https://public.one.example.com\n'
+            'two\n  publicURL: https://public.two.example.com\n  '
+            'internalURL: https://public.two.example.com\n  '
+            'adminURL: https://public.two.example.com\n',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -97,9 +107,12 @@ def test_catalog_show(self):
         collist = ('endpoints', 'id', 'name', 'type')
         self.assertEqual(collist, columns)
         datalist = (
-            'onlyone\n  publicURL: https://public.example.com\n  '
-            'internalURL: https://public.example.com\n  '
-            'adminURL: https://public.example.com\n',
+            'one\n  publicURL: https://public.one.example.com\n  '
+            'internalURL: https://public.one.example.com\n  '
+            'adminURL: https://public.one.example.com\n'
+            'two\n  publicURL: https://public.two.example.com\n  '
+            'internalURL: https://public.two.example.com\n  '
+            'adminURL: https://public.two.example.com\n',
             'qwertyuiop',
             'supernova',
             'compute',
