Re: [PATCH libvirt-python] examples: Fix connection error handling 2

[Michal Privoznik]

On 4/27/20 10:08 AM, Philipp Hahn wrote:

Fix two more cases in examples as
libvirt.open*() does not return None but raises an exception

Fixes: 283e2bc693746164b6e14d6fe3ccd38a07bf
Signed-off-by: Philipp Hahn 
---
  examples/dhcpleases.py | 5 +++--
  examples/domipaddrs.py | 5 +++--
  2 files changed, 6 insertions(+), 4 deletions(-)


Reviewed-by: Michal Privoznik 

and pushed.

Michal

[PATCH libvirt-python] examples: Fix connection error handling 2

[Philipp Hahn]

Fix two more cases in examples as
libvirt.open*() does not return None but raises an exception

Fixes: 283e2bc693746164b6e14d6fe3ccd38a07bf
Signed-off-by: Philipp Hahn 
---
 examples/dhcpleases.py | 5 +++--
 examples/domipaddrs.py | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/examples/dhcpleases.py b/examples/dhcpleases.py
index f394541..6f80fd5 100755
--- a/examples/dhcpleases.py
+++ b/examples/dhcpleases.py
@@ -22,8 +22,9 @@ else:
 usage()
 sys.exit(2)
 
-conn = libvirt.open(uri)
-if conn == None:
+try:
+conn = libvirt.open(uri)
+except libvirt.libvirtError:
 print("Unable to open connection to libvirt")
 sys.exit(1)
 
diff --git a/examples/domipaddrs.py b/examples/domipaddrs.py
index bda308c..e893995 100755
--- a/examples/domipaddrs.py
+++ b/examples/domipaddrs.py
@@ -21,8 +21,9 @@ else:
 usage()
 sys.exit(2)
 
-conn = libvirt.open(uri)
-if conn == None:
+try:
+conn = libvirt.open(uri)
+except libvirt.libvirtError:
 print "Unable to open connection to libvirt"
 sys.exit(1)
 
-- 
2.20.1

Re: [PATCH libvirt-python] examples: Fix connection error handling

[Daniel P . Berrangé]

On Mon, Apr 20, 2020 at 08:05:00AM +0200, Philipp Hahn wrote:
> libvirt.open*() does not return None but raises an exception
> 
> Signed-off-by: Philipp Hahn 
> ---
>  examples/dominfo.py| 5 +++--
>  examples/domrestore.py | 5 +++--
>  examples/domsave.py| 5 +++--
>  examples/domstart.py   | 5 +++--
>  examples/esxlist.py| 6 +++---
>  5 files changed, 15 insertions(+), 11 deletions(-)

Reviewed-by: Daniel P. Berrangé 


and pushed to git

Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

[PATCH libvirt-python] examples: Fix connection error handling

[Philipp Hahn]

libvirt.open*() does not return None but raises an exception

Signed-off-by: Philipp Hahn 
---
 examples/dominfo.py| 5 +++--
 examples/domrestore.py | 5 +++--
 examples/domsave.py| 5 +++--
 examples/domstart.py   | 5 +++--
 examples/esxlist.py| 6 +++---
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/examples/dominfo.py b/examples/dominfo.py
index 0a39f4c..fcfb8ed 100755
--- a/examples/dominfo.py
+++ b/examples/dominfo.py
@@ -34,8 +34,9 @@ if len(sys.argv) != 2:
 name = sys.argv[1]
 
 # Connect to libvirt
-conn = libvirt.openReadOnly(None)
-if conn is None:
+try:
+conn = libvirt.openReadOnly(None)
+except libvirt.libvirtError:
 print('Failed to open connection to the hypervisor')
 sys.exit(1)
 
diff --git a/examples/domrestore.py b/examples/domrestore.py
index 96f4955..7fd5c8e 100755
--- a/examples/domrestore.py
+++ b/examples/domrestore.py
@@ -20,8 +20,9 @@ if len(sys.argv) != 2:
 dir = sys.argv[1]
 imgs = os.listdir(dir)
 
-conn = libvirt.open(None)
-if conn is None:
+try:
+conn = libvirt.open(None)
+except libvirt.libvirtError:
 print('Failed to open connection to the hypervisor')
 sys.exit(1)
 
diff --git a/examples/domsave.py b/examples/domsave.py
index 4940cce..f8922d6 100755
--- a/examples/domsave.py
+++ b/examples/domsave.py
@@ -18,8 +18,9 @@ if len(sys.argv) != 2:
 
 dir = sys.argv[1]
 
-conn = libvirt.open(None)
-if conn is None:
+try:
+conn = libvirt.open(None)
+except libvirt.libvirtError:
 print('Failed to open connection to the hypervisor')
 sys.exit(1)
 
diff --git a/examples/domstart.py b/examples/domstart.py
index 7ff6cb9..f342e95 100755
--- a/examples/domstart.py
+++ b/examples/domstart.py
@@ -32,8 +32,9 @@ if len(sys.argv) != 2:
 
 (name, xmldesc) = read_domain(sys.argv[1])
 
-conn = libvirt.open(None)
-if conn is None:
+try:
+conn = libvirt.open(None)
+except libvirt.libvirtError:
 print('Failed to open connection to the hypervisor')
 sys.exit(1)
 
diff --git a/examples/esxlist.py b/examples/esxlist.py
index d86e064..caeced1 100755
--- a/examples/esxlist.py
+++ b/examples/esxlist.py
@@ -97,9 +97,9 @@ uri = "esx://%s/?no_verify=1" % hostname
 # in order to log into the vCenter
 auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_NOECHOPROMPT],
 request_credentials, None]
-conn = libvirt.openAuth(uri, auth, 0)
-
-if conn is None:
+try:
+conn = libvirt.openAuth(uri, auth, 0)
+except libvirt.libvirtError:
 print("Failed to open connection to %s" % hostname)
 sys.exit(1)
 
-- 
2.20.1