Merge "Add back show_details for node-show"

senlinclient/tests/unit/v1/test_client.py

@@ -318,7 +318,16 @@ class ClientTest(testtools.TestCase):
 
         res = sc.get_node('FOOBAR')
         self.assertEqual(self.service.get_node.return_value, res)
-        self.service.get_node.assert_called_once_with('FOOBAR')
+        self.service.get_node.assert_called_once_with('FOOBAR', args=None)
+
+    def test_get_node_with_details(self, mock_conn):
+        mock_conn.return_value = self.conn
+        sc = client.Client()
+
+        res = sc.get_node('FOOBAR', args={'show_details': True})
+        self.assertEqual(self.service.get_node.return_value, res)
+        self.service.get_node.assert_called_once_with(
+            'FOOBAR', args={'show_details': True})
 
     def test_create_node(self, mock_conn):
         mock_conn.return_value = self.conn

senlinclient/tests/unit/v1/test_shell.py

@@ -1083,7 +1083,7 @@ class ShellTest(testtools.TestCase):
 
         sh._show_node(service, node_id, show_details=False)
 
-        service.get_node.assert_called_once_with(node_id)
+        service.get_node.assert_called_once_with(node_id, args=None)
         mock_print.assert_called_once_with(data, formatters=formatters)
 
     @mock.patch.object(sh, '_show_node')

senlinclient/v1/client.py

@@ -119,8 +119,8 @@ class Client(object):
     def create_node(self, **attrs):
         return self.service.create_node(**attrs)
 
-    def get_node(self, node, show_details=False):
-        return self.service.get_node(node)
+    def get_node(self, node, args=None):
+        return self.service.get_node(node, args=args)
 
     def update_node(self, node, **attrs):
         return self.service.update_node(node, **attrs)

senlinclient/v1/shell.py

@@ -843,9 +843,9 @@ def do_node_list(service, args):
 def _show_node(service, node_id, show_details=False):
     """Show detailed info about the specified node."""
 
-    # TODO(Qiming): Re-enable show_details after SDK adopts related patch.
+    args = {'show_details': True} if show_details else None
     try:
-        node = service.get_node(node_id)
+        node = service.get_node(node_id, args=args)
     except exc.HTTPNotFound:
         msg = _('Node %s is not found') % node_id
         raise exc.CommandError(msg)