AMBARI-13229. Detect non-compliant python versions and do not attempt to start Ambari Agent (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a00b06ea Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a00b06ea Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a00b06ea Branch: refs/heads/trunk Commit: a00b06ea10b48f68021ec0406fb6575a4d09d71c Parents: 360a4b4 Author: Andrew Onishuk <[email protected]> Authored: Mon Sep 28 13:33:36 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon Sep 28 13:33:36 2015 +0300 ---------------------------------------------------------------------- .../libraries/functions/get_hdp_version.py | 6 ++++-- .../libraries/functions/hdp_select.py | 6 ++++-- .../HDFS/2.1.0.2.0/package/scripts/namenode.py | 2 +- .../HDFS/2.1.0.2.0/package/scripts/service_check.py | 2 +- .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py | 6 +++--- .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 6 +++--- .../main/resources/custom_actions/scripts/ru_set_all.py | 7 ++++--- .../src/test/python/custom_actions/test_ru_set_all.py | 4 ++-- .../src/test/python/stacks/2.0.6/FLUME/test_flume.py | 2 +- .../test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 12 ++++++------ .../test/python/stacks/2.0.6/HBASE/test_hbase_master.py | 4 ++-- .../stacks/2.0.6/HBASE/test_hbase_regionserver.py | 4 ++-- .../stacks/2.0.6/HBASE/test_phoenix_queryserver.py | 2 +- .../src/test/python/stacks/2.0.6/HDFS/test_datanode.py | 4 ++-- .../test/python/stacks/2.0.6/HDFS/test_hdfs_client.py | 6 +++--- .../test/python/stacks/2.0.6/HDFS/test_journalnode.py | 4 ++-- .../src/test/python/stacks/2.0.6/HDFS/test_namenode.py | 4 ++-- .../test/python/stacks/2.0.6/HDFS/test_nfsgateway.py | 2 +- .../test/python/stacks/2.0.6/HIVE/test_hive_client.py | 4 ++-- .../test/python/stacks/2.0.6/HIVE/test_hive_server.py | 10 +++++----- .../python/stacks/2.0.6/HIVE/test_webhcat_server.py | 4 ++-- .../test/python/stacks/2.0.6/OOZIE/test_oozie_client.py | 4 ++-- .../test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 8 ++++---- .../src/test/python/stacks/2.0.6/PIG/test_pig_client.py | 4 ++-- .../src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py | 2 +- .../test/python/stacks/2.0.6/YARN/test_historyserver.py | 2 +- .../python/stacks/2.0.6/YARN/test_mapreduce2_client.py | 4 ++-- .../test/python/stacks/2.0.6/YARN/test_nodemanager.py | 2 +- .../python/stacks/2.0.6/YARN/test_resourcemanager.py | 2 +- .../test/python/stacks/2.0.6/YARN/test_yarn_client.py | 4 ++-- .../stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py | 4 ++-- .../stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py | 4 ++-- .../test/python/stacks/2.1/FALCON/test_falcon_client.py | 4 ++-- .../test/python/stacks/2.1/FALCON/test_falcon_server.py | 6 +++--- .../test/python/stacks/2.1/HIVE/test_hive_metastore.py | 8 ++++---- .../python/stacks/2.1/STORM/test_storm_drpc_server.py | 4 ++-- .../test/python/stacks/2.1/STORM/test_storm_nimbus.py | 8 ++++---- .../python/stacks/2.1/STORM/test_storm_nimbus_prod.py | 8 ++++---- .../stacks/2.1/STORM/test_storm_rest_api_service.py | 4 ++-- .../python/stacks/2.1/STORM/test_storm_supervisor.py | 8 ++++---- .../stacks/2.1/STORM/test_storm_supervisor_prod.py | 8 ++++---- .../python/stacks/2.1/STORM/test_storm_ui_server.py | 4 ++-- .../src/test/python/stacks/2.1/TEZ/test_tez_client.py | 6 +++--- .../python/stacks/2.1/YARN/test_apptimelineserver.py | 2 +- .../python/stacks/2.2/ACCUMULO/test_accumulo_client.py | 4 ++-- .../test/python/stacks/2.2/KAFKA/test_kafka_broker.py | 4 ++-- .../test/python/stacks/2.2/KNOX/test_knox_gateway.py | 8 ++++---- .../test/python/stacks/2.2/RANGER/test_ranger_admin.py | 2 +- .../python/stacks/2.2/RANGER/test_ranger_usersync.py | 4 ++-- .../test/python/stacks/2.2/SLIDER/test_slider_client.py | 8 ++++---- .../python/stacks/2.2/SPARK/test_job_history_server.py | 2 +- .../test/python/stacks/2.2/SPARK/test_spark_client.py | 2 +- .../test/python/stacks/2.3/MAHOUT/test_mahout_client.py | 4 ++-- .../python/stacks/2.3/SPARK/test_spark_thrift_server.py | 2 +- 54 files changed, 128 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-common/src/main/python/resource_management/libraries/functions/get_hdp_version.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/get_hdp_version.py b/ambari-common/src/main/python/resource_management/libraries/functions/get_hdp_version.py index e8fdbb6..a56d33a 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/get_hdp_version.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/get_hdp_version.py @@ -31,6 +31,8 @@ from resource_management.core.logger import Logger from resource_management.core.exceptions import Fail from resource_management.core import shell +HDP_SELECT_BINARY = "/usr/bin/hdp-select" + @OsFamilyFuncImpl(OSConst.WINSRV_FAMILY) def get_hdp_version(package_name): """ @@ -63,12 +65,12 @@ def get_hdp_version(package_name): @param package_name, name of the package, from which, function will try to get hdp version """ - if not os.path.exists("/usr/bin/hdp-select"): + if not os.path.exists(HDP_SELECT_BINARY): Logger.info('Skipping get_hdp_version since hdp-select is not yet available') return None # lazy fail try: - command = 'hdp-select status ' + package_name + command = 'ambari-python-wrap {HDP_SELECT_BINARY} status {package_name}'.format(HDP_SELECT_BINARY=HDP_SELECT_BINARY, package_name=package_name) return_code, hdp_output = shell.call(command, timeout=20) except Exception, e: Logger.error(str(e)) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py index f4f0efc..5f05777 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py @@ -30,8 +30,10 @@ from resource_management.core.shell import call from resource_management.libraries.functions.version import format_hdp_stack_version from resource_management.libraries.functions.version_select_util import get_versions_from_stack_root +HDP_SELECT = '/usr/bin/hdp-select' +HDP_SELECT_PREFIX = ('ambari-python-wrap', HDP_SELECT) # hdp-select set oozie-server 2.2.0.0-1234 -TEMPLATE = ('hdp-select', 'set') +TEMPLATE = HDP_SELECT_PREFIX + ('set',) # a mapping of Ambari server role to hdp-select component name for all # non-clients @@ -249,7 +251,7 @@ def get_hdp_versions(stack_root): :param stack_root: Stack install root :return: Returns list of installed stack versions. """ - code, out = call("hdp-select versions") + code, out = call(HDP_SELECT_PREFIX + ('versions',)) versions = [] if 0 == code: for line in out.splitlines(): http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py index a3c02a6..1dfb280 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py @@ -228,7 +228,7 @@ class NameNodeDefault(NameNode): basedir = os.path.join(env.config.basedir, 'scripts') if(threshold == 'DEBUG'): #FIXME TODO remove this on PROD basedir = os.path.join(env.config.basedir, 'scripts', 'balancer-emulator') - command = ['python','hdfs-command.py'] + command = ['ambari-python-wrap','hdfs-command.py'] _print("Executing command %s\n" % command) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py index 6ec3996..b4f44ae 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py @@ -86,7 +86,7 @@ class HdfsServiceCheckDefault(HdfsServiceCheck): checkWebUIFileName = "checkWebUI.py" checkWebUIFilePath = format("{tmp_dir}/{checkWebUIFileName}") comma_sep_jn_hosts = ",".join(params.journalnode_hosts) - checkWebUICmd = format("python {checkWebUIFilePath} -m {comma_sep_jn_hosts} -p {journalnode_port} -s {https_only}") + checkWebUICmd = format("ambari-python-wrap {checkWebUIFilePath} -m {comma_sep_jn_hosts} -p {journalnode_port} -s {https_only}") File(checkWebUIFilePath, content=StaticFile(checkWebUIFileName), mode=0775) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py index 77e487f..36cbe87 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py @@ -192,7 +192,7 @@ def setup_ranger_db(rolling_upgrade=False): # User wants us to setup the DB user and DB? if params.create_db_dbuser: Logger.info('Setting up Ranger DB and DB User') - dba_setup = format('python {ranger_home}/dba_script.py -q') + dba_setup = format('ambari-python-wrap {ranger_home}/dba_script.py -q') Execute(dba_setup, environment=env_dict, logoutput=True, @@ -201,7 +201,7 @@ def setup_ranger_db(rolling_upgrade=False): else: Logger.info('Separate DBA property not set. Assuming Ranger DB and DB User exists!') - db_setup = format('python {ranger_home}/db_setup.py') + db_setup = format('ambari-python-wrap {ranger_home}/db_setup.py') Execute(db_setup, environment=env_dict, logoutput=True, @@ -220,7 +220,7 @@ def setup_java_patch(rolling_upgrade=False): if params.db_flavor.lower() == 'sqla': env_dict = {'RANGER_ADMIN_HOME':ranger_home, 'JAVA_HOME':params.java_home, 'LD_LIBRARY_PATH':params.ld_lib_path} - setup_java_patch = format('python {ranger_home}/db_setup.py -javapatch') + setup_java_patch = format('ambari-python-wrap {ranger_home}/db_setup.py -javapatch') Execute(setup_java_patch, environment=env_dict, logoutput=True, http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py index fafe1ec..e14c209 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py @@ -98,8 +98,8 @@ def setup_kms_db(): if params.db_flavor.lower() == 'sqla': env_dict = {'RANGER_KMS_HOME':params.kms_home, 'JAVA_HOME': params.java_home, 'LD_LIBRARY_PATH':params.ld_library_path} - dba_setup = format('python {kms_home}/dba_script.py -q') - db_setup = format('python {kms_home}/db_setup.py') + dba_setup = format('ambari-python-wrap {kms_home}/dba_script.py -q') + db_setup = format('ambari-python-wrap {kms_home}/db_setup.py') Execute(dba_setup, environment=env_dict, logoutput=True, user=params.kms_user) Execute(db_setup, environment=env_dict, logoutput=True, user=params.kms_user) @@ -109,7 +109,7 @@ def setup_java_patch(): if params.has_ranger_admin: - setup_java_patch = format('python {kms_home}/db_setup.py -javapatch') + setup_java_patch = format('ambari-python-wrap {kms_home}/db_setup.py -javapatch') env_dict = {'RANGER_KMS_HOME':params.kms_home, 'JAVA_HOME': params.java_home} if params.db_flavor.lower() == 'sqla': http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/main/resources/custom_actions/scripts/ru_set_all.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/custom_actions/scripts/ru_set_all.py b/ambari-server/src/main/resources/custom_actions/scripts/ru_set_all.py index 6e5ddd2..c4660a7 100644 --- a/ambari-server/src/main/resources/custom_actions/scripts/ru_set_all.py +++ b/ambari-server/src/main/resources/custom_actions/scripts/ru_set_all.py @@ -33,7 +33,8 @@ from resource_management.core import shell from resource_management.core.exceptions import Fail from resource_management.core.logger import Logger from resource_management.core.resources.system import Execute, Link -from resource_management.core.shell import as_sudo + +HDP_SELECT = '/usr/bin/hdp-select' class UpgradeSetAll(Script): """ @@ -59,7 +60,7 @@ class UpgradeSetAll(Script): real_ver = format_hdp_stack_version(version) if stack_name == "HDP": if compare_versions(real_ver, min_ver) >= 0: - cmd = ('hdp-select', 'set', 'all', version) + cmd = ('ambari-python-wrap', HDP_SELECT, 'set', 'all', version) code, out = shell.call(cmd, sudo=True) if compare_versions(real_ver, format_hdp_stack_version("2.3")) >= 0: @@ -169,7 +170,7 @@ def link_config(old_conf, link_conf): old_conf_copy = os.path.join(old_parent, "conf.backup") if not os.path.exists(old_conf_copy): - Execute(as_sudo(["cp", "-R", "-p", old_conf, old_conf_copy]), logoutput=True) + Execute(("cp", "-R", "-p", old_conf, old_conf_copy), sudo=True, logoutput=True) shutil.rmtree(old_conf, ignore_errors=True) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/custom_actions/test_ru_set_all.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/custom_actions/test_ru_set_all.py b/ambari-server/src/test/python/custom_actions/test_ru_set_all.py index b102b4e..2f74619 100644 --- a/ambari-server/src/test/python/custom_actions/test_ru_set_all.py +++ b/ambari-server/src/test/python/custom_actions/test_ru_set_all.py @@ -93,7 +93,7 @@ class TestRUSetAll(RMFTestCase): ru_execute = UpgradeSetAll() ru_execute.actionexecute(None) - call_mock.assert_called_with(('hdp-select', 'set', 'all', u'2.2.1.0-2260'), sudo=True) + call_mock.assert_called_with(('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'all', u'2.2.1.0-2260'), sudo=True) @patch("resource_management.core.shell.call") @patch.object(Script, 'get_config') @@ -129,7 +129,7 @@ class TestRUSetAll(RMFTestCase): ru_execute.actionexecute(None) self.assertTrue(link_mock.called) - call_mock.assert_called_with(('hdp-select', 'set', 'all', '2.3.0.0-1234'), sudo=True) + call_mock.assert_called_with(('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'all', '2.3.0.0-1234'), sudo=True) @patch("os.path.islink") http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py index be2b87c..28b0802 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py +++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py @@ -536,7 +536,7 @@ class TestFlumeHandler(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'flume-server', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'flume-server', '2.2.1.0-2067'), sudo=True) def build_flume(content): http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py index ff25933..742b39a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py @@ -202,9 +202,9 @@ class TestHBaseClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hbase-client', '2.2.1.0-2067'), sudo=True) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'phoenix-client', '2.2.1.0-2067'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'phoenix-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) @@ -228,9 +228,9 @@ class TestHBaseClient(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-client', version), sudo=True) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'phoenix-client', version), sudo=True) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-client', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'phoenix-client', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertEquals(3, mocks_dict['call'].call_count) self.assertEquals(6, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py index f19da4c..7e1a6f1 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py @@ -733,7 +733,7 @@ class TestHBaseMaster(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hbase-master', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-master', version), sudo=True,) self.assertFalse(call_mock.called) self.assertNoMoreResources() @@ -757,7 +757,7 @@ class TestHBaseMaster(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-master', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-master', version), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(3, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py index 2cb05c0..9973825 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py @@ -491,7 +491,7 @@ class TestHbaseRegionServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hbase-regionserver', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-regionserver', version), sudo=True,) self.assertNoMoreResources() @@ -533,7 +533,7 @@ class TestHbaseRegionServer(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-regionserver', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-regionserver', version), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(3, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py index 0cfc2e3..51a9edc 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py @@ -413,6 +413,6 @@ class TestPhoenixQueryServer(RMFTestCase): mode = 0755, cd_access = 'a', ) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'phoenix-server', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'phoenix-server', '2.3.0.0-1234'), sudo=True) self.assertNoMoreResources() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py index d5a42f0..1b4bec6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py @@ -451,7 +451,7 @@ class TestDatanode(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,) self.assertNoMoreResources() @@ -472,7 +472,7 @@ class TestDatanode(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py index 4948d01..9177039 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py @@ -82,7 +82,7 @@ class Test(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) + 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 @@ -204,7 +204,7 @@ class Test(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) @@ -228,5 +228,5 @@ class Test(RMFTestCase): config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True,) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py index becc82b..364715d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py @@ -472,7 +472,7 @@ class TestJournalnode(RMFTestCase): config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -493,7 +493,7 @@ class TestJournalnode(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,) self.assertNoMoreResources() self.assertEquals( http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py index b9211a5..ada4d9b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py @@ -1300,7 +1300,7 @@ class TestNamenode(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hadoop-hdfs-namenode', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-namenode', version), sudo=True) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -1320,7 +1320,7 @@ class TestNamenode(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-hdfs-namenode', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-namenode', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py index 89b4762..ee85e4a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py @@ -401,5 +401,5 @@ class TestNFSGateway(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None), (0, None), (0, None), (0, None)]) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hadoop-hdfs-nfs3', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-nfs3', version), sudo=True,) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py index 79bcc73..db4b350 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py @@ -188,7 +188,7 @@ class TestHiveClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hadoop-client', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -210,7 +210,7 @@ class TestHiveClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hadoop-client', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index e4ca82e..c2b845c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -733,7 +733,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b""" call_mocks = call_side_effects ) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,) self.assertResourceCalledByIndex(31, 'Execute', 'hive --config /usr/hdp/current/hive-server2/conf/conf.server --service hiveserver2 --deregister 1.2.1.2.3.0.0-2434', path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'], tries=1, user='hive') @@ -757,7 +757,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b""" call_mocks = call_side_effects ) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,) self.assertResourceCalledByIndex(33, 'Execute', 'hive --config /etc/hive/conf.server --service hiveserver2 --deregister 1.2.1.2.3.0.0-2434', path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'], tries=1, user='hive') @@ -773,7 +773,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b""" except: pass - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', '2.2.1.0-2065'), sudo=True,) self.assertNoMoreResources() @patch("resource_management.libraries.functions.security_commons.build_expectations") @@ -905,7 +905,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b""" hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hive-server2', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', version), sudo=True,) copy_to_hdfs_mock.assert_any_call("mapreduce", "hadoop", "hdfs", host_sys_prepped=False) copy_to_hdfs_mock.assert_any_call("tez", "hadoop", "hdfs", host_sys_prepped=False) @@ -945,7 +945,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b""" self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hive-server2', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-server2', version), sudo=True,) copy_to_hdfs_mock.assert_any_call("mapreduce", "hadoop", "hdfs", host_sys_prepped=False) copy_to_hdfs_mock.assert_any_call("tez", "hadoop", "hdfs", host_sys_prepped=False) self.assertEquals(2, copy_to_hdfs_mock.call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 aca7664..bf8742e 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 @@ -356,7 +356,7 @@ class TestWebHCatServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hive-webhcat', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-webhcat', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -385,7 +385,7 @@ class TestWebHCatServer(RMFTestCase): self.assertTrue("/usr/hdp/current/hive-webhcat/etc/webhcat" == sys.modules["params"].webhcat_conf_dir) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hive-webhcat', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-webhcat', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py index e8196d6..6d3e7d0 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py @@ -211,7 +211,7 @@ class TestOozieClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'oozie-client', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-client', version), sudo=True) self.assertNoMoreResources() @@ -234,7 +234,7 @@ class TestOozieClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'oozie-client', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 9cf426f..798ffd1 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 @@ -1179,7 +1179,7 @@ class TestOozieServer(RMFTestCase): ('tar', '-zcvhf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '/usr/hdp/current/oozie-server/conf/'), sudo = True) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'oozie-server', u'2.2.1.0-2135'), + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-server', u'2.2.1.0-2135'), sudo = True ) self.assertResourceCalled('Execute', @@ -1247,7 +1247,7 @@ class TestOozieServer(RMFTestCase): ('tar', '-zcvhf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '/usr/hdp/current/oozie-server/conf/'), sudo = True) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo = True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo = True) self.assertResourceCalled('Execute', ('tar', '-xvf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '-C', '/usr/hdp/current/oozie-server/conf//'), @@ -1305,7 +1305,7 @@ class TestOozieServer(RMFTestCase): ('tar', '-zcvhf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '/usr/hdp/current/oozie-server/conf/'), sudo = True) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'oozie-server', u'2.2.0.0-0000'), sudo = True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-server', u'2.2.0.0-0000'), sudo = True) self.assertResourceCalled('Execute', ('tar', '-xvf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '-C', '/usr/hdp/current/oozie-server/conf//'), @@ -1505,7 +1505,7 @@ class TestOozieServer(RMFTestCase): ('tar', '-zcvhf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '/usr/hdp/current/oozie-server/conf/'), sudo = True) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo = True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo = True) self.assertResourceCalled('Execute', ('tar', '-xvf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '-C', '/usr/hdp/current/oozie-server/conf//'), http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py index 2f42520..e363b2c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py @@ -146,7 +146,7 @@ class TestPigClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hadoop-client', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() def test_pre_rolling_restart_23(self): @@ -167,7 +167,7 @@ class TestPigClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hadoop-client', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py index 2c0b8c8..e07139e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py +++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py @@ -129,7 +129,7 @@ class TestSqoop(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'sqoop-client', version), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'sqoop-client', version), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 b6d5f42..1b2fae5 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 @@ -779,7 +779,7 @@ class TestHistoryServer(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-mapreduce-historyserver', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-mapreduce-historyserver', version), sudo=True) copy_to_hdfs_mock.assert_called_with("tez", "hadoop", "hdfs", host_sys_prepped=False) self.assertResourceCalled('HdfsResource', None, http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 0e52264..0a2480e 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 @@ -384,7 +384,7 @@ class TestMapReduce2Client(RMFTestCase): ) # for now, it's enough that hdp-select is confirmed - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): @@ -404,7 +404,7 @@ class TestMapReduce2Client(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 2692420..262a2d1 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 @@ -713,7 +713,7 @@ class TestNodeManager(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-nodemanager', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-yarn-nodemanager', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 fb7d847..9e98601 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 @@ -640,7 +640,7 @@ class TestResourceManager(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-resourcemanager', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-yarn-resourcemanager', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 21fbb9d..4adf6e5 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 @@ -551,7 +551,7 @@ class TestYarnClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES ) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) + 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 @@ -573,7 +573,7 @@ class TestYarnClient(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py index 79fd74b..309380c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py @@ -167,7 +167,7 @@ class TestZookeeperClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'zookeeper-client', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'zookeeper-client', version), sudo=True) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -191,7 +191,7 @@ class TestZookeeperClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'zookeeper-client', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'zookeeper-client', version), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py index afc4bc7..ac5311f 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py @@ -353,7 +353,7 @@ class TestZookeeperServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'zookeeper-server', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'zookeeper-server', version), sudo=True) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -377,7 +377,7 @@ class TestZookeeperServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'zookeeper-server', version), sudo=True) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'zookeeper-server', version), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py index 9b08a90..2667aaf 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py @@ -118,7 +118,7 @@ class TestFalconClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'falcon-client', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'falcon-client', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -140,7 +140,7 @@ class TestFalconClient(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'falcon-client', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'falcon-client', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 c9166a5..229dffa 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 @@ -220,7 +220,7 @@ class TestFalconServer(RMFTestCase): u'/hadoop/falcon'), sudo = True, ) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'falcon-server', u'2.2.1.0-2135'), + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'falcon-server', u'2.2.1.0-2135'), sudo = True, ) self.assertResourceCalled('Execute', ('tar', @@ -504,7 +504,7 @@ class TestFalconServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'falcon-server', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'falcon-server', version), sudo=True,) self.printResources() @patch('os.path.isfile', new=MagicMock(return_value=True)) @@ -531,7 +531,7 @@ class TestFalconServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'falcon-server', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'falcon-server', version), sudo=True,) self.assertResourceCalled('Execute', ('tar', '-xvf', http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index 9d42b9f..0dcbd7d 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -496,7 +496,7 @@ class TestHiveMetastore(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hive-metastore', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-metastore', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -518,7 +518,7 @@ class TestHiveMetastore(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'hive-metastore', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-metastore', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) @@ -581,7 +581,7 @@ class TestHiveMetastore(RMFTestCase): logoutput = True, environment = {'HIVE_CONF_DIR': '/usr/hdp/current/hive-server2/conf/conf.server'}, tries = 1, user = 'hive') - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-metastore', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-metastore', version), sudo=True,) self.assertNoMoreResources() @@ -671,6 +671,6 @@ class TestHiveMetastore(RMFTestCase): logoutput = True, environment = {'HIVE_CONF_DIR': '/usr/hdp/current/hive-server2/conf/conf.server'}, tries = 1, user = 'hive') - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hive-metastore', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hive-metastore', version), sudo=True,) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 283c865..3282192 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 @@ -150,7 +150,7 @@ class TestStormDrpcServer(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -169,7 +169,7 @@ class TestStormDrpcServer(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 bbcc15a..5a9c8bf 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 @@ -149,8 +149,8 @@ class TestStormNimbus(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-nimbus', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-nimbus', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -169,8 +169,8 @@ class TestStormNimbus(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-nimbus', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-nimbus', '2.3.0.0-1234'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 03f33f6..78b8866 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 @@ -114,8 +114,8 @@ class TestStormNimbus(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-nimbus', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-nimbus', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -134,8 +134,8 @@ class TestStormNimbus(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-nimbus', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-nimbus', '2.3.0.0-1234'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 b26913e..7513f35 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 @@ -149,7 +149,7 @@ class TestStormRestApi(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -168,7 +168,7 @@ class TestStormRestApi(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 84fb64c..628ea69 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 @@ -194,8 +194,8 @@ class TestStormSupervisor(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-supervisor', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-supervisor', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -214,8 +214,8 @@ class TestStormSupervisor(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-supervisor', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-supervisor', '2.3.0.0-1234'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 649b716..aa3b0e6 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 @@ -163,8 +163,8 @@ class TestStormSupervisor(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-supervisor', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-supervisor', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -183,8 +183,8 @@ class TestStormSupervisor(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-supervisor', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-supervisor', '2.3.0.0-1234'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 185c66d..af51303 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 @@ -147,7 +147,7 @@ class TestStormUiServer(TestStormBase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.2.1.0-2067'), sudo=True) def test_pre_rolling_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.1/configs/default.json" @@ -166,7 +166,7 @@ class TestStormUiServer(TestStormBase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-client', '2.3.0.0-1234'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 89037eb..781105f 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 @@ -73,7 +73,7 @@ class TestTezClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES) get_hdp_version_mock.return_value = "2.2.1.0-2067" - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) + 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 @@ -87,7 +87,7 @@ class TestTezClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES) get_hdp_version_mock.return_value = "2.2.1.0-2067" - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) + 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 @@ -108,7 +108,7 @@ class TestTezClient(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-client', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 cb7b06b..58573de 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 @@ -392,7 +392,7 @@ class TestAppTimelineServer(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hadoop-yarn-timelineserver', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-yarn-timelineserver', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 1b518d4..139a7d3 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 @@ -44,7 +44,7 @@ class TestAccumuloClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'accumulo-client', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'accumulo-client', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -67,7 +67,7 @@ class TestAccumuloClient(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'accumulo-client', version), sudo=True,) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'accumulo-client', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 ffb5914..d62c2fd 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 @@ -113,7 +113,7 @@ class TestKafkaBroker(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'kafka-broker', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'kafka-broker', version), sudo=True,) self.assertNoMoreResources() @patch("resource_management.core.shell.call") @@ -135,7 +135,7 @@ class TestKafkaBroker(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', - ('hdp-select', 'set', 'kafka-broker', version), sudo=True,) + ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'kafka-broker', version), sudo=True,) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 83bba1f..609c57e 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 @@ -248,7 +248,7 @@ class TestKnoxGateway(RMFTestCase): '/var/lib/knox/data'), sudo = True, ) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'knox-server', '2.2.1.0-3242'), + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'knox-server', '2.2.1.0-3242'), sudo = True, ) self.assertNoMoreResources() @@ -292,7 +292,7 @@ class TestKnoxGateway(RMFTestCase): '/var/lib/knox/data'), sudo = True, ) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'knox-server', version), + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'knox-server', version), sudo = True, ) self.assertResourceCalled('Execute', ('cp', @@ -364,7 +364,7 @@ class TestKnoxGateway(RMFTestCase): '/var/lib/knox/data'), sudo = True, ) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'knox-server', version), + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'knox-server', version), sudo = True, ) self.assertResourceCalled('Execute', ('cp', @@ -438,7 +438,7 @@ class TestKnoxGateway(RMFTestCase): ) ''' - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'knox-server', version), + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'knox-server', version), sudo = True, ) self.assertResourceCalled('Execute', ('cp', http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 912f187..50d523c 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 @@ -211,7 +211,7 @@ class TestRangerAdmin(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'ranger-admin', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'ranger-admin', '2.3.0.0-1234'), sudo=True) self.assertEquals(1, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 d10a9fc..c325709 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 @@ -125,7 +125,7 @@ class TestRangerUsersync(RMFTestCase): environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_67'}, sudo = True ) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'ranger-usersync', '2.2.2.0-2399'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'ranger-usersync', '2.2.2.0-2399'), sudo=True) @patch("setup_ranger.setup_usersync") def test_upgrade_23(self, setup_usersync_mock): @@ -148,7 +148,7 @@ class TestRangerUsersync(RMFTestCase): self.assertResourceCalled("Execute", ("/usr/bin/ranger-usersync-stop",), environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_67'}, sudo = True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'ranger-usersync', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'ranger-usersync', '2.3.0.0-1234'), sudo=True) self.assertEquals(2, mocks_dict['call'].call_count) self.assertEquals(1, mocks_dict['checked_call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 3af55f6..7d45a35 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 @@ -115,8 +115,8 @@ class TestSliderClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'slider-client', '2.2.1.0-2067'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'slider-client', '2.2.1.0-2067'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) self.assertNoMoreResources() @@ -136,8 +136,8 @@ class TestSliderClient(RMFTestCase): call_mocks = [(0, None), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'slider-client', '2.3.0.0-1234'), sudo=True) - self.assertResourceCalled("Execute", ('hdp-select', 'set', 'hadoop-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'slider-client', '2.3.0.0-1234'), sudo=True) + self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.3.0.0-1234'), sudo=True) self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 369fdf9..76e7653 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 @@ -307,7 +307,7 @@ class TestJobHistoryServer(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'spark-historyserver', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'spark-historyserver', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/a00b06ea/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 a414dda..fc4b596 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 @@ -144,7 +144,7 @@ class TestSparkClient(RMFTestCase): call_mocks = [(0, None), (0, None)], mocks_dict = mocks_dict) - self.assertResourceCalled('Execute', ('hdp-select', 'set', 'spark-client', version), sudo=True) + self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'spark-client', version), sudo=True) self.assertNoMoreResources() self.assertEquals(1, mocks_dict['call'].call_count)
