Merge "Fix missing 'options' field in 'user show' command"

Author: Zuul

openstackclient/identity/v3/user.py

@@ -41,6 +41,7 @@ def _format_user(user):
         'name',
         'description',
         'password_expires_at',
+        'options',
     )
     column_headers = (
         'default_project_id',
@@ -51,6 +52,7 @@ def _format_user(user):
         'name',
         'description',
         'password_expires_at',
+        'options',
     )
     return (
         column_headers,

openstackclient/tests/unit/identity/v3/test_user.py

@@ -44,6 +44,7 @@ class TestUserCreate(identity_fakes.TestIdentityv3):
         'name',
         'description',
         'password_expires_at',
+        'options',
     )
 
     def setUp(self):
@@ -63,6 +64,7 @@ def setUp(self):
             self.user.name,
             self.user.description,
             self.user.password_expires_at,
+            getattr(self.user, 'options', {}),
         )
 
         self.identity_sdk_client.find_domain.return_value = self.domain
@@ -279,6 +281,7 @@ def test_user_create_project(self):
             self.user.name,
             self.user.description,
             self.user.password_expires_at,
+            getattr(self.user, 'options', {}),
         )
         self.assertEqual(datalist, data)
 
@@ -326,6 +329,7 @@ def test_user_create_project_domain(self):
             self.user.name,
             self.user.description,
             self.user.password_expires_at,
+            getattr(self.user, 'options', {}),
         )
         self.assertEqual(datalist, data)
 
@@ -1853,6 +1857,7 @@ def test_user_show(self):
             'name',
             'description',
             'password_expires_at',
+            'options',
         )
         self.assertEqual(collist, columns)
         datalist = (
@@ -1864,6 +1869,7 @@ def test_user_show(self):
             self.user.name,
             self.user.description,
             self.user.password_expires_at,
+            getattr(self.user, 'options', {}),
         )
         self.assertEqual(datalist, data)