Repository: ambari Updated Branches: refs/heads/trunk 7159bdc40 -> 53c391541
http://git-wip-us.apache.org/repos/asf/ambari/blob/53c39154/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py index 2735538..cddb89b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py @@ -26,20 +26,28 @@ origin_exists = os.path.exists side_effect=lambda *args: origin_exists(args[0]) if args[0][-2:] == "j2" else True)) class TestResourceManager(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package" + STACK_VERSION = "2.0.6" def test_configure_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="configure", - config_file="default.json") + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assert_configure_default() self.assertNoMoreResources() def test_start_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="start", - config_file="default.json") + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assert_configure_default() @@ -58,10 +66,13 @@ class TestResourceManager(RMFTestCase): self.assertNoMoreResources() def test_stop_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="stop", - config_file="default.json") + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop resourcemanager', user='yarn') @@ -71,17 +82,23 @@ class TestResourceManager(RMFTestCase): def test_configure_secured(self): - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="configure", - config_file="secured.json") + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assert_configure_secured() def test_start_secured(self): - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="start", - config_file="secured.json") + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assert_configure_secured() @@ -100,10 +117,13 @@ class TestResourceManager(RMFTestCase): self.assertNoMoreResources() def test_stop_secured(self): - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="stop", - config_file="secured.json") + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop resourcemanager', user='yarn') @@ -113,10 +133,12 @@ class TestResourceManager(RMFTestCase): def test_decommission_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname = "Resourcemanager", command = "decommission", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', owner = 'yarn', @@ -130,10 +152,12 @@ class TestResourceManager(RMFTestCase): self.assertNoMoreResources() def test_decommission_secured(self): - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname = "Resourcemanager", command = "decommission", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', owner = 'yarn', @@ -455,10 +479,12 @@ class TestResourceManager(RMFTestCase): get_params_mock.return_value = security_params validate_security_config_mock.return_value = result_issues - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="security_status", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) build_exp_mock.assert_called_with('yarn-site', props_value_check, props_empty_check, props_read_check) @@ -477,10 +503,12 @@ class TestResourceManager(RMFTestCase): cached_kinit_executor_mock.side_effect = Exception("Invalid command") try: - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="security_status", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) except: self.assertTrue(True) @@ -492,10 +520,12 @@ class TestResourceManager(RMFTestCase): put_structured_out_mock.reset_mock() get_params_mock.return_value = empty_security_params - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="security_status", - config_file="secured.json" + config_file="secured.json", + hdp_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."}) @@ -508,17 +538,21 @@ class TestResourceManager(RMFTestCase): validate_security_config_mock.return_value = result_issues_with_params get_params_mock.return_value = security_params - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="security_status", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) # Testing with security_enable = false - self.executeScript("2.0.6/services/YARN/package/scripts/resourcemanager.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname="Resourcemanager", command="security_status", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/53c39154/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py index d3b7bdb..a87cfef 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py @@ -27,12 +27,16 @@ origin_exists = os.path.exists side_effect=lambda *args: origin_exists(args[0]) if args[0][-2:] == "j2" else True)) class TestYarnClient(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package" + STACK_VERSION = "2.0.6" def test_configure_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/yarn_client.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/yarn_client.py", classname = "YarnClient", command = "configure", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', @@ -163,10 +167,12 @@ class TestYarnClient(RMFTestCase): def test_configure_secured(self): - self.executeScript("2.0.6/services/YARN/package/scripts/yarn_client.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/yarn_client.py", classname = "YarnClient", command = "configure", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', @@ -311,11 +317,13 @@ class TestYarnClient(RMFTestCase): self.assertNoMoreResources() def test_restart_client(self): - self.executeScript("2.0.6/services/YARN/package/scripts/yarn_client.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/yarn_client.py", classname = "YarnClient", command = "restart", config_file="default.json", - config_overrides = { 'roleParams' : { "component_category": "CLIENT" } } + config_overrides = { 'roleParams' : { "component_category": "CLIENT" } }, + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', @@ -446,10 +454,13 @@ class TestYarnClient(RMFTestCase): def test_upgrade(self): - self.executeScript("2.0.6/services/YARN/package/scripts/yarn_client.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/yarn_client.py", classname = "YarnClient", command = "restart", - config_file="client-upgrade.json") + config_file="client-upgrade.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") http://git-wip-us.apache.org/repos/asf/ambari/blob/53c39154/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py index 4e4f88e..0daa824 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py @@ -23,13 +23,17 @@ from stacks.utils.RMFTestCase import * @patch("sys.executable", new = '/usr/bin/python2.6') class TestServiceCheck(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package" + STACK_VERSION = "2.0.6" def test_service_check_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/service_check.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py", classname="ServiceCheck", command="service_check", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/validateYarnComponentStatus.py', content = StaticFile('validateYarnComponentStatus.py'), @@ -49,10 +53,12 @@ class TestServiceCheck(RMFTestCase): self.assertNoMoreResources() def test_service_check_secured(self): - self.executeScript("2.0.6/services/YARN/package/scripts/service_check.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py", classname="ServiceCheck", command="service_check", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/validateYarnComponentStatus.py', content = StaticFile('validateYarnComponentStatus.py'), http://git-wip-us.apache.org/repos/asf/ambari/blob/53c39154/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 4da558a..79e6fe7 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 @@ -28,22 +28,29 @@ origin_exists = os.path.exists side_effect=lambda *args: origin_exists(args[0]) if args[0][-2:] == "j2" else True)) class TestAppTimelineServer(RMFTestCase): - + COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package" + STACK_VERSION = "2.0.6" def test_configure_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/application_timeline_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/application_timeline_server.py", classname="ApplicationTimelineServer", command="configure", - config_file="default.json") + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assert_configure_default() self.assertNoMoreResources() def test_start_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/application_timeline_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/application_timeline_server.py", classname="ApplicationTimelineServer", command="start", - config_file="default.json") + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assert_configure_default() @@ -62,10 +69,13 @@ class TestAppTimelineServer(RMFTestCase): self.assertNoMoreResources() def test_stop_default(self): - self.executeScript("2.0.6/services/YARN/package/scripts/application_timeline_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/application_timeline_server.py", classname="ApplicationTimelineServer", command="stop", - config_file="default.json") + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop timelineserver', user='yarn') @@ -208,10 +218,13 @@ class TestAppTimelineServer(RMFTestCase): def test_status(self): - self.executeScript("2.0.6/services/YARN/package/scripts/application_timeline_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/application_timeline_server.py", classname="ApplicationTimelineServer", command="status", - config_file="default.json") + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES + ) self.assertResourceCalled('Execute', 'mv /var/run/hadoop-yarn/yarn/yarn-yarn-historyserver.pid /var/run/hadoop-yarn/yarn/yarn-yarn-timelineserver.pid', only_if = 'test -e /var/run/hadoop-yarn/yarn/yarn-yarn-historyserver.pid', http://git-wip-us.apache.org/repos/asf/ambari/blob/53c39154/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index 1f80d58..acb0bed 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -56,6 +56,7 @@ module.exports = "displayType": "user", "isOverridable": false, "isVisible": App.get('isHadoopWindowsStack'), + "serviceName": "MISC", "filename": "cluster-env.xml", "category": "Users and Groups", "belongsToService": ["HDFS"], @@ -70,6 +71,7 @@ module.exports = "displayType": "password", "isOverridable": false, "isVisible": App.get('isHadoopWindowsStack'), + "serviceName": "MISC", "filename": "cluster-env.xml", "category": "Users and Groups", "belongsToService": ["HDFS"],
