http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py index 1bfa173..e32f1a2 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py @@ -25,13 +25,15 @@ from resource_management.libraries.functions import conf_select @patch("os.path.exists", new = MagicMock(return_value=True)) class TestHookAfterInstall(RMFTestCase): + CONFIG_OVERRIDES = {"serviceName":"HIVE", "role":"HIVE_SERVER"} def test_hook_default(self): self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py", classname="AfterInstallHook", command="hook", - config_file="default.json" + config_file="default.json", + config_overrides = self.CONFIG_OVERRIDES ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', @@ -44,7 +46,7 @@ class TestHookAfterInstall(RMFTestCase): self.assertNoMoreResources() - @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1243")) + @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1234")) @patch("resource_management.libraries.functions.conf_select.create") @patch("resource_management.libraries.functions.conf_select.select") @patch("os.symlink") @@ -67,11 +69,12 @@ class TestHookAfterInstall(RMFTestCase): self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py", classname="AfterInstallHook", command="hook", - config_dict = json_content) + config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES) - self.assertResourceCalled('Execute', 'ambari-sudo.sh /usr/bin/hdp-select set all `ambari-python-wrap /usr/bin/hdp-select versions | grep ^2.3 | tail -1`', - only_if = 'ls -d /usr/hdp/2.3*') + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', '2.3.0.0-1234'), + sudo = True) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', @@ -105,7 +108,7 @@ class TestHookAfterInstall(RMFTestCase): self.assertNoMoreResources() - @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1243")) + @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1234")) @patch("resource_management.libraries.functions.conf_select.create") @patch("resource_management.libraries.functions.conf_select.select") @patch("os.symlink") @@ -134,11 +137,12 @@ class TestHookAfterInstall(RMFTestCase): self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py", classname="AfterInstallHook", command="hook", - config_dict = json_content) + config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES) - self.assertResourceCalled('Execute', 'ambari-sudo.sh /usr/bin/hdp-select set all `ambari-python-wrap /usr/bin/hdp-select versions | grep ^2.3 | tail -1`', - only_if = 'ls -d /usr/hdp/2.3*') + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', '2.3.0.0-1234'), + sudo = True) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', @@ -173,7 +177,7 @@ class TestHookAfterInstall(RMFTestCase): self.assertNoMoreResources() - @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1243")) + @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1234")) @patch("resource_management.libraries.functions.conf_select.create") @patch("resource_management.libraries.functions.conf_select.select") @patch("os.symlink") @@ -207,12 +211,13 @@ class TestHookAfterInstall(RMFTestCase): self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py", classname="AfterInstallHook", command="hook", - config_dict = json_content) + config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES) - self.assertResourceCalled('Execute', 'ambari-sudo.sh /usr/bin/hdp-select set all `ambari-python-wrap /usr/bin/hdp-select versions | grep ^2.3.0.0-1234 | tail -1`', - only_if = 'ls -d /usr/hdp/2.3.0.0-1234*') + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', '2.3.0.0-1234'), + sudo = True) - @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1243")) + @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1234")) @patch("resource_management.libraries.functions.conf_select.create") @patch("resource_management.libraries.functions.conf_select.select") @patch("os.symlink") @@ -236,7 +241,8 @@ class TestHookAfterInstall(RMFTestCase): self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py", classname="AfterInstallHook", command="hook", - config_dict = json_content) + config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES) # same assertions as test_hook_default_conf_select, but skip hdp-select set all @@ -274,7 +280,7 @@ class TestHookAfterInstall(RMFTestCase): @patch("resource_management.core.Logger.warning") - @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1243")) + @patch("shared_initialization.load_version", new = MagicMock(return_value="2.3.0.0-1234")) @patch("resource_management.libraries.functions.conf_select.create") @patch("resource_management.libraries.functions.conf_select.select") @patch("os.symlink") @@ -303,6 +309,7 @@ class TestHookAfterInstall(RMFTestCase): self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py", classname="AfterInstallHook", command="hook", - config_dict = json_content) + config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES) - logger_warning_mock.assert_any_call('Skipping running stack-selector-tool for stack 2.3.0.0-1234 as its a sys_prepped host. This may cause symlink pointers not to be created for HDP componets installed later on top of an already sys_prepped host.') + logger_warning_mock.assert_any_call('Skipping running stack-selector-tool becase this is a sys_prepped host. This may cause symlink pointers not to be created for HDP componets installed later on top of an already sys_prepped host.')
http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py index b9747a2..dcc649d 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py @@ -27,6 +27,8 @@ class TestFalconClient(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "FALCON/0.5.0.2.1/package" STACK_VERSION = "2.1" + CONFIG_OVERRIDES = {"serviceName":"FALCON", "role":"FALCON_CLIENT"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/falcon_client.py", classname="FalconClient", @@ -101,6 +103,7 @@ class TestFalconClient(RMFTestCase): classname = "FalconClient", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', @@ -120,6 +123,7 @@ class TestFalconClient(RMFTestCase): classname = "FalconClient", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py index 44da365..a7e6a1e 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py @@ -33,6 +33,8 @@ class TestFalconServer(RMFTestCase): UPGRADE_STACK_VERSION = "2.2" DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'] + CONFIG_OVERRIDES = {"serviceName":"FALCON", "role":"FALCON_SERVER"} + def test_start_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/falcon_server.py", classname="FalconServer", @@ -225,6 +227,7 @@ class TestFalconServer(RMFTestCase): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/falcon_server.py", classname = "FalconServer", command = "restart", config_file = "falcon-upgrade.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -427,6 +430,7 @@ class TestFalconServer(RMFTestCase): classname = "FalconServer", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', @@ -463,6 +467,7 @@ class TestFalconServer(RMFTestCase): classname = "FalconServer", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index 3556e34..796b107 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -33,6 +33,8 @@ class TestHiveMetastore(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package" STACK_VERSION = "2.0.6" + CONFIG_OVERRIDES = { "serviceName" : "HIVE", "role" : "HIVE_METASTORE" } + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_metastore.py", classname = "HiveMetastore", @@ -417,6 +419,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', @@ -438,6 +441,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], @@ -552,6 +556,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], @@ -571,7 +576,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalledIgnoreEarlier('Directory', '/var/lib/hive', owner = 'hive', group = 'hadoop', mode = 0755, create_parents = True, cd_access = 'a') - self.assertResourceCalled('Execute', ('rm', '-f', '/usr/hdp/current/hive-server2/lib/ojdbc6.jar'), + self.assertResourceCalled('Execute', ('rm', '-f', '/usr/hdp/current/hive-metastore/lib/ojdbc6.jar'), path = ['/bin', '/usr/bin/'], sudo = True) @@ -708,6 +713,7 @@ class TestHiveMetastore(RMFTestCase): classname = "HiveMetastore", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], @@ -724,7 +730,7 @@ class TestHiveMetastore(RMFTestCase): mode = 0755, create_parents = True, cd_access = 'a') self.assertResourceCalled('Execute', - ('rm', '-f', '/usr/hdp/current/hive-server2/lib/ojdbc6.jar'), + ('rm', '-f', '/usr/hdp/current/hive-metastore/lib/ojdbc6.jar'), path=["/bin", "/usr/bin/"], sudo = True) @@ -738,41 +744,41 @@ class TestHiveMetastore(RMFTestCase): sudo = True) self.assertResourceCalled('Execute', - ('yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/java/* /usr/hdp/current/hive-server2/lib')) + ('yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/java/* /usr/hdp/current/hive-metastore/lib')) self.assertResourceCalled('Directory', - '/usr/hdp/current/hive-server2/lib/native/lib64', + '/usr/hdp/current/hive-metastore/lib/native/lib64', create_parents = True) self.assertResourceCalled('Execute', - ('yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/native/lib64/* /usr/hdp/current/hive-server2/lib/native/lib64')) + ('yes | ambari-sudo.sh cp /tmp/sqla-client-jdbc/native/lib64/* /usr/hdp/current/hive-metastore/lib/native/lib64')) self.assertResourceCalled('Execute', - ('ambari-sudo.sh chown -R hive:hadoop /usr/hdp/current/hive-server2/lib/*')) + ('ambari-sudo.sh chown -R hive:hadoop /usr/hdp/current/hive-metastore/lib/*')) self.assertResourceCalled('File', '/usr/hdp/2.3.0.0-1234/hive/lib/sqla-client-jdbc.tar.gz', mode = 0644, ) self.assertResourceCalled('Execute', - ('yes | ambari-sudo.sh cp /usr/hdp/current/hive-server2/lib/*.jar /usr/hdp/2.3.0.0-1234/hive/lib')) + ('yes | ambari-sudo.sh cp /usr/hdp/current/hive-metastore/lib/*.jar /usr/hdp/2.3.0.0-1234/hive/lib')) self.assertResourceCalled('Directory', '/usr/hdp/2.3.0.0-1234/hive/lib/native/lib64', create_parents = True) self.assertResourceCalled('Execute', - ('yes | ambari-sudo.sh cp /usr/hdp/current/hive-server2/lib/native/lib64/* /usr/hdp/2.3.0.0-1234/hive/lib/native/lib64')) + ('yes | ambari-sudo.sh cp /usr/hdp/current/hive-metastore/lib/native/lib64/* /usr/hdp/2.3.0.0-1234/hive/lib/native/lib64')) self.assertResourceCalled('Execute', - ('ambari-sudo.sh chown -R hive:hadoop /usr/hdp/current/hive-server2/lib/*')) + ('ambari-sudo.sh chown -R hive:hadoop /usr/hdp/current/hive-metastore/lib/*')) self.assertResourceCalled('File', '/usr/hdp/2.3.0.0-1234/hive/lib/sqla-client-jdbc.tar.gz', mode = 0644, ) self.assertResourceCalled('Execute', "/usr/hdp/2.3.0.0-1234/hive/bin/schematool -dbType sqlanywhere -upgradeSchema", - logoutput = True, environment = {'HIVE_CONF_DIR': '/usr/hdp/current/hive-server2/conf/conf.server'}, + logoutput = True, environment = {'HIVE_CONF_DIR': '/usr/hdp/current/hive-metastore/conf/conf.server'}, tries = 1, user = 'hive') http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py index f208d3a..608b156 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py @@ -27,6 +27,8 @@ from test_storm_base import TestStormBase @patch("resource_management.libraries.functions.get_user_call_output.get_user_call_output", new=MagicMock(return_value=(0, '123', ''))) class TestStormDrpcServer(TestStormBase): + CONFIG_OVERRIDES = {"serviceName":"STORM", "role":"DRPC_SERVER"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/drpc_server.py", classname = "DrpcServer", @@ -144,6 +146,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "pre_upgrade_restart", config_file="default.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -161,6 +164,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py index fd25126..ab5da22 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py @@ -26,6 +26,7 @@ from test_storm_base import TestStormBase @patch("resource_management.libraries.functions.get_user_call_output.get_user_call_output", new=MagicMock(return_value=(0, '123', ''))) class TestStormNimbus(TestStormBase): + CONFIG_OVERRIDES = {"serviceName":"STORM", "role":"NIMBUS"} def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nimbus.py", @@ -282,6 +283,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "pre_upgrade_restart", config_file="default.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -300,6 +302,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py index 850a98b..efa50c8 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py @@ -25,6 +25,7 @@ import resource_management.core.source from test_storm_base import TestStormBase class TestStormNimbus(TestStormBase): + CONFIG_OVERRIDES = {"serviceName":"STORM", "role":"NIMBUS"} def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nimbus_prod.py", @@ -117,6 +118,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "pre_upgrade_restart", config_file="default.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -136,6 +138,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, '')], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py index b7ec7ba..116597b 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py @@ -27,6 +27,8 @@ from test_storm_base import TestStormBase @patch("resource_management.libraries.functions.get_user_call_output.get_user_call_output", new=MagicMock(return_value=(0, '123', ''))) class TestStormSupervisor(TestStormBase): + CONFIG_OVERRIDES = {"serviceName":"STORM", "role":"SUPERVISOR"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/supervisor.py", classname = "Supervisor", @@ -182,6 +184,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "pre_upgrade_restart", config_file="default.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -200,6 +203,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py index 21c5f2c..46221a9 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py @@ -27,6 +27,8 @@ from test_storm_base import TestStormBase @patch("resource_management.libraries.functions.get_user_call_output.get_user_call_output", new=MagicMock(return_value=(0, '123', ''))) class TestStormSupervisor(TestStormBase): + CONFIG_OVERRIDES = {"serviceName":"STORM", "role":"SUPERVISOR"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/supervisor_prod.py", classname = "Supervisor", @@ -159,6 +161,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "pre_upgrade_restart", config_file="default.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -178,6 +181,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py index 3ac38c7..985c754 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py @@ -27,6 +27,8 @@ from test_storm_base import TestStormBase @patch("resource_management.libraries.functions.get_user_call_output.get_user_call_output", new=MagicMock(return_value=(0, '123', ''))) class TestStormUiServer(TestStormBase): + CONFIG_OVERRIDES = {"serviceName":"STORM", "role":"STORM_UI_SERVER"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/ui_server.py", classname = "UiServer", @@ -209,10 +211,10 @@ class TestStormUiServer(TestStormBase): ) self.assertNoMoreResources() - def test_pre_upgrade_restart(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/ui_server.py", classname = "UiServer", command = "pre_upgrade_restart", + config_overrides = self.CONFIG_OVERRIDES, config_file="default.json", stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -231,6 +233,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py index e63090a..bd7567a 100644 --- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py +++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py @@ -27,6 +27,8 @@ class TestTezClient(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "TEZ/0.4.0.2.1/package" STACK_VERSION = "2.1" + CONFIG_OVERRIDES = {"serviceName":"TEZ", "role":"TEZ_CLIENT"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/tez_client.py", classname = "TezClient", @@ -70,6 +72,7 @@ class TestTezClient(RMFTestCase): classname = "TezClient", command = "restart", config_file="client-upgrade.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -84,6 +87,7 @@ class TestTezClient(RMFTestCase): classname = "TezClient", command = "restart", config_file="client-upgrade.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py index 2ebb315..8cd996e 100644 --- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py +++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py @@ -34,6 +34,8 @@ class TestAppTimelineServer(RMFTestCase): STACK_VERSION = "2.0.6" DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'] + CONFIG_OVERRIDES = {"serviceName":"YARN", "role":"APP_TIMELINE_SERVER"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/application_timeline_server.py", classname="ApplicationTimelineServer", @@ -294,6 +296,7 @@ class TestAppTimelineServer(RMFTestCase): classname = "ApplicationTimelineServer", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, '')], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py b/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py index e3430e5..3ffd0a9 100644 --- a/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py +++ b/ambari-server/src/test/python/stacks/2.2/ACCUMULO/test_accumulo_client.py @@ -29,6 +29,8 @@ class TestAccumuloClient(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "ACCUMULO/1.6.1.2.2.0/package" STACK_VERSION = "2.1" + CONFIG_OVERRIDES = {"serviceName":"ACCUMULO", "role":"ACCUMULO_CLIENT"} + def test_pre_upgrade_restart(self): config_file = self.get_src_folder() + "/test/python/stacks/2.2/configs/default.json" with open(config_file, "r") as f: @@ -41,6 +43,7 @@ class TestAccumuloClient(RMFTestCase): classname = "AccumuloClient", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -62,6 +65,7 @@ class TestAccumuloClient(RMFTestCase): classname = "AccumuloClient", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py b/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py index d6afa50..477830e 100644 --- a/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py +++ b/ambari-server/src/test/python/stacks/2.2/KAFKA/test_kafka_broker.py @@ -28,6 +28,8 @@ class TestKafkaBroker(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "KAFKA/0.8.1/package" STACK_VERSION = "2.2" + CONFIG_OVERRIDES = {"serviceName":"KAFKA", "role":"KAFKA_BROKER"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/kafka_broker.py", classname = "KafkaBroker", @@ -133,6 +135,7 @@ class TestKafkaBroker(RMFTestCase): classname = "KafkaBroker", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', @@ -152,6 +155,7 @@ class TestKafkaBroker(RMFTestCase): classname = "KafkaBroker", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py index 638f92e..d4dcc48 100644 --- a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py +++ b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py @@ -27,6 +27,8 @@ class TestSliderClient(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "SLIDER/0.60.0.2.2/package" STACK_VERSION = "2.2" + CONFIG_OVERRIDES = {"serviceName":"SLIDER", "role":"SLIDER"} + def test_configure_default(self): self.maxDiff = None self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/slider_client.py", @@ -168,6 +170,7 @@ class TestSliderClient(RMFTestCase): classname = "SliderClient", command = "pre_upgrade_restart", config_file="default.json", + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -187,6 +190,7 @@ class TestSliderClient(RMFTestCase): classname = "SliderClient", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')], @@ -194,6 +198,8 @@ class TestSliderClient(RMFTestCase): self.assertResourceCalledIgnoreEarlier("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'slider-client', '2.3.0.0-1234'), sudo=True) self.assertResourceCalledIgnoreEarlier("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled('Link', '/etc/hadoop/conf', to='/usr/hdp/current/hadoop-client/conf') + self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py index 186ff72..b87f8fc 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py @@ -30,6 +30,8 @@ class TestJobHistoryServer(RMFTestCase): STACK_VERSION = "2.2" DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'] + CONFIG_OVERRIDES = {"serviceName":"SPARK", "role":"SPARK_JOBHISTORYSERVER"} + @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") def test_configure_default(self, copy_to_hdfs_mock): copy_to_hdfs_mock = True @@ -334,6 +336,7 @@ class TestJobHistoryServer(RMFTestCase): classname = "JobHistoryServer", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py index 0921edc..3fe59ad 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py @@ -29,6 +29,8 @@ class TestSparkClient(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "SPARK/1.2.1/package" STACK_VERSION = "2.2" + CONFIG_OVERRIDES = {"serviceName":"SPARK", "role":"SPARK_CLIENT"} + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/spark_client.py", classname = "SparkClient", @@ -163,6 +165,7 @@ class TestSparkClient(RMFTestCase): classname = "SparkClient", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], @@ -192,6 +195,7 @@ class TestSparkClient(RMFTestCase): classname = "SparkClient", command = "stack_upgrade_save_new_config", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py index 17be97f..9286b7a 100644 --- a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py +++ b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py @@ -29,6 +29,8 @@ class TestMahoutClient(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "MAHOUT/1.0.0.2.3/package" STACK_VERSION = "2.3" + CONFIG_OVERRIDES = {"serviceName":"MAHOUT", "role":"MAHOUT"} + def test_configure_default(self): self.executeScript( self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mahout_client.py", @@ -73,6 +75,7 @@ class TestMahoutClient(RMFTestCase): classname = "MahoutClient", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -98,6 +101,7 @@ class TestMahoutClient(RMFTestCase): classname = "MahoutClient", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = itertools.cycle([(0, None, '')]), http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py index e8e9320..ddd1ab3 100644 --- a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py +++ b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py @@ -30,6 +30,8 @@ class TestSparkThriftServer(RMFTestCase): STACK_VERSION = "2.3" DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'] + CONFIG_OVERRIDES = {"serviceName":"SPARK", "role":"SPARK_THRIFTSERVER"} + @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") def test_configure_default(self, copy_to_hdfs_mock): copy_to_hdfs_mock = True @@ -180,6 +182,7 @@ class TestSparkThriftServer(RMFTestCase): classname = "SparkThriftServer", command = "pre_upgrade_restart", config_dict = json_content, + config_overrides = self.CONFIG_OVERRIDES, stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/test/python/stacks/utils/RMFTestCase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py index b19920f..3612890 100644 --- a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py +++ b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py @@ -109,6 +109,9 @@ class RMFTestCase(TestCase): if "stack_features" not in self.config_dict["configurations"]["cluster-env"]: self.config_dict["configurations"]["cluster-env"]["stack_features"] = RMFTestCase.get_stack_features() + if "stack_select_packages" not in self.config_dict["configurations"]["cluster-env"]: + self.config_dict["configurations"]["cluster-env"]["stack_select_packages"] = RMFTestCase.get_stack_select_packages() + if config_overrides: for key, value in config_overrides.iteritems(): self.config_dict[key] = value @@ -191,6 +194,15 @@ class RMFTestCase(TestCase): return f.read() @staticmethod + def get_stack_select_packages(): + """ + Read stack_select_packages config property from resources/stacks/HDP/2.0.6/properties/stack_features.json + """ + stack_features_file = os.path.join(RMFTestCase.get_src_folder(), PATH_TO_STACKS, "2.0.6", "properties", "stack_select_packages.json") + with open(stack_features_file, "r") as f: + return f.read() + + @staticmethod def _getStackTestsFolder(): return os.path.join(RMFTestCase.get_src_folder(), PATH_TO_STACK_TESTS)
