Merge "Add 'uptime' in 'hypervisor show'"

Author: Jenkins

openstackclient/compute/v2/hypervisor.py

@@ -16,6 +16,7 @@
 """Hypervisor action implementations"""
 
 import logging
+import re
 import six
 
 from cliff import lister
@@ -76,6 +77,18 @@ def take_action(self, parsed_args):
         hypervisor = utils.find_resource(compute_client.hypervisors,
                                          parsed_args.hypervisor)._info.copy()
 
+        uptime = compute_client.hypervisors.uptime(hypervisor['id'])._info
+        # Extract data from uptime value
+        # format: 0 up 0,  0 users,  load average: 0, 0, 0
+        # example: 17:37:14 up  2:33,  3 users,  load average: 0.33, 0.36, 0.34
+        m = re.match("(.+)\sup\s+(.+),\s+(.+)\susers,\s+load average:\s(.+)",
+                     uptime['uptime'])
+        if m:
+            hypervisor["host_time"] = m.group(1)
+            hypervisor["uptime"] = m.group(2)
+            hypervisor["users"] = m.group(3)
+            hypervisor["load_average"] = m.group(4)
+
         hypervisor["service_id"] = hypervisor["service"]["id"]
         hypervisor["service_host"] = hypervisor["service"]["host"]
         del hypervisor["service"]