diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-12 20:25:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-12 20:25:45 +0000 |
| commit | d5a011216ea53db537527c98d6745e9117946080 (patch) | |
| tree | 62c7dde9394be25d0e8d4b2578b28cb9e75b25a4 /openstackclient/compute/v2/hypervisor.py | |
| parent | ed4454c5bba8c912c310c92f94a7c17a2b44ee10 (diff) | |
| parent | d6f99b721d3e3978fd6a5438bdacefd5840d3b02 (diff) | |
| download | python-openstackclient-d5a011216ea53db537527c98d6745e9117946080.tar.gz | |
Merge "Fix regular expression for uptime in hypervisor show"
Diffstat (limited to 'openstackclient/compute/v2/hypervisor.py')
| -rw-r--r-- | openstackclient/compute/v2/hypervisor.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openstackclient/compute/v2/hypervisor.py b/openstackclient/compute/v2/hypervisor.py index 00625050..f9051919 100644 --- a/openstackclient/compute/v2/hypervisor.py +++ b/openstackclient/compute/v2/hypervisor.py @@ -98,8 +98,9 @@ class ShowHypervisor(command.ShowOne): # 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']) + m = re.match( + "\s*(.+)\sup\s+(.+),\s+(.+)\susers?,\s+load average:\s(.+)", + uptime['uptime']) if m: hypervisor["host_time"] = m.group(1) hypervisor["uptime"] = m.group(2) |