openstack
/
monasca-agent
Code Issues Proposed changes

Merge "Fix urllib references"

This commit is contained in:
Zuul 2018-11-07 07:34:11 +00:00 committed by Gerrit Code Review
parent cb74366bbc b39994529c
commit 35fe8ab679
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monasca_setup/detection/plugins/apache.py
View File

@ -145,19 +145,19 @@ class Apache(monasca_setup.detection.Plugin):
return config
if apache_user and apache_pass:
password_mgr = urllib.HTTPPasswordMgrWithDefaultRealm()
password_mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm()
password_mgr.add_password(None,
apache_url,
apache_user,
apache_pass)
handler = urllib.HTTPBasicAuthHandler(password_mgr)
handler = urllib.request.HTTPBasicAuthHandler(password_mgr)
else:
if 'https' in apache_url:
handler = urllib.HTTPSHandler()
handler = urllib.request.HTTPSHandler()
else:
handler = urllib.HTTPHandler()
handler = urllib.request.HTTPHandler()
opener = urllib.build_opener(handler)
opener = urllib.request.build_opener(handler)
try:
request = opener.open(apache_url)
@ -172,7 +172,7 @@ class Apache(monasca_setup.detection.Plugin):
log.info("\tSuccessfully setup Apache plugin.")
else:
log.warn('Unable to access the Apache server-status URL;' + error_msg)
except urllib.URLError as e:
except urllib.error.URLError as e:
exception_msg = (
'\tError {0} received when accessing url {1}.'.format(e.reason, apache_url) +
'\n\tPlease ensure the Apache web server is running and your configuration ' +

6
monasca_setup/detection/plugins/rabbitmq.py
View File

@ -90,13 +90,13 @@ class RabbitMQ(monasca_setup.detection.Plugin):
:return: bool status of the test
"""
url = self.api_url + '/aliveness-test/%2F'
password_mgr = urllib.HTTPPasswordMgrWithDefaultRealm()
password_mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm()
password_mgr.add_password(None,
self.api_url,
self.user,
self.password)
handler = urllib.HTTPBasicAuthHandler(password_mgr)
opener = urllib.build_opener(handler)
handler = urllib.request.HTTPBasicAuthHandler(password_mgr)
opener = urllib.request.build_opener(handler)
request = opener.open(url)
response = request.read()