diff --git a/monasca_setup/detection/plugins/apache.py b/monasca_setup/detection/plugins/apache.py index 3992a3a1..b118aaff 100644 --- a/monasca_setup/detection/plugins/apache.py +++ b/monasca_setup/detection/plugins/apache.py @@ -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 ' + diff --git a/monasca_setup/detection/plugins/rabbitmq.py b/monasca_setup/detection/plugins/rabbitmq.py index a18f80d3..75f7e9af 100644 --- a/monasca_setup/detection/plugins/rabbitmq.py +++ b/monasca_setup/detection/plugins/rabbitmq.py @@ -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()