diff --git a/conf/global-config.conf b/conf/global.conf similarity index 100% rename from conf/global-config.conf rename to conf/global.conf diff --git a/scripts/service_installer.py b/scripts/service_installer.py index bd6cf89..86bef92 100644 --- a/scripts/service_installer.py +++ b/scripts/service_installer.py @@ -155,7 +155,7 @@ def install_zeppelin(): # We've copied the necessary files. Once that completes we need to add it to Ambari print('Checking to make sure service is installed') - ambari = config.read_config('global-config.conf')['AMBARI'] + ambari = config.read_config('global.conf')['AMBARI'] installed = check_ambari_service_installed('ZEPPELIN', ambari) cont = '' if not installed: @@ -209,7 +209,7 @@ def install_nifi(): # We've copied the necessary files. Once that completes we need to add it to Ambari print('Checking to make sure service is installed') - ambari = config.read_config('global-config.conf')['AMBARI'] + ambari = config.read_config('global.conf')['AMBARI'] installed = check_ambari_service_installed('NIFI', ambari) cont = '' if not installed: diff --git a/tests/test_service_installer.py b/tests/test_service_installer.py index 69caa57..f327729 100644 --- a/tests/test_service_installer.py +++ b/tests/test_service_installer.py @@ -153,20 +153,20 @@ class TestAmbariServiceCheck(unittest.TestCase): @mock.patch('scripts.curl_client.CurlClient.make_request', side_effect=[['', ''], ['200 OK', '']]) @mock.patch('__builtin__.raw_input', side_effect=['\n', '\n', 'v', 'n']) def test_ambari_check_good(self, mock, mock2): - conf = scripts.config.read_config('global-config.conf')['AMBARI'] + conf = scripts.config.read_config('global.conf')['AMBARI'] assert service_installer.check_ambari_service_installed('ZEPPELIN', conf) == True @mock.patch('scripts.curl_client.CurlClient.make_request', side_effect=[['200 OK', ''], ['200 OK', '']]) @mock.patch('__builtin__.raw_input', side_effect=['\n', '\n', 'v', 'n']) def test_ambari_check_false(self, mock, mock2): - conf = scripts.config.read_config('global-config.conf')['AMBARI'] + conf = scripts.config.read_config('global.conf')['AMBARI'] assert service_installer.check_ambari_service_installed('ZEPPELIN', conf) == True @mock.patch('scripts.curl_client.CurlClient.make_request', side_effect=[['', ''],['', ''], ['', ''], ['', ''], ['', ''], ['', ''], ['', ''], ['', ''], ['', ''], ['', ''], ['', '']]) @mock.patch('__builtin__.raw_input', side_effect=['', '', '', '', '', '', '', '', '', '', '']) def test_ambari_check_many_attempts(self, mock, mock2): - conf = scripts.config.read_config('global-config.conf')['AMBARI'] + conf = scripts.config.read_config('global.conf')['AMBARI'] assert service_installer.check_ambari_service_installed('ZEPPELIN', conf) == False