Hello Sandro Bonazzola,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/13468
to review the following change.
Change subject: engine-log-collector - fix exit value on wrong password
......................................................................
engine-log-collector - fix exit value on wrong password
Removed too early exception handling that caused an exit with a
wrong exit code (0 instead of 2) when providing a wrong password.
Change-Id: I6df67832c75ba073d73111a0861c9b6e8a6660ed
Bug-Url: https://bugzilla.redhat.com/788993
Signed-off-by: Sandro Bonazzola <[email protected]>
---
M src/helper/hypervisors.py
1 file changed, 24 insertions(+), 29 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector
refs/changes/68/13468/1
diff --git a/src/helper/hypervisors.py b/src/helper/hypervisors.py
index d0bf301..1f88978 100644
--- a/src/helper/hypervisors.py
+++ b/src/helper/hypervisors.py
@@ -120,33 +120,23 @@
password=password,
ca_file=ca,
insecure=insecure)
- try:
- pi = api.get_product_info()
- if pi is not None:
- vrm = '%s.%s.%s' % (pi.get_version().get_major(),
- pi.get_version().get_minor(),
- pi.get_version().get_revision())
- logging.debug("API Vendor(%s)\tAPI Version(%s)" %
(pi.get_vendor(), vrm))
- else:
- api.test(throw_exception=True)
- except RequestError, re:
- logging.error(_("Unable to connect to REST API. Reason: %s") %
re.reason)
- return None
- except ConnectionError:
- logging.error(_("Problem connecting to the REST API. Is the service
available and does the CA certificate exist?"))
- return None
- except NoCertificatesError:
- logging.error(_("Problem connecting to the REST API. The CA is
invalid. To override use the \'insecure\' option."))
- return None
- except Exception, e:
- logging.error(_("Unable to connect to REST API. Message: %s") % e)
- return None
+ pi = api.get_product_info()
+ if pi is not None:
+ vrm = '%s.%s.%s' % (pi.get_version().get_major(),
+ pi.get_version().get_minor(),
+ pi.get_version().get_revision())
+ logging.debug("API Vendor(%s)\tAPI Version(%s)" % (
+ pi.get_vendor(), vrm)
+ )
+ else:
+ api.test(throw_exception=True)
return api
+
def get_all(hostname, username, password, ca, insecure=False):
tree = ENGINETree()
-
+ result = set()
try:
api = _initialize_api(hostname, username, password, ca, insecure)
if api is not None:
@@ -156,12 +146,17 @@
tree.add_cluster(cluster)
for host in api.hosts.list():
tree.add_host(host)
- return set(tree.get_sortable())
- except RequestError, re:
+ result = set(tree.get_sortable())
+ except RequestError as re:
logging.error(_("Unable to connect to REST API. Reason: %s") %
re.reason)
- except ConnectionError:
- logging.error(_("Problem connecting to the REST API. Is the service
available?"))
- except Exception, e:
+ raise re
+ except ConnectionError as ce:
+ logging.error(_("Problem connecting to the REST API. Is the service
available and does the CA certificate exist?"))
+ raise ce
+ except NoCertificatesError as nce:
+ logging.error(_("Problem connecting to the REST API. The CA is
invalid. To override use the \'insecure\' option."))
+ raise nce
+ except Exception as e:
logging.error(_("Failure fetching information about hypervisors from
API . Error: %s") % e)
- return set()
-
+ raise e
+ return result
--
To view, visit http://gerrit.ovirt.org/13468
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6df67832c75ba073d73111a0861c9b6e8a6660ed
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-log-collector
Gerrit-Branch: ovirt-log-collector-3.2
Gerrit-Owner: Kiril Nesenko <[email protected]>
Gerrit-Reviewer: Sandro Bonazzola <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
