diff options
author | Cole Robinson <crobinso@redhat.com> | 2022-08-01 05:56:25 -0400 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2022-08-01 06:04:48 -0400 |
commit | 8079c421bd8b377c14af4d094818a3ff589c03bb (patch) | |
tree | a0b2a0eb92850566613ac20da3f194cd65c3b88c /virtinst | |
parent | aeffa4f7110ae3afe7f43a2ac871bebf1d9f6e14 (diff) | |
download | virt-manager-8079c421bd8b377c14af4d094818a3ff589c03bb.tar.gz |
connection: De-duplicate ui and cli version logging
Remove the open coded version logging in cli.py and virt-manager
connection.py, and move it into virtinst connection open
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Diffstat (limited to 'virtinst')
-rw-r--r-- | virtinst/cli.py | 13 | ||||
-rw-r--r-- | virtinst/connection.py | 20 |
2 files changed, 21 insertions, 12 deletions
diff --git a/virtinst/cli.py b/virtinst/cli.py index 58fda280..3c0252b1 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -214,21 +214,10 @@ def getConnection(uri, conn=None): # preopened connection passed in via test suite return conn - def format_version(num): - log.debug(num) - maj = int(num / 1000000) - min = int(num / 1000) % 1000 - mic = num % 1000 - return "%s.%s.%s" % (maj, min, mic) - log.debug("Requesting libvirt URI %s", (uri or "default")) conn = VirtinstConnection(uri) conn.open(_openauth_cb, None) - log.debug("Received libvirt URI %s versions library=%s driver=%s hypervisor=%s", - conn.uri, - format_version(libvirt.getVersion()), - format_version(conn.getLibVersion()), - format_version(conn.getVersion())) + log.debug("Received libvirt URI %s", conn.uri) return conn diff --git a/virtinst/connection.py b/virtinst/connection.py index cf36a6d5..98756043 100644 --- a/virtinst/connection.py +++ b/virtinst/connection.py @@ -114,6 +114,23 @@ class VirtinstConnection(object): return self._libvirtconn + ################### + # Private helpers # + ################### + + def _log_versions(self): + def format_version(num): + major = int(num / 1000000) + minor = int(num / 1000) % 1000 + micro = num % 1000 + return "%s.%s.%s" % (major, minor, micro) + + log.debug("libvirt URI versions library=%s driver=%s hypervisor=%s", + format_version(self.local_libvirt_version()), + format_version(self.daemon_version()), + format_version(self.conn_version())) + + ############## # Public API # ############## @@ -163,6 +180,9 @@ class VirtinstConnection(object): self._uri = self._libvirtconn.getURI() self._uriobj = URI(self._uri) + self._log_versions() + self._get_caps() # cache and log capabilities + def get_libvirt_data_root_dir(self): if self.is_privileged(): return "/var/lib/libvirt" |