http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py index 3fa1c9c..f2d7edb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py @@ -117,37 +117,6 @@ class TestWebHCatServer(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self): - self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 0755, - owner = 'hcat', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/user/hcat', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 0755, - owner = 'hcat', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', None, - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - bin_dir = '/usr/bin', - action = ['create'], - ) self.assertResourceCalled('Directory', '/var/run/webhcat', owner = 'hcat', group = 'hadoop', @@ -165,42 +134,6 @@ class TestWebHCatServer(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hadoop_conf_dir='/etc/hadoop/conf', - hadoop_bin_dir='/usr/bin', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hadoop_conf_dir='/etc/hadoop/conf', - hadoop_bin_dir='/usr/bin', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hadoop_bin_dir='/usr/bin', - hadoop_conf_dir='/etc/hadoop/conf', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/sqoop*.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hadoop_bin_dir='/usr/bin', - hadoop_conf_dir='/etc/hadoop/conf', - hdfs_user='hdfs' - ) self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', owner = 'hcat', group = 'hadoop', @@ -225,37 +158,6 @@ class TestWebHCatServer(RMFTestCase): ) def assert_configure_secured(self): - self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0755, - owner = 'hcat', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/user/hcat', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0755, - owner = 'hcat', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', None, - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - bin_dir = '/usr/bin', - action = ['create'], - ) self.assertResourceCalled('Directory', '/var/run/webhcat', owner = 'hcat', group = 'hadoop', @@ -277,42 +179,6 @@ class TestWebHCatServer(RMFTestCase): path = ['/bin'], user = 'hcat', ) - self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hadoop_conf_dir='/etc/hadoop/conf', - hadoop_bin_dir='/usr/bin', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hadoop_conf_dir='/etc/hadoop/conf', - hadoop_bin_dir='/usr/bin', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hadoop_conf_dir='/etc/hadoop/conf', - hadoop_bin_dir='/usr/bin', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/sqoop*.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hadoop_conf_dir='/etc/hadoop/conf', - hadoop_bin_dir='/usr/bin', - hdfs_user='hdfs' - ) self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', owner = 'hcat', group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py index d0a71c0..b7f8209 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py @@ -50,17 +50,27 @@ class TestOozieServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled('HdfsDirectory', '/user/oozie', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0775, - owner = 'oozie', - bin_dir = '/usr/bin', - action = ['create'], - ) + self.assertResourceCalled('HdfsResource', '/user/oozie', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'oozie', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + mode = 0775, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', group = 'hadoop', @@ -325,16 +335,26 @@ class TestOozieServer(RMFTestCase): def assert_configure_default(self): - self.assertResourceCalled('HdfsDirectory', '/user/oozie', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0775, - owner = 'oozie', - bin_dir = '/usr/bin', - action = ['create'], + self.assertResourceCalled('HdfsResource', '/user/oozie', + security_enabled = False, + hadoop_conf_dir = '/etc/hadoop/conf', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'oozie', + hadoop_bin_dir = '/usr/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0775, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', @@ -481,17 +501,29 @@ class TestOozieServer(RMFTestCase): def assert_configure_secured(self): - self.assertResourceCalled('HdfsDirectory', '/user/oozie', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0775, - owner = 'oozie', - bin_dir = '/usr/bin', - action = ['create'], - ) + self.assertResourceCalled('HdfsResource', '/user/oozie', + security_enabled = True, + hadoop_conf_dir = '/etc/hadoop/conf', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'oozie', + hadoop_bin_dir = '/usr/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0775, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', group = 'hadoop', @@ -829,9 +861,30 @@ class TestOozieServer(RMFTestCase): self.assertEqual(glob_mock.call_count,1) glob_mock.assert_called_with('/usr/hdp/2.2.1.0-2135/hadoop/lib/hadoop-lzo*.jar') - self.assertResourceCalled('Execute', 'hdp-select set oozie-server 2.2.1.0-2135') - self.assertResourceCalled('Execute', 'hdfs dfs -chown oozie:hadoop /user/oozie/share', user='oozie') - self.assertResourceCalled('Execute', 'hdfs dfs -chmod -R 755 /user/oozie/share', user='oozie') + self.assertResourceCalled('Execute', 'hdp-select set oozie-server 2.2.1.0-2135',) + self.assertResourceCalled('HdfsResource', '/user/oozie/share', + security_enabled = False, + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + keytab = UnknownConfigurationMock(), + user = 'hdfs', + kinit_path_local = '/usr/bin/kinit', + recursive_chmod = True, + owner = 'oozie', + group = 'hadoop', + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0755, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + ) self.assertResourceCalled('Execute', '/usr/hdp/current/oozie-server/bin/ooziedb.sh upgrade -run', user='oozie') self.assertResourceCalled('Execute', '/usr/hdp/current/oozie-server/bin/oozie-setup.sh sharelib create -fs hdfs://c6401.ambari.apache.org:8020', user='oozie') @@ -890,9 +943,32 @@ class TestOozieServer(RMFTestCase): glob_mock.assert_called_with('/usr/hdp/2.3.0.0-1234/hadoop/lib/hadoop-lzo*.jar') self.assertResourceCalled('Execute', 'hdp-select set oozie-server 2.3.0.0-1234') - self.assertResourceCalled('Execute', 'hdfs dfs -chown oozie:hadoop /user/oozie/share', user='oozie') - self.assertResourceCalled('Execute', 'hdfs dfs -chmod -R 755 /user/oozie/share', user='oozie') - self.assertResourceCalled('Execute', '/usr/hdp/current/oozie-server/bin/ooziedb.sh upgrade -run', user='oozie') + self.assertResourceCalled('HdfsResource', '/user/oozie/share', + security_enabled = False, + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + keytab = UnknownConfigurationMock(), + user = 'hdfs', + kinit_path_local = '/usr/bin/kinit', + recursive_chmod = True, + owner = 'oozie', + group = 'hadoop', + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0755, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + ) + self.assertResourceCalled('Execute', '/usr/hdp/current/oozie-server/bin/ooziedb.sh upgrade -run', + user = 'oozie', + ) self.assertResourceCalled('Execute', '/usr/hdp/current/oozie-server/bin/oozie-setup.sh sharelib create -fs hdfs://c6401.ambari.apache.org:8020', user='oozie') self.assertNoMoreResources() @@ -943,8 +1019,29 @@ class TestOozieServer(RMFTestCase): isfile_mock.assert_called_with('/usr/share/HDP-oozie/ext-2.2.zip') self.assertResourceCalled('Execute', 'hdp-select set oozie-server 2.2.0.0-0000') - self.assertResourceCalled('Execute', 'hdfs dfs -chown oozie:hadoop /user/oozie/share', user='oozie') - self.assertResourceCalled('Execute', 'hdfs dfs -chmod -R 755 /user/oozie/share', user='oozie') + self.assertResourceCalled('HdfsResource', '/user/oozie/share', + security_enabled = False, + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + keytab = UnknownConfigurationMock(), + user = 'hdfs', + kinit_path_local = '/usr/bin/kinit', + recursive_chmod = True, + owner = 'oozie', + group = 'hadoop', + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0755, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + ) self.assertResourceCalled('Execute', '/usr/hdp/current/oozie-server/bin/ooziedb.sh upgrade -run', user='oozie') self.assertResourceCalled('Execute', '/usr/hdp/current/oozie-server/bin/oozie-setup.sh sharelib create -fs hdfs://c6401.ambari.apache.org:8020', user='oozie') http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py index bcd5ad9..151ce14 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py @@ -21,6 +21,7 @@ from stacks.utils.RMFTestCase import * import resource_management.libraries.functions from mock.mock import MagicMock, call, patch +@patch("glob.glob", new = MagicMock(return_value="/usr/something/oozie-client/lib")) @patch("platform.linux_distribution", new = MagicMock(return_value="Linux")) class TestServiceCheck(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "OOZIE/4.0.0.2.0/package" @@ -55,10 +56,50 @@ class TestServiceCheck(RMFTestCase): content = StaticFile('oozieSmoke2.sh'), mode = 0755, ) - self.assertResourceCalled('Execute', '/tmp/oozieSmoke2.sh', + self.assertResourceCalled('File', '/tmp/prepareOozieHdfsDirectories.sh', + content = StaticFile('prepareOozieHdfsDirectories.sh'), + mode = 0755, + ) + self.assertResourceCalled('Execute', '/tmp/prepareOozieHdfsDirectories.sh /etc/oozie/conf / /etc/hadoop/conf ', logoutput = True, tries = 3, - command = '/tmp/oozieSmoke2.sh suse /var/lib/oozie /etc/oozie/conf /usr/bin /etc/hadoop/conf /usr/bin ambari-qa False', + try_sleep = 5, + ) + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/examples', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + source = '//examples', + user = 'hdfs', + action = ['create_on_execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + ) + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/input-data', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + source = '//examples/input-data', + user = 'hdfs', + action = ['create_on_execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + ) + self.assertResourceCalled('Execute', '/tmp/oozieSmoke2.sh suse /var/lib/oozie /etc/oozie/conf /usr/bin / /etc/hadoop/conf /usr/bin ambari-qa False', + logoutput = True, path = ['/usr/bin:/usr/bin'], + tries = 3, try_sleep = 5, ) + http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py index df30085..79e3697 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py @@ -4,7 +4,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file +regarding copyright ownership. The ASF licenses this file` to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -32,16 +32,35 @@ class TestPigServiceCheck(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop --config /etc/hadoop/conf dfs -put /etc/passwd passwd ', - try_sleep = 5, - tries = 3, - user = 'ambari-qa', - conf_dir = '/etc/hadoop/conf', - security_enabled = False, - principal = UnknownConfigurationMock(), - keytab = UnknownConfigurationMock(), - bin_dir = '/usr/bin', - kinit_path_local = '/usr/bin/kinit' + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'ambari-qa', + action = ['delete_on_execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + ) + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + source = '/etc/passwd', + user = 'ambari-qa', + action = ['create_on_execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'file', + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('File', '/tmp/pigSmoke.sh', @@ -56,7 +75,7 @@ class TestPigServiceCheck(RMFTestCase): try_sleep = 5, ) - self.assertResourceCalled('ExecuteHadoop', 'fs -test -e pigsmoke.out', + self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /user/ambari-qa/pigsmoke.out', user = 'ambari-qa', bin_dir = '/usr/bin', conf_dir = '/etc/hadoop/conf', @@ -72,16 +91,35 @@ class TestPigServiceCheck(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop --config /etc/hadoop/conf dfs -put /etc/passwd passwd ', - try_sleep = 5, - tries = 3, - user = 'ambari-qa', - principal = 'ambari...@example.com', - conf_dir = '/etc/hadoop/conf', - security_enabled = True, - keytab = '/etc/security/keytabs/smokeuser.headless.keytab', - bin_dir = '/usr/bin', - kinit_path_local = '/usr/bin/kinit' + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out', + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'ambari-qa', + action = ['delete_on_execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + ) + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd', + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + source = '/etc/passwd', + user = 'ambari-qa', + action = ['create_on_execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'file', + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('File', '/tmp/pigSmoke.sh', @@ -96,7 +134,7 @@ class TestPigServiceCheck(RMFTestCase): try_sleep = 5, ) - self.assertResourceCalled('ExecuteHadoop', 'fs -test -e pigsmoke.out', + self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /user/ambari-qa/pigsmoke.out', user = 'ambari-qa', bin_dir = '/usr/bin', conf_dir = '/etc/hadoop/conf', http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py index efec6f7..8d6743a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py @@ -19,6 +19,8 @@ limitations under the License. ''' import json from mock.mock import MagicMock, call, patch +from resource_management.libraries.script.script import Script +from resource_management.libraries.functions import version from stacks.utils.RMFTestCase import * import os @@ -135,72 +137,66 @@ class TestHistoryServer(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self): - self.assertResourceCalled('HdfsDirectory', '/app-logs', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - recursive_chmod = True, - owner = 'yarn', - group = 'hadoop', - action = ['create_delayed'], - mode = 0777, - bin_dir = '/usr/bin' - ) - self.assertResourceCalled('HdfsDirectory', '/mapred', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - owner = 'mapred', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mapred/system', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - owner = 'hdfs', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 0777, - owner = 'mapred', - group = 'hadoop', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mr-history/done', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 01777, - owner = 'mapred', - group = 'hadoop', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', None, - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - bin_dir = '/usr/bin', - action = ['create'], - ) + + self.assertResourceCalled('HdfsResource', '/app-logs', + security_enabled = False, + hadoop_conf_dir = '/etc/hadoop/conf', + keytab = UnknownConfigurationMock(), + user = 'hdfs', + kinit_path_local = '/usr/bin/kinit', + recursive_chmod = True, + owner = 'yarn', + group = 'hadoop', + hadoop_bin_dir = '/usr/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0777, + ) + self.assertResourceCalled('HdfsResource', '/mapred', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'mapred', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', '/mapred/system', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'hdfs', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', '/mr-history/done', + security_enabled = False, + hadoop_conf_dir = '/etc/hadoop/conf', + keytab = UnknownConfigurationMock(), + change_permissions_for_parents = True, + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'mapred', + group = 'hadoop', + hadoop_bin_dir = '/usr/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0777, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', @@ -350,72 +346,66 @@ class TestHistoryServer(RMFTestCase): ) def assert_configure_secured(self): - self.assertResourceCalled('HdfsDirectory', '/app-logs', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - recursive_chmod = True, - owner = 'yarn', - group = 'hadoop', - action = ['create_delayed'], - bin_dir = '/usr/bin', - mode = 0777, - ) - self.assertResourceCalled('HdfsDirectory', '/mapred', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - owner = 'mapred', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mapred/system', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - owner = 'hdfs', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0777, - owner = 'mapred', - group = 'hadoop', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mr-history/done', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 01777, - owner = 'mapred', - group = 'hadoop', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', None, - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - bin_dir = '/usr/bin', - action = ['create'], - ) + + self.assertResourceCalled('HdfsResource', '/app-logs', + security_enabled = True, + hadoop_conf_dir = '/etc/hadoop/conf', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + user = 'hdfs', + kinit_path_local = '/usr/bin/kinit', + recursive_chmod = True, + owner = 'yarn', + group = 'hadoop', + hadoop_bin_dir = '/usr/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0777, + ) + self.assertResourceCalled('HdfsResource', '/mapred', + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'mapred', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', '/mapred/system', + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'hdfs', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', '/mr-history/done', + security_enabled = True, + hadoop_conf_dir = '/etc/hadoop/conf', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + change_permissions_for_parents = True, + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'mapred', + group = 'hadoop', + hadoop_bin_dir = '/usr/bin', + type = 'directory', + action = ['create_on_execute'], + mode = 0777, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', @@ -677,6 +667,8 @@ class TestHistoryServer(RMFTestCase): ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) + @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value="2.3.0")) + @patch.object(version, "get_hdp_build_version", new = MagicMock(return_value="2.3.0.0-1234")) def test_pre_rolling_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: @@ -695,9 +687,32 @@ class TestHistoryServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', 'hdp-select set hadoop-mapreduce-historyserver %s' % version) + self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.3.0.0-1234/mapreduce//mapreduce.tar.gz', + security_enabled = False, + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + keytab = UnknownConfigurationMock(), + source = '/usr/hdp/current/hadoop-client/mapreduce.tar.gz', + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'hdfs', + group = 'hadoop', + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + type = 'file', + action = ['create_on_execute'], + mode = 0444, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + ) self.assertNoMoreResources() - self.assertEquals(3, mocks_dict['call'].call_count) + self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals( "conf-select create-conf-dir --package hadoop --stack-version 2.3.0.0-1234 --conf-version 0", mocks_dict['call'].call_args_list[0][0][0]) http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py index 26fab63..2634879 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py @@ -19,6 +19,7 @@ limitations under the License. ''' import json from mock.mock import MagicMock, call, patch +from resource_management.libraries.functions import version from stacks.utils.RMFTestCase import * import os @@ -27,6 +28,7 @@ origin_exists = os.path.exists @patch.object(os.path, "exists", new=MagicMock( side_effect=lambda *args: origin_exists(args[0]) if args[0][-2:] == "j2" else True)) +@patch.object(version, "get_hdp_build_version", new = MagicMock(return_value="2.2.0.0-1234")) class TestMapReduce2Client(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package" STACK_VERSION = "2.0.6" @@ -354,6 +356,7 @@ class TestMapReduce2Client(RMFTestCase): ) self.assertNoMoreResources() + @patch.object(version, "get_hdp_build_version", new=MagicMock(return_value="2.2.0.0-2041")) def test_upgrade(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mapreduce2_client.py", classname = "MapReduce2Client", http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py index 01073df..bc91487 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py @@ -39,19 +39,25 @@ class TestServiceCheck(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled('ExecuteHadoop', 'fs -rm -r -f /user/ambari-qa/mapredsmokeoutput /user/ambari-qa/mapredsmokeinput', - try_sleep = 5, - tries = 1, - user = 'ambari-qa', - bin_dir = "/bin:/usr/bin:/usr/lib/hadoop-yarn/bin", - conf_dir = '/etc/hadoop/conf', + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mapredsmokeinput', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + source = '/etc/passwd', + user = 'hdfs', + action = ['create_on_execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'file', ) - self.assertResourceCalled('ExecuteHadoop', 'fs -put /etc/passwd /user/ambari-qa/mapredsmokeinput', - try_sleep = 5, - tries = 1, - bin_dir = "/bin:/usr/bin:/usr/lib/hadoop-yarn/bin", - user = 'ambari-qa', - conf_dir = '/etc/hadoop/conf', + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', ) self.assertResourceCalled('ExecuteHadoop', 'jar /usr/lib/hadoop-mapreduce/hadoop-mapreduce-examples-2.*.jar wordcount /user/ambari-qa/mapredsmokeinput /user/ambari-qa/mapredsmokeoutput', logoutput = True, @@ -77,22 +83,28 @@ class TestServiceCheck(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;', - user = 'ambari-qa', + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mapredsmokeinput', + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + source = '/etc/passwd', + user = 'hdfs', + action = ['create_on_execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'file', ) - self.assertResourceCalled('ExecuteHadoop', 'fs -rm -r -f /user/ambari-qa/mapredsmokeoutput /user/ambari-qa/mapredsmokeinput', - try_sleep = 5, - tries = 1, - user = 'ambari-qa', - bin_dir = "/bin:/usr/bin:/usr/lib/hadoop-yarn/bin", - conf_dir = '/etc/hadoop/conf', + self.assertResourceCalled('HdfsResource', None, + security_enabled = True, + hadoop_bin_dir = '/usr/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', ) - self.assertResourceCalled('ExecuteHadoop', 'fs -put /etc/passwd /user/ambari-qa/mapredsmokeinput', - try_sleep = 5, - tries = 1, - bin_dir = "/bin:/usr/bin:/usr/lib/hadoop-yarn/bin", - user = 'ambari-qa', - conf_dir = '/etc/hadoop/conf', + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;', + user = 'ambari-qa', ) self.assertResourceCalled('ExecuteHadoop', 'jar /usr/lib/hadoop-mapreduce/hadoop-mapreduce-examples-2.*.jar wordcount /user/ambari-qa/mapredsmokeinput /user/ambari-qa/mapredsmokeoutput', logoutput = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py index 46e7cbc..f579e9b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py @@ -134,72 +134,6 @@ class TestNodeManager(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self): - self.assertResourceCalled('HdfsDirectory', '/app-logs', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - recursive_chmod = True, - owner = 'yarn', - group = 'hadoop', - action = ['create_delayed'], - bin_dir = '/usr/bin', - mode = 0777, - ) - self.assertResourceCalled('HdfsDirectory', '/mapred', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - owner = 'mapred', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mapred/system', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - owner = 'hdfs', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 0777, - owner = 'mapred', - group = 'hadoop', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mr-history/done', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 01777, - owner = 'mapred', - group = 'hadoop', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', None, - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - bin_dir = '/usr/bin', - action = ['create'], - ) self.assertResourceCalled('Directory', '/hadoop/yarn/local', owner = 'yarn', group = 'hadoop', @@ -386,72 +320,6 @@ class TestNodeManager(RMFTestCase): ) def assert_configure_secured(self): - self.assertResourceCalled('HdfsDirectory', '/app-logs', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - recursive_chmod = True, - owner = 'yarn', - group = 'hadoop', - action = ['create_delayed'], - bin_dir = '/usr/bin', - mode = 0777, - ) - self.assertResourceCalled('HdfsDirectory', '/mapred', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - owner = 'mapred', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mapred/system', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - owner = 'hdfs', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0777, - bin_dir = '/usr/bin', - owner = 'mapred', - group = 'hadoop', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/mr-history/done', - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 01777, - bin_dir = '/usr/bin', - owner = 'mapred', - group = 'hadoop', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', None, - security_enabled = True, - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - conf_dir = '/etc/hadoop/conf', - bin_dir = '/usr/bin', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - action = ['create'], - ) self.assertResourceCalled('Directory', '/hadoop/yarn/local', owner = 'yarn', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/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 f40beac..94f35be 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 @@ -21,12 +21,17 @@ import json import os from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * +from resource_management.libraries.functions import version +from resource_management.libraries.script.script import Script origin_exists = os.path.exists @patch("platform.linux_distribution", new = MagicMock(return_value="Linux")) @patch.object(os.path, "exists", new=MagicMock( side_effect=lambda *args: origin_exists(args[0]) if args[0][-2:] == "j2" else True)) + +@patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value=False)) +@patch.object(version, "get_hdp_build_version", new = MagicMock(return_value="2.0.0.0-1234")) class TestResourceManager(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package" STACK_VERSION = "2.0.6" @@ -53,6 +58,39 @@ class TestResourceManager(RMFTestCase): self.assert_configure_default() + self.assertResourceCalled('HdfsResource', '/apps/tez/', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'tez', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + mode = 0755, + ) + self.assertResourceCalled('HdfsResource', '/apps/tez/lib/', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'tez', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + mode = 0755, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + ) self.assertResourceCalled('File', '/var/run/hadoop-yarn/yarn/yarn-yarn-resourcemanager.pid', action = ['delete'], not_if = 'ls /var/run/hadoop-yarn/yarn/yarn-yarn-resourcemanager.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop-yarn/yarn/yarn-yarn-resourcemanager.pid` >/dev/null 2>&1', @@ -106,7 +144,6 @@ class TestResourceManager(RMFTestCase): self.assert_configure_secured() pid_check_cmd = 'ls /var/run/hadoop-yarn/yarn/yarn-yarn-resourcemanager.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop-yarn/yarn/yarn-yarn-resourcemanager.pid` >/dev/null 2>&1' - self.assertResourceCalled('File', '/var/run/hadoop-yarn/yarn/yarn-yarn-resourcemanager.pid', not_if = pid_check_cmd, action=['delete']) http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/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 02b020b..dc248d6 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 @@ -21,6 +21,7 @@ import json import os from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * +from resource_management.libraries.functions import version from resource_management.libraries.script.script import Script origin_exists = os.path.exists @@ -515,6 +516,7 @@ class TestYarnClient(RMFTestCase): self.assertNoMoreResources() + @patch.object(version, "get_hdp_build_version", new=MagicMock(return_value="2.2.0.0-2041")) def test_upgrade(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/yarn_client.py", classname = "YarnClient", http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index c90d085..485e882 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json @@ -532,8 +532,17 @@ "smokeuser": "ambari-qa", "kerberos_domain": "EXAMPLE.COM", "user_group": "hadoop", - "mapreduce_tar_destination_folder" : "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "mapreduce_tar_source" : "/usr/hdp/current/hadoop-client/mapreduce.tar.gz" + "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", + "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", + "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", + "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", + "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", + "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", + "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", + "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", + "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", + "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", + "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz" }, "hbase-env": { http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json index f000ef3..0b54d8c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json @@ -547,7 +547,18 @@ "kerberos_domain": "EXAMPLE.COM", "user_group": "hadoop", "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "kinit_path_local": "/usr/bin" + "kinit_path_local": "/usr/bin", + "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", + "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", + "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", + "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", + "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", + "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", + "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", + "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", + "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", + "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", + "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz" }, "hadoop-env": { "namenode_opt_maxnewsize": "200m", http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/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 d4017f7..8fa7cd2 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 @@ -122,30 +122,31 @@ class TestFalconServer(RMFTestCase): owner = 'falcon', recursive = True ) - self.assertResourceCalled('HdfsDirectory', '/apps/falcon', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0777, - owner = 'falcon', - bin_dir = '/usr/bin', - action = ['create_delayed'] - ) + self.assertResourceCalled('HdfsResource', '/apps/falcon', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'falcon', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + mode = 0777, + ) self.assertResourceCalled('Directory', '/hadoop/falcon/store', - owner = 'falcon', - recursive = True - ) - self.assertResourceCalled('HdfsDirectory', None, - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - bin_dir = '/usr/bin', - action = ['create'], - ) + owner = 'falcon', + recursive = True, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + ) self.assertResourceCalled('Directory', '/hadoop/falcon', owner = 'falcon', recursive = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py index cd6f693..bb0ce90 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_service_check.py @@ -21,7 +21,7 @@ limitations under the License. from stacks.utils.RMFTestCase import * -class TestFalconServer(RMFTestCase): +class TestFalconServiceCheck(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "FALCON/0.5.0.2.1/package" STACK_VERSION = "2.1" http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/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 50d99dd..1eeba7e 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 @@ -21,7 +21,7 @@ limitations under the License. from stacks.utils.RMFTestCase import * -class TestFalconServer(RMFTestCase): +class TestTezServiceCheck(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "TEZ/0.4.0.2.1/package" STACK_VERSION = "2.1" @@ -33,60 +33,56 @@ class TestFalconServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled('ExecuteHadoop', 'fs -rm -r -f /tmp/tezsmokeinput /tmp/tezsmokeoutput', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - try_sleep = 5, - kinit_path_local = '/usr/bin/kinit', - tries = 3, - user = 'ambari-qa', - bin_dir = '/usr/bin', - principal = UnknownConfigurationMock(), - ) - self.assertResourceCalled('HdfsDirectory', '/tmp', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = '/usr/bin/kinit', - mode = 0777, - owner = 'hdfs', - bin_dir = '/usr/bin', - action = ['create'], - ) - self.assertResourceCalled('ExecuteHadoop', 'fs -mkdir /tmp/tezsmokeinput', - try_sleep = 5, - tries = 3, - bin_dir = '/usr/bin', - user = 'ambari-qa', - conf_dir = '/etc/hadoop/conf', - ) self.assertResourceCalled('File', '/tmp/sample-tez-test', - content = 'foo\nbar\nfoo\nbar\nfoo', - mode = 0755, - ) - self.assertResourceCalled('ExecuteHadoop', 'fs -put /tmp/sample-tez-test /tmp/tezsmokeinput/', - try_sleep = 5, - tries = 3, - bin_dir = '/usr/bin', - user = 'ambari-qa', - conf_dir = '/etc/hadoop/conf', - ) + content = 'foo\nbar\nfoo\nbar\nfoo', + mode = 0755, + ) + self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'ambari-qa', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'directory', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput/sample-tez-test', + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + source = '/tmp/sample-tez-test', + user = 'hdfs', + owner = 'ambari-qa', + hadoop_conf_dir = '/etc/hadoop/conf', + type = 'file', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/etc/hadoop/conf', + ) self.assertResourceCalled('ExecuteHadoop', 'jar /usr/lib/tez/tez-mapreduce-examples*.jar orderedwordcount /tmp/tezsmokeinput/sample-tez-test /tmp/tezsmokeoutput/', - try_sleep = 5, - tries = 3, - bin_dir = '/usr/bin', - user = 'ambari-qa', - conf_dir = '/etc/hadoop/conf', - ) + try_sleep = 5, + tries = 3, + bin_dir = '/usr/bin', + user = 'ambari-qa', + conf_dir = '/etc/hadoop/conf', + ) self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /tmp/tezsmokeoutput/_SUCCESS', - try_sleep = 6, - tries = 10, - bin_dir = '/usr/bin', - user = 'ambari-qa', - conf_dir = '/etc/hadoop/conf', - ) + try_sleep = 6, + tries = 10, + bin_dir = '/usr/bin', + user = 'ambari-qa', + conf_dir = '/etc/hadoop/conf', + ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/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 dd3f4f2..b7968d2 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 @@ -20,17 +20,13 @@ limitations under the License. from mock.mock import patch, MagicMock from stacks.utils.RMFTestCase import * -from resource_management.libraries.functions import dynamic_variable_interpretation class TestPigServiceCheck(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "PIG/0.12.0.2.0/package" STACK_VERSION = "2.2" - @patch.object(dynamic_variable_interpretation, "copy_tarballs_to_hdfs") - def test_service_check_secure(self, copy_tarball_mock): - copy_tarball_mock.return_value = 0 - + def test_service_check_secure(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py", classname="PigServiceCheck", command="service_check", @@ -38,22 +34,43 @@ class TestPigServiceCheck(RMFTestCase): hdp_stack_version=self.STACK_VERSION, target=RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled("ExecuteHadoop", "dfs -rmr pigsmoke.out passwd; hadoop --config /usr/hdp/current/hadoop-client/conf dfs -put /etc/passwd passwd ", - try_sleep=5, - tries=3, - user="ambari-qa", - conf_dir="/usr/hdp/current/hadoop-client/conf", - security_enabled=True, - principal="ambari...@example.com", - keytab="/etc/security/keytabs/smokeuser.headless.keytab", - bin_dir="/usr/hdp/current/hadoop-client/bin", - kinit_path_local="/usr/bin/kinit" + + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out', + security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'ambari-qa', + action = ['delete_on_execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + type = 'directory', + ) + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd', + security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + source = '/etc/passwd', + user = 'ambari-qa', + action = ['create_on_execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + type = 'file', + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'h...@example.com', + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) - self.assertResourceCalled("File", "/tmp/pigSmoke.sh", content=StaticFile("pigSmoke.sh"), mode=0755 ) + + self.assertResourceCalled("Execute", "pig /tmp/pigSmoke.sh", path=["/usr/hdp/current/pig-client/bin:/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin"], @@ -62,26 +79,54 @@ class TestPigServiceCheck(RMFTestCase): try_sleep=5 ) - self.assertResourceCalled("ExecuteHadoop", "fs -test -e pigsmoke.out", - user="ambari-qa", - bin_dir="/usr/hdp/current/hadoop-client/bin", - conf_dir="/usr/hdp/current/hadoop-client/conf" + self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /user/ambari-qa/pigsmoke.out', + bin_dir = '/usr/hdp/current/hadoop-client/bin', + user = 'ambari-qa', + conf_dir = '/usr/hdp/current/hadoop-client/conf', ) - - # Specific to HDP 2.2 and kerberized cluster - self.assertResourceCalled("ExecuteHadoop", "dfs -rmr pigsmoke.out passwd; hadoop --config /usr/hdp/current/hadoop-client/conf dfs -put /etc/passwd passwd ", - tries=3, - try_sleep=5, - user="ambari-qa", - conf_dir="/usr/hdp/current/hadoop-client/conf", - keytab="/etc/security/keytabs/smokeuser.headless.keytab", - principal="ambari...@example.com", - security_enabled=True, - kinit_path_local="/usr/bin/kinit", - bin_dir="/usr/hdp/current/hadoop-client/bin" + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out', + security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'ambari-qa', + action = ['delete_on_execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + type = 'directory', + ) + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd', + security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + source = '/etc/passwd', + user = 'ambari-qa', + action = ['create_on_execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + type = 'file', + ) + self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.2.0.0/tez//tez.tar.gz', + security_enabled = True, + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + source = '/usr/hdp/current/tez-client/lib/tez.tar.gz', + kinit_path_local = '/usr/bin/kinit', + user = 'h...@example.com', + owner = 'hdfs', + group = 'hadoop', + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + type = 'file', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = '/etc/security/keytabs/hdfs.headless.keytab', + kinit_path_local = '/usr/bin/kinit', + user = 'h...@example.com', + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) - - copy_tarball_mock.assert_called_once_with("tez", "hadoop-client", "ambari-qa", "hdfs", "hadoop") self.assertResourceCalled("Execute", "/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;", user="ambari-qa") @@ -93,10 +138,10 @@ class TestPigServiceCheck(RMFTestCase): user="ambari-qa" ) - self.assertResourceCalled("ExecuteHadoop", "fs -test -e pigsmoke.out", - user="ambari-qa", - bin_dir="/usr/hdp/current/hadoop-client/bin", - conf_dir="/usr/hdp/current/hadoop-client/conf" + self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /user/ambari-qa/pigsmoke.out', + bin_dir = '/usr/hdp/current/hadoop-client/bin', + user = 'ambari-qa', + conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/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 60d7924..4e8ec42 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 @@ -93,6 +93,28 @@ class TestJobHistoryServer(RMFTestCase): self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/spark.service.keytab spark/localh...@example.com; ', user = 'spark', ) + self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.2.0.0/tez//tez.tar.gz', + security_enabled = True, + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + keytab = UnknownConfigurationMock(), + source = '/usr/hdp/current/tez-client/lib/tez.tar.gz', + kinit_path_local = '/usr/bin/kinit', + user = UnknownConfigurationMock(), + owner = UnknownConfigurationMock(), + group = 'hadoop', + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + type = 'file', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = UnknownConfigurationMock(), + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + ) self.assertResourceCalled('Execute', '/usr/hdp/current/spark-client/sbin/start-history-server.sh', environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, not_if = 'ls /var/run/spark/spark-spark-org.apache.spark.deploy.history.HistoryServer-1.pid >/dev/null 2>&1 && ps -p `cat /var/run/spark/spark-spark-org.apache.spark.deploy.history.HistoryServer-1.pid` >/dev/null 2>&1', @@ -128,16 +150,26 @@ class TestJobHistoryServer(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('HdfsDirectory', '/user/spark', + self.assertResourceCalled('HdfsResource', '/user/spark', security_enabled = False, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', keytab = UnknownConfigurationMock(), - conf_dir = '/usr/hdp/current/hadoop-client/conf', - hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', - mode = 0775, + user = 'hdfs', owner = 'spark', - bin_dir = '/usr/hdp/current/hadoop-client/bin', - action = ['create'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + type = 'directory', + action = ['create_on_execute'], + mode = 0775, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', key_value_delimiter = ' ', @@ -175,16 +207,26 @@ class TestJobHistoryServer(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('HdfsDirectory', '/user/spark', + self.assertResourceCalled('HdfsResource', '/user/spark', security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', keytab = UnknownConfigurationMock(), - conf_dir = '/usr/hdp/current/hadoop-client/conf', - hdfs_user = UnknownConfigurationMock(), kinit_path_local = '/usr/bin/kinit', - mode = 0775, + user = UnknownConfigurationMock(), owner = 'spark', - bin_dir = '/usr/hdp/current/hadoop-client/bin', - action = ['create'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + type = 'directory', + action = ['create_on_execute'], + mode = 0775, + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = True, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = UnknownConfigurationMock(), + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', key_value_delimiter = ' ', @@ -229,6 +271,28 @@ class TestJobHistoryServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', 'hdp-select set spark-historyserver {0}'.format(version)) + self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.2.0.0/tez//tez.tar.gz', + security_enabled = False, + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + keytab = UnknownConfigurationMock(), + source = '/usr/hdp/current/tez-client/lib/tez.tar.gz', + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + owner = 'hdfs', + group = 'hadoop', + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + type = 'file', + action = ['create_on_execute'], + ) + self.assertResourceCalled('HdfsResource', None, + security_enabled = False, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + ) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count)
