Merge pull request #45 from tzumainn/more-node-info

Add node state information

Author: tzumainn

esileapclient/tests/unit/osc/v1/test_node.py

@@ -39,16 +39,18 @@ def test_node_list(self):
         collist = [
             "Name",
             "Owner",
+            "Lessee",
+            "Provision State",
+            "Maintenance",
             "Offer UUID",
             "Lease UUID",
-            "Lessee"
         ]
 
         self.assertEqual(collist, list(columns))
 
         datalist = ((fakes.node_name,
                      fakes.node_owner,
-                     '', '', ''
+                     '', '', '', '', ''
                      ),)
         self.assertEqual(datalist, tuple(data))
 
@@ -65,21 +67,23 @@ def test_node_list_long(self):
         self.client_mock.node.list.assert_called_with(filters)
 
         long_collist = [
-            "Name",
             "UUID",
+            "Name",
             "Owner",
+            "Lessee",
+            "Provision State",
+            "Maintenance",
             "Offer UUID",
             "Lease UUID",
-            "Lessee",
             "Future Offers",
             "Future Leases"
         ]
 
         self.assertEqual(long_collist, list(columns))
 
-        datalist = ((fakes.node_name,
-                     fakes.node_uuid,
+        datalist = ((fakes.node_uuid,
+                     fakes.node_name,
                      fakes.node_owner,
-                     '', '', '', '', ''
+                     '', '', '', '', '', '', ''
                      ),)
         self.assertEqual(datalist, tuple(data))

esileapclient/v1/node.py

@@ -21,27 +21,32 @@
 class Node(base.Resource):
 
     detailed_fields = {
-        'name': "Name",
         'uuid': "UUID",
+        'name': "Name",
         'owner': "Owner",
+        'lessee': "Lessee",
+        'provision_state': "Provision State",
+        'maintenance': "Maintenance",
         'offer_uuid': "Offer UUID",
         'lease_uuid': "Lease UUID",
-        'lessee': "Lessee",
         'future_offers': "Future Offers",
         'future_leases': "Future Leases"
     }
 
     fields = {
         'name': "Name",
         'owner': "Owner",
+        'lessee': "Lessee",
+        'provision_state': "Provision State",
+        'maintenance': "Maintenance",
         'offer_uuid': "Offer UUID",
         'lease_uuid': "Lease UUID",
-        'lessee': "Lessee"
     }
 
     _creation_attributes = ['name', 'uuid', 'owner', 'offer_uuid',
                             'lessee', 'lease_uuid', 'future_offers',
-                            'future_leases']
+                            'future_leases', 'provision_state',
+                            'maintenace']
 
     def __repr__(self):
         return "<Node %s>" % self._info