http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 e8a3135..fba7b9c 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 @@ -32,7 +32,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -45,7 +45,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -74,7 +74,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -94,7 +94,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -105,7 +105,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -134,7 +134,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -154,7 +154,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "pre_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) @@ -171,7 +171,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -217,7 +217,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -240,7 +240,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -257,7 +257,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -276,7 +276,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -286,7 +286,7 @@ class TestStormDrpcServer(TestStormBase): classname = "DrpcServer", command = "security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"})
http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_jaas_configuration.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_jaas_configuration.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_jaas_configuration.py index 74191c1..ddb111b 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_jaas_configuration.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_jaas_configuration.py @@ -30,7 +30,7 @@ class TestStormJaasConfiguration(TestStormBase): classname = "Nimbus", command = "configure", config_file = "default-storm-start.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -40,7 +40,7 @@ class TestStormJaasConfiguration(TestStormBase): classname = "Nimbus", command = "start", config_file = "default-storm-start.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -53,7 +53,7 @@ class TestStormJaasConfiguration(TestStormBase): classname = "Nimbus", command = "configure", config_file = "secured-storm-start.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -64,7 +64,7 @@ class TestStormJaasConfiguration(TestStormBase): classname = "Nimbus", command = "start", config_file = "secured-storm-start.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 8a49505..0f95a0c 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 @@ -32,7 +32,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -43,7 +43,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -74,7 +74,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "start", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -117,7 +117,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -137,7 +137,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -148,7 +148,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -177,7 +177,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -197,7 +197,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "pre_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) @@ -215,7 +215,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -262,7 +262,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -285,7 +285,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -302,7 +302,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -320,7 +320,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -330,7 +330,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 6ed2612..850a98b 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 @@ -31,7 +31,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -42,7 +42,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -61,7 +61,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'supervisorctl stop storm-nimbus', @@ -74,7 +74,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -85,7 +85,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -104,7 +104,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'supervisorctl stop storm-nimbus', @@ -117,7 +117,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "pre_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) @@ -136,7 +136,7 @@ class TestStormNimbus(TestStormBase): classname = "Nimbus", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, '')], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py index d6c2d3c..0fe57cf 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py @@ -32,7 +32,7 @@ class TestStormRestApi(TestStormBase): classname = "StormRestApi", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -43,7 +43,7 @@ class TestStormRestApi(TestStormBase): classname = "StormRestApi", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -73,7 +73,7 @@ class TestStormRestApi(TestStormBase): classname = "StormRestApi", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -93,7 +93,7 @@ class TestStormRestApi(TestStormBase): classname = "StormRestApi", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -104,7 +104,7 @@ class TestStormRestApi(TestStormBase): classname = "StormRestApi", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -133,7 +133,7 @@ class TestStormRestApi(TestStormBase): classname = "StormRestApi", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 82f08a3..c70e06c 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 @@ -32,7 +32,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -43,7 +43,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -85,7 +85,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -115,7 +115,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -126,7 +126,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -168,7 +168,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -198,7 +198,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "pre_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) @@ -216,7 +216,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 df77506..f4f6bae 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 @@ -32,7 +32,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -43,7 +43,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -75,7 +75,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'supervisorctl stop storm-supervisor', @@ -98,7 +98,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -109,7 +109,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -141,7 +141,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -167,7 +167,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "pre_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) @@ -186,7 +186,7 @@ class TestStormSupervisor(TestStormBase): classname = "Supervisor", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 0d45687..a61f5ed 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 @@ -32,7 +32,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -43,7 +43,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -86,7 +86,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -106,7 +106,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -117,7 +117,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -161,7 +161,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh kill 123", @@ -181,7 +181,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "pre_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) @@ -198,7 +198,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -239,7 +239,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -263,7 +263,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -280,7 +280,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -290,7 +290,7 @@ class TestStormUiServer(TestStormBase): classname = "UiServer", command = "security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py index 399d1e2..1d127d2 100644 --- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py @@ -30,7 +30,7 @@ class TestTezServiceCheck(RMFTestCase): classname="TezServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/sample-tez-test', @@ -107,7 +107,7 @@ class TestTezServiceCheck(RMFTestCase): classname="TezServiceCheck", command="service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 6243913..ab08776 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 @@ -32,7 +32,7 @@ class TestTezClient(RMFTestCase): classname = "TezClient", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -63,30 +63,30 @@ class TestTezClient(RMFTestCase): self.assertNoMoreResources() - @patch("resource_management.libraries.functions.get_hdp_version") - def test_upgrade(self, get_hdp_version_mock): + @patch("resource_management.libraries.functions.get_stack_version") + def test_upgrade(self, get_stack_version_mock): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/tez_client.py", classname = "TezClient", command = "restart", config_file="client-upgrade.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - get_hdp_version_mock.return_value = "2.2.1.0-2067" + get_stack_version_mock.return_value = "2.2.1.0-2067" self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) # for now, it's enough that hdp-select is confirmed - @patch("resource_management.libraries.functions.get_hdp_version") - def test_upgrade_23(self, get_hdp_version_mock): + @patch("resource_management.libraries.functions.get_stack_version") + def test_upgrade_23(self, get_stack_version_mock): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/tez_client.py", classname = "TezClient", command = "restart", config_file="client-upgrade.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - get_hdp_version_mock.return_value = "2.2.1.0-2067" + get_stack_version_mock.return_value = "2.2.1.0-2067" self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) # for now, it's enough that hdp-select is confirmed @@ -103,7 +103,7 @@ class TestTezClient(RMFTestCase): classname = "TezClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 4af5f83..132924a 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 @@ -38,7 +38,7 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -49,7 +49,7 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -83,7 +83,7 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -275,7 +275,7 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -320,7 +320,7 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -343,7 +343,7 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -360,7 +360,7 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -379,7 +379,7 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -389,12 +389,12 @@ class TestAppTimelineServer(RMFTestCase): classname="ApplicationTimelineServer", command="security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) - @patch.object(resource_management.libraries.functions, "get_hdp_version", new = MagicMock(return_value='2.3.0.0-1234')) + @patch.object(resource_management.libraries.functions, "get_stack_version", new = MagicMock(return_value='2.3.0.0-1234')) def test_pre_upgrade_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: @@ -407,7 +407,7 @@ class TestAppTimelineServer(RMFTestCase): classname = "ApplicationTimelineServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, '')], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 4f75f62..e3430e5 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 @@ -41,7 +41,7 @@ class TestAccumuloClient(RMFTestCase): classname = "AccumuloClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'accumulo-client', version), sudo=True,) @@ -62,7 +62,7 @@ class TestAccumuloClient(RMFTestCase): classname = "AccumuloClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 f1e0466..117a4bc 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 @@ -33,7 +33,7 @@ class TestKafkaBroker(RMFTestCase): classname = "KafkaBroker", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/var/log/kafka', @@ -80,7 +80,7 @@ class TestKafkaBroker(RMFTestCase): classname = "KafkaBroker", command = "configure", config_file="default_custom_path_config.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -133,7 +133,7 @@ class TestKafkaBroker(RMFTestCase): classname = "KafkaBroker", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'kafka-broker', version), sudo=True,) @@ -152,7 +152,7 @@ class TestKafkaBroker(RMFTestCase): classname = "KafkaBroker", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py b/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py index 0592fc4..b3b7940 100644 --- a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py +++ b/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py @@ -38,7 +38,7 @@ class TestKerberosClient(RMFTestCase): classname="KerberosClient", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -64,7 +64,7 @@ class TestKerberosClient(RMFTestCase): classname="KerberosClient", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -91,7 +91,7 @@ class TestKerberosClient(RMFTestCase): classname="KerberosClient", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -110,7 +110,7 @@ class TestKerberosClient(RMFTestCase): classname="KerberosClient", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -136,7 +136,7 @@ class TestKerberosClient(RMFTestCase): classname="KerberosClient", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -270,7 +270,7 @@ class TestKerberosClient(RMFTestCase): classname="KerberosClient", command="set_keytab", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -347,7 +347,7 @@ class TestKerberosClient(RMFTestCase): classname="KerberosClient", command="remove_keytab", config_dict=json_data, - hdp_stack_version=self.STACK_VERSION, + stack_version=self.STACK_VERSION, target=RMFTestCase.TARGET_COMMON_SERVICES ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py b/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py index 4de232e..a11d596 100644 --- a/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py +++ b/ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_server.py @@ -36,7 +36,7 @@ class TestKerberosServer(RMFTestCase): classname="KerberosServer", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -95,7 +95,7 @@ class TestKerberosServer(RMFTestCase): classname="KerberosServer", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -154,7 +154,7 @@ class TestKerberosServer(RMFTestCase): classname="KerberosServer", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -213,7 +213,7 @@ class TestKerberosServer(RMFTestCase): classname="KerberosServer", command="configure", config_dict=json_data, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py index 7c3b921..fbc55ca 100644 --- a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py +++ b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py @@ -35,7 +35,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -158,7 +158,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -182,7 +182,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -199,7 +199,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file and principal are not set."}) @@ -215,7 +215,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command="security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -225,7 +225,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command="security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -243,7 +243,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('tar', @@ -285,7 +285,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -355,7 +355,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -425,7 +425,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -482,7 +482,7 @@ class TestKnoxGateway(RMFTestCase): classname = "KnoxGateway", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py index bfc8f31..20224ab 100644 --- a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py +++ b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py @@ -33,7 +33,7 @@ class TestPigServiceCheck(RMFTestCase): classname="PigServiceCheck", command="service_check", config_file="pig-service-check-secure.json", - hdp_stack_version=self.STACK_VERSION, + stack_version=self.STACK_VERSION, target=RMFTestCase.TARGET_COMMON_SERVICES ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py index 4c7792d..a5cc123 100644 --- a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py @@ -33,7 +33,7 @@ class TestRangerAdmin(RMFTestCase): classname = "RangerAdmin", command = "configure", config_file="ranger-admin-default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -44,7 +44,7 @@ class TestRangerAdmin(RMFTestCase): classname = "RangerAdmin", command = "start", config_file="ranger-admin-default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -60,7 +60,7 @@ class TestRangerAdmin(RMFTestCase): classname = "RangerAdmin", command = "stop", config_file="ranger-admin-default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/bin/ranger-admin-stop', @@ -74,7 +74,7 @@ class TestRangerAdmin(RMFTestCase): classname = "RangerAdmin", command = "configure", config_file="ranger-admin-secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -85,7 +85,7 @@ class TestRangerAdmin(RMFTestCase): classname = "RangerAdmin", command = "start", config_file="ranger-admin-secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -101,7 +101,7 @@ class TestRangerAdmin(RMFTestCase): classname = "RangerAdmin", command = "stop", config_file="ranger-admin-secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/bin/ranger-admin-stop', @@ -206,7 +206,7 @@ class TestRangerAdmin(RMFTestCase): classname = "RangerAdmin", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py index 2828983..67bbb9d 100644 --- a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py +++ b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_usersync.py @@ -34,7 +34,7 @@ class TestRangerUsersync(RMFTestCase): classname = "RangerUsersync", command = "configure", config_file="ranger-admin-default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -45,7 +45,7 @@ class TestRangerUsersync(RMFTestCase): classname = "RangerUsersync", command = "start", config_file="ranger-admin-default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -61,7 +61,7 @@ class TestRangerUsersync(RMFTestCase): classname = "RangerUsersync", command = "stop", config_file="ranger-admin-default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', ('/usr/bin/ranger-usersync-stop',), @@ -75,7 +75,7 @@ class TestRangerUsersync(RMFTestCase): classname = "RangerUsersync", command = "configure", config_file="ranger-admin-secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -86,7 +86,7 @@ class TestRangerUsersync(RMFTestCase): classname = "RangerUsersync", command = "start", config_file="ranger-admin-secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -102,7 +102,7 @@ class TestRangerUsersync(RMFTestCase): classname = "RangerUsersync", command = "stop", config_file="ranger-admin-secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', ('/usr/bin/ranger-usersync-stop',), @@ -117,7 +117,7 @@ class TestRangerUsersync(RMFTestCase): classname = "RangerUsersync", command = "restart", config_file="ranger-usersync-upgrade.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertTrue(setup_usersync_mock.called) @@ -139,7 +139,7 @@ class TestRangerUsersync(RMFTestCase): classname = "RangerUsersync", command = "restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 2cf6edb..85fc86b 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 @@ -31,7 +31,7 @@ class TestSliderClient(RMFTestCase): classname="SliderClient", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -81,7 +81,7 @@ class TestSliderClient(RMFTestCase): classname="SliderServiceCheck", command="service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -99,7 +99,7 @@ class TestSliderClient(RMFTestCase): classname="SliderServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -117,7 +117,7 @@ class TestSliderClient(RMFTestCase): classname = "SliderClient", command = "pre_upgrade_restart", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'slider-client', '2.2.1.0-2067'), sudo=True) @@ -136,7 +136,7 @@ class TestSliderClient(RMFTestCase): classname = "SliderClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 73322a1..4c3a3d7 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 @@ -24,7 +24,7 @@ from stacks.utils.RMFTestCase import * from only_for_platform import not_for_platform, PLATFORM_WINDOWS @not_for_platform(PLATFORM_WINDOWS) -@patch("resource_management.libraries.functions.get_hdp_version", new=MagicMock(return_value="2.3.0.0-1597")) +@patch("resource_management.libraries.functions.get_stack_version", new=MagicMock(return_value="2.3.0.0-1597")) class TestJobHistoryServer(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "SPARK/1.2.0.2.2/package" STACK_VERSION = "2.2" @@ -36,7 +36,7 @@ class TestJobHistoryServer(RMFTestCase): classname = "JobHistoryServer", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -49,7 +49,7 @@ class TestJobHistoryServer(RMFTestCase): classname = "JobHistoryServer", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -78,7 +78,7 @@ class TestJobHistoryServer(RMFTestCase): classname = "JobHistoryServer", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/hdp/current/spark-client/sbin/stop-history-server.sh', @@ -95,7 +95,7 @@ class TestJobHistoryServer(RMFTestCase): classname = "JobHistoryServer", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -108,7 +108,7 @@ class TestJobHistoryServer(RMFTestCase): classname = "JobHistoryServer", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -143,7 +143,7 @@ class TestJobHistoryServer(RMFTestCase): classname = "JobHistoryServer", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/hdp/current/spark-client/sbin/stop-history-server.sh', @@ -312,7 +312,7 @@ class TestJobHistoryServer(RMFTestCase): classname = "JobHistoryServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 c645b91..68b0f26 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 @@ -24,7 +24,7 @@ from stacks.utils.RMFTestCase import * from only_for_platform import not_for_platform, PLATFORM_WINDOWS @not_for_platform(PLATFORM_WINDOWS) -@patch("resource_management.libraries.functions.get_hdp_version", new=MagicMock(return_value="2.3.0.0-1597")) +@patch("resource_management.libraries.functions.get_stack_version", new=MagicMock(return_value="2.3.0.0-1597")) class TestSparkClient(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "SPARK/1.2.0.2.2/package" STACK_VERSION = "2.2" @@ -34,7 +34,7 @@ class TestSparkClient(RMFTestCase): classname = "SparkClient", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -45,7 +45,7 @@ class TestSparkClient(RMFTestCase): classname = "SparkClient", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -149,7 +149,7 @@ class TestSparkClient(RMFTestCase): classname = "SparkClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py index 444bac7..0987f7c 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py @@ -23,7 +23,7 @@ from stacks.utils.RMFTestCase import * from only_for_platform import not_for_platform, PLATFORM_WINDOWS @not_for_platform(PLATFORM_WINDOWS) -@patch("resource_management.libraries.functions.get_hdp_version", new=MagicMock(return_value="2.3.0.0-1597")) +@patch("resource_management.libraries.functions.get_stack_version", new=MagicMock(return_value="2.3.0.0-1597")) class TestServiceCheck(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "SPARK/1.2.0.2.2/package" STACK_VERSION = "2.2" @@ -33,7 +33,7 @@ class TestServiceCheck(RMFTestCase): classname="SparkServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "curl -s -o /dev/null -w'%{http_code}' --negotiate -u: -k http://localhost:18080 | grep 200", @@ -49,7 +49,7 @@ class TestServiceCheck(RMFTestCase): classname="SparkServiceCheck", command="service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/spark.service.keytab spark/localh...@example.com; ', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py index b4ef2bc..ab5236b 100644 --- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py +++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py @@ -101,7 +101,7 @@ class TestMetadataServer(RMFTestCase): classname = "MetadataServer", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -113,7 +113,7 @@ class TestMetadataServer(RMFTestCase): classname = "MetadataServer", command = "configure", config_file="secure.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -128,7 +128,7 @@ class TestMetadataServer(RMFTestCase): classname = "MetadataServer", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.configureResourcesCalled() @@ -142,7 +142,7 @@ class TestMetadataServer(RMFTestCase): classname = "MetadataServer", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'source /etc/atlas/conf/atlas-env.sh; /usr/hdp/current/atlas-server/bin/atlas_stop.py', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py index 56fc5e4..18205f7 100644 --- a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py +++ b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py @@ -118,7 +118,7 @@ class TestHawqMaster(RMFTestCase): classname = 'HawqMaster', command = 'configure', config_file ='hawq_default.json', - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -133,7 +133,7 @@ class TestHawqMaster(RMFTestCase): classname = 'HawqMaster', command = 'install', config_file ='hawq_default.json', - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -152,7 +152,7 @@ class TestHawqMaster(RMFTestCase): classname = 'HawqMaster', command = 'start', config_file ='hawq_default.json', - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -215,7 +215,7 @@ class TestHawqMaster(RMFTestCase): classname = 'HawqMaster', command = 'start', config_file ='hawq_default.json', - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -276,7 +276,7 @@ class TestHawqMaster(RMFTestCase): classname = 'HawqMaster', command = 'stop', config_file ='hawq_default.json', - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES )
