Merge "Support health_status on client side"

magnumclient/osc/v1/clusters.py

@@ -24,6 +24,7 @@ from osc_lib import utils
 
 CLUSTER_ATTRIBUTES = [
     'status',
+    'health_status',
     'cluster_template_id',
     'node_addresses',
     'uuid',
@@ -45,6 +46,7 @@ CLUSTER_ATTRIBUTES = [
     'name',
     'master_flavor_id',
     'flavor_id',
+    'health_status_reason',
 ]
 
 
@@ -197,7 +199,8 @@ class ListCluster(command.Lister):
 
         mag_client = self.app.client_manager.container_infra
         columns = [
-            'uuid', 'name', 'keypair', 'node_count', 'master_count', 'status']
+            'uuid', 'name', 'keypair', 'node_count', 'master_count', 'status',
+            'health_status']
         clusters = mag_client.clusters.list(limit=parsed_args.limit,
                                             sort_key=parsed_args.sort_key,
                                             sort_dir=parsed_args.sort_dir)

magnumclient/tests/osc/unit/v1/fakes.py

@@ -210,6 +210,7 @@ class FakeCluster(object):
         # set default attributes.
         cluster_info = {
             'status': 'CREATE_IN_PROGRESS',
+            'health_status': 'HEALTHY',
             'cluster_template_id': 'fake-ct',
             'node_addresses': [],
             'uuid': '3a369884-b6ba-484f-a206-919b4b718aff',
@@ -232,6 +233,7 @@ class FakeCluster(object):
             'master_flavor_id': None,
             'flavor_id': 'm1.medium',
             'project_id': None,
+            'health_status_reason': {'api': 'ok'}
         }
 
         # Overwrite default attributes.

magnumclient/tests/osc/unit/v1/test_clusters.py

@@ -183,7 +183,8 @@ class TestClusterList(TestCluster):
         'keypair',
         'node_count',
         'master_count',
-        'status'
+        'status',
+        'health_status'
     ]
 
     datalist = (
@@ -193,7 +194,8 @@ class TestClusterList(TestCluster):
             _cluster.keypair,
             _cluster.node_count,
             _cluster.master_count,
-            _cluster.status
+            _cluster.status,
+            _cluster.health_status,
         ),
     )