From c98f0b1232a0b1ce800e4bfc99249a6672e7a835 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Wed, 5 Dec 2018 11:08:21 +0300
Subject: [PATCH] Add lib and qemu version info to compute overview

---
 computes/templates/overview.html | 10 +++++++++-
 computes/views.py                |  2 ++
 vrtManager/connection.py         | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/computes/templates/overview.html b/computes/templates/overview.html
index 8b5ff15..bb18c80 100644
--- a/computes/templates/overview.html
+++ b/computes/templates/overview.html
@@ -42,6 +42,7 @@
                     <p>{% trans "Hostname" %}</p>
                     <p>{% trans "Hypervisors" %}</p>
                     <p>{% trans "Emulator" %}</p>
+                    <p>{% trans "Version" %}</p>
                     <p>{% trans "Memory" %}</p>
                     <p>{% trans "Architecture" %}</p>
                     <p>{% trans "Logical CPUs" %}</p>
@@ -55,10 +56,17 @@
                           <span class="glyphicon glyphicon-chevron-right"></span>
                           <span class="label label-default">{{ arch }}</span>
                           {% for h in hpv %}
-                              <span class="label label-primary">{{ h }}</span>{% endfor %}
+                              <span class="label label-primary">{{ h }}</span>
+                          {% endfor %}
                         {% endfor %}
                     </p>
                     <p>{{ emulator }}</p>
+                    <p>
+                        <span class="label label-default">{% trans 'Qemu' %} </span>
+                        <span class="label label-primary">{{ version }}</span> &nbsp;
+                        <span class="label label-default">{% trans 'Libvirt' %} </span>
+                        <span class="label label-primary">{{ lib_version }}</span> &nbsp;
+                    </p>
                     <p>{{ host_memory|filesizeformat }}</p>
                     <p>{{ host_arch }}</p>
                     <p>{{ logical_cpu }}</p>
diff --git a/computes/views.py b/computes/views.py
index 245fdea..bb9c55e 100644
--- a/computes/views.py
+++ b/computes/views.py
@@ -157,6 +157,8 @@ def overview(request, compute_id):
         hypervisor = conn.hypervisor_type()
         mem_usage = conn.get_memory_usage()
         emulator = conn.get_emulator(host_arch)
+        version = conn.get_version()
+        lib_version = conn.get_lib_version()
         conn.close()
     except libvirtError as lib_err:
         error_messages.append(lib_err)
diff --git a/vrtManager/connection.py b/vrtManager/connection.py
index 7aa6fbf..b918d82 100644
--- a/vrtManager/connection.py
+++ b/vrtManager/connection.py
@@ -361,6 +361,24 @@ class wvmConnect(object):
         virttype = self.hypervisor_type()[arch][0]
         return self.wvm.getDomainCapabilities(emulatorbin, arch, machine, virttype)
 
+    def get_version(self):
+        ver = self.wvm.getVersion()
+        major = ver / 1000000
+        ver = ver % 1000000
+        minor = ver / 1000
+        ver = ver % 1000
+        release = ver
+        return "%s.%s.%s" % (major,minor,release)
+
+    def get_lib_version(self):
+        ver = self.wvm.getLibVersion()
+        major = ver / 1000000
+        ver %= 1000000
+        minor = ver / 1000
+        ver %= 1000
+        release = ver
+        return "%s.%s.%s" % (major,minor,release)
+
     def is_kvm_supported(self):
         """Return KVM capabilities."""
         return util.is_kvm_available(self.get_cap_xml())