Merge "Use cliff formattable columns in identity commands"

3 files changed, 46 insertions, 26 deletions

diff --git a/openstackclient/tests/unit/identity/v2_0/test_catalog.py b/openstackclient/tests/unit/identity/v2_0/test_catalog.py
index 65af58a2..362dec08 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_catalog.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_catalog.py
@@ -71,17 +71,9 @@ class TestCatalogList(TestCatalog):
         datalist = ((
             'supernova',
             'compute',
-            'one\n  publicURL: https://public.one.example.com\n  '
-            'internalURL: https://internal.one.example.com\n  '
-            'adminURL: https://admin.one.example.com\n'
-            'two\n  publicURL: https://public.two.example.com\n  '
-            'internalURL: https://internal.two.example.com\n  '
-            'adminURL: https://admin.two.example.com\n'
-            '<none>\n  publicURL: https://public.none.example.com\n  '
-            'internalURL: https://internal.none.example.com\n  '
-            'adminURL: https://admin.none.example.com\n',
+            catalog.EndpointsColumn(self.service_catalog['endpoints']),
         ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertListItemEqual(datalist, tuple(data))
 
     def test_catalog_list_with_endpoint_url(self):
         attr = {
@@ -121,11 +113,9 @@ class TestCatalogList(TestCatalog):
         datalist = ((
             'supernova',
             'compute',
-            'one\n  publicURL: https://public.one.example.com\n'
-            'two\n  publicURL: https://public.two.example.com\n  '
-            'internalURL: https://internal.two.example.com\n'
+            catalog.EndpointsColumn(service_catalog['endpoints']),
         ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertListItemEqual(datalist, tuple(data))
 
 
 class TestCatalogShow(TestCatalog):
@@ -160,6 +150,18 @@ class TestCatalogShow(TestCatalog):
         collist = ('endpoints', 'id', 'name', 'type')
         self.assertEqual(collist, columns)
         datalist = (
+            catalog.EndpointsColumn(self.service_catalog['endpoints']),
+            self.service_catalog.id,
+            'supernova',
+            'compute',
+        )
+        self.assertItemEqual(datalist, data)
+
+
+class TestFormatColumns(TestCatalog):
+    def test_endpoints_column_human_readabale(self):
+        col = catalog.EndpointsColumn(self.service_catalog['endpoints'])
+        self.assertEqual(
             'one\n  publicURL: https://public.one.example.com\n  '
             'internalURL: https://internal.one.example.com\n  '
             'adminURL: https://admin.one.example.com\n'
@@ -169,8 +171,23 @@ class TestCatalogShow(TestCatalog):
             '<none>\n  publicURL: https://public.none.example.com\n  '
             'internalURL: https://internal.none.example.com\n  '
             'adminURL: https://admin.none.example.com\n',
-            self.service_catalog.id,
-            'supernova',
-            'compute',
-        )
-        self.assertEqual(datalist, data)
+            col.human_readable())
+
+    def test_endpoints_column_human_readable_with_partial_endpoint_urls(self):
+        endpoints = [
+            {
+                'region': 'one',
+                'publicURL': 'https://public.one.example.com',
+            },
+            {
+                'region': 'two',
+                'publicURL': 'https://public.two.example.com',
+                'internalURL': 'https://internal.two.example.com',
+            },
+        ]
+        col = catalog.EndpointsColumn(endpoints)
+        self.assertEqual(
+            'one\n  publicURL: https://public.one.example.com\n'
+            'two\n  publicURL: https://public.two.example.com\n  '
+            'internalURL: https://internal.two.example.com\n',
+            col.human_readable())
diff --git a/openstackclient/tests/unit/identity/v2_0/test_project.py b/openstackclient/tests/unit/identity/v2_0/test_project.py
index c726f2a6..7af7b394 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_project.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_project.py
@@ -16,6 +16,7 @@
 import mock
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -640,9 +641,9 @@ class TestProjectShow(TestProject):
             True,
             self.fake_proj_show.id,
             self.fake_proj_show.name,
-            '',
+            format_columns.DictColumn({}),
         )
-        self.assertEqual(datalist, data)
+        self.assertItemEqual(datalist, data)
 
 
 class TestProjectUnset(TestProject):
diff --git a/openstackclient/tests/unit/identity/v2_0/test_user.py b/openstackclient/tests/unit/identity/v2_0/test_user.py
index a8b9497e..0a0d4b36 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_user.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_user.py
@@ -482,7 +482,7 @@ class TestUserList(TestUser):
         self.users_mock.list.assert_called_with(tenant_id=None)
 
         self.assertEqual(self.columns, columns)
-        self.assertEqual(self.datalist, tuple(data))
+        self.assertListItemEqual(self.datalist, tuple(data))
 
     def test_user_list_project(self):
         arglist = [
@@ -502,7 +502,7 @@ class TestUserList(TestUser):
         self.users_mock.list.assert_called_with(tenant_id=project_id)
 
         self.assertEqual(self.columns, columns)
-        self.assertEqual(self.datalist, tuple(data))
+        self.assertListItemEqual(self.datalist, tuple(data))
 
     def test_user_list_long(self):
         arglist = [
@@ -525,11 +525,13 @@ class TestUserList(TestUser):
         datalist = ((
             self.fake_user_l.id,
             self.fake_user_l.name,
-            self.fake_project_l.name,
+            user.ProjectColumn(
+                self.fake_project_l.id,
+                {self.fake_project_l.id: self.fake_project_l}),
             self.fake_user_l.email,
             True,
         ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertListItemEqual(datalist, tuple(data))
 
 
 class TestUserSet(TestUser):
@@ -817,4 +819,4 @@ class TestUserShow(TestUser):
             self.fake_user.name,
             self.fake_project.id,
         )
-        self.assertEqual(datalist, data)
+        self.assertItemEqual(datalist, data)