http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py index aef9357..7e37873 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py @@ -27,10 +27,10 @@ from resource_management.libraries.script import Script from resource_management.libraries.functions import default from resource_management.libraries.functions import format from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import hdp_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format_jvm_option from resource_management.libraries.functions.is_empty import is_empty -from resource_management.libraries.functions.version import format_hdp_stack_version +from resource_management.libraries.functions.version import format_stack_version from resource_management.libraries.functions.version import compare_versions from ambari_commons.os_check import OSCheck from ambari_commons.constants import AMBARI_SUDO_BINARY @@ -52,13 +52,13 @@ sudo = AMBARI_SUDO_BINARY ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0] stack_version_unformatted = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) +stack_version_formatted = format_stack_version(stack_version_unformatted) restart_type = default("/commandParams/restart_type", "") version = default("/commandParams/version", None) # Handle upgrade and downgrade if (restart_type.lower() == "rolling_upgrade" or restart_type.lower() == "nonrolling_upgrade") and version: - hdp_stack_version = format_hdp_stack_version(version) + stack_version_formatted = format_stack_version(version) security_enabled = config['configurations']['cluster-env']['security_enabled'] hdfs_user = config['configurations']['hadoop-env']['hdfs_user'] @@ -97,8 +97,8 @@ mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*" # upgrades would cause these directories to have a version instead of "current" # which would cause a lot of problems when writing out hadoop-env.sh; instead # force the use of "current" in the hook -hadoop_home = hdp_select.get_hadoop_dir("home", force_latest_on_upgrade=True) -hadoop_libexec_dir = hdp_select.get_hadoop_dir("libexec", force_latest_on_upgrade=True) +hadoop_home = stack_select.get_hadoop_dir("home", force_latest_on_upgrade=True) +hadoop_libexec_dir = stack_select.get_hadoop_dir("libexec", force_latest_on_upgrade=True) hadoop_conf_empty_dir = "/etc/hadoop/conf.empty" hadoop_secure_dn_user = hdfs_user @@ -109,7 +109,7 @@ datanode_max_locked_memory = config['configurations']['hdfs-site']['dfs.datanode is_datanode_max_locked_memory_set = not is_empty(config['configurations']['hdfs-site']['dfs.datanode.max.locked.memory']) # HDP 2.2+ params -if Script.is_hdp_stack_greater_or_equal("2.2"): +if Script.is_stack_greater_or_equal("2.2"): mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce-client/*" # not supported in HDP 2.2+
http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py index d219c2c..f5556fb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py @@ -69,7 +69,7 @@ def setup_users(): if params.has_namenode: if should_create_users_and_groups: create_dfs_cluster_admins() - if params.has_tez and params.hdp_stack_version != "" and compare_versions(params.hdp_stack_version, '2.3') >= 0: + if params.has_tez and params.stack_version_formatted != "" and compare_versions(params.stack_version_formatted, '2.3') >= 0: if should_create_users_and_groups: create_tez_am_view_acls() else: @@ -146,7 +146,7 @@ def setup_hadoop_env(): Directory(params.hadoop_dir, mode=0755) # HDP < 2.2 used a conf -> conf.empty symlink for /etc/hadoop/ - if Script.is_hdp_stack_less_than("2.2"): + if Script.is_stack_less_than("2.2"): Directory(params.hadoop_conf_empty_dir, create_parents = True, owner="root", group=params.user_group ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py index 226cb0f..f49cb58 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py @@ -19,7 +19,7 @@ limitations under the License. from ambari_commons.constants import AMBARI_SUDO_BINARY from ambari_commons.str_utils import cbool, cint -from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions +from resource_management.libraries.functions.version import format_stack_version, compare_versions from resource_management.core.system import System from resource_management.libraries.script.script import Script from resource_management.libraries.functions import default, format @@ -32,7 +32,7 @@ stack_version_unformatted = str(config['hostLevelParams']['stack_version']) agent_stack_retry_on_unavailability = cbool(config["hostLevelParams"]["agent_stack_retry_on_unavailability"]) agent_stack_retry_count = cint(config["hostLevelParams"]["agent_stack_retry_count"]) -hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) +stack_version_formatted = format_stack_version(stack_version_unformatted) #users and groups hbase_user = config['configurations']['hbase-env']['hbase_user'] http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py index 274f29f..07faae4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py @@ -27,7 +27,7 @@ def install_packages(): return packages = ['unzip', 'curl'] - if params.hdp_stack_version != "" and compare_versions(params.hdp_stack_version, '2.2') >= 0: + if params.stack_version_formatted != "" and compare_versions(params.stack_version_formatted, '2.2') >= 0: packages.append('hdp-select') Package(packages, retry_on_repo_unavailability=params.agent_stack_retry_on_unavailability, http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py index 069d1ae..f6f56df 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py @@ -20,11 +20,11 @@ limitations under the License. import os from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import hdp_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import default from resource_management.libraries.functions import format_jvm_option from resource_management.libraries.functions import format -from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions +from resource_management.libraries.functions.version import format_stack_version, compare_versions from ambari_commons.os_check import OSCheck from resource_management.libraries.script.script import Script from resource_management.libraries.functions import get_kinit_path @@ -35,7 +35,7 @@ config = Script.get_config() host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False) stack_version_unformatted = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) +stack_version_formatted = format_stack_version(stack_version_unformatted) dfs_type = default("/commandParams/dfs_type", "") hadoop_conf_dir = "/etc/hadoop/conf" @@ -45,16 +45,16 @@ component_list = default("/localComponents", []) # hadoop default params mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*" -hadoop_libexec_dir = hdp_select.get_hadoop_dir("libexec") -hadoop_lib_home = hdp_select.get_hadoop_dir("lib") -hadoop_bin = hdp_select.get_hadoop_dir("sbin") +hadoop_libexec_dir = stack_select.get_hadoop_dir("libexec") +hadoop_lib_home = stack_select.get_hadoop_dir("lib") +hadoop_bin = stack_select.get_hadoop_dir("sbin") hadoop_home = '/usr' create_lib_snappy_symlinks = True # HDP 2.2+ params -if Script.is_hdp_stack_greater_or_equal("2.2"): +if Script.is_stack_greater_or_equal("2.2"): mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce-client/*" - hadoop_home = hdp_select.get_hadoop_dir("home") + hadoop_home = stack_select.get_hadoop_dir("home") create_lib_snappy_symlinks = False current_service = config['serviceName'] @@ -227,8 +227,8 @@ has_core_site = 'core-site' in config['configurations'] hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab'] kinit_path_local = get_kinit_path() stack_version_unformatted = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) -hadoop_bin_dir = hdp_select.get_hadoop_dir("bin") +stack_version_formatted = format_stack_version(stack_version_unformatted) +hadoop_bin_dir = stack_select.get_hadoop_dir("bin") hdfs_principal_name = default('/configurations/hadoop-env/hdfs_principal_name', None) hdfs_site = config['configurations']['hdfs-site'] default_fs = config['configurations']['core-site']['fs.defaultFS'] http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/params.py index f2819aa..713c3b4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/params.py @@ -17,14 +17,14 @@ limitations under the License. """ -from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions +from resource_management.libraries.functions.version import format_stack_version, compare_versions from resource_management import * import os import itertools import re from resource_management.libraries.functions import conf_select from resource_management.libraries.resources.hdfs_resource import HdfsResource -from resource_management.libraries.functions import hdp_select +from resource_management.libraries.functions import stack_select config = Script.get_config() @@ -38,8 +38,8 @@ hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab'] kinit_path_local = functions.get_kinit_path() stack_version_unformatted = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) -hadoop_bin_dir = hdp_select.get_hadoop_dir("bin") +stack_version_formatted = format_stack_version(stack_version_unformatted) +hadoop_bin_dir = stack_select.get_hadoop_dir("bin") smoke_user = config['configurations']['cluster-env']['smokeuser'] smoke_hdfs_user_dir = format("/user/{smoke_user}") http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/TestVersion.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/TestVersion.py b/ambari-server/src/test/python/TestVersion.py index 3a98a91..0392908 100644 --- a/ambari-server/src/test/python/TestVersion.py +++ b/ambari-server/src/test/python/TestVersion.py @@ -39,10 +39,10 @@ class TestVersion(TestCase): ("2.2.1.3", "2.2.1.3")] for input, expected in l: - actual = self.version_module.format_hdp_stack_version(input) + actual = self.version_module.format_stack_version(input) self.assertEqual(expected, actual) - gluster_fs_actual = self.version_module.format_hdp_stack_version("GlusterFS") + gluster_fs_actual = self.version_module.format_stack_version("GlusterFS") self.assertEqual("", gluster_fs_actual) def test_comparison(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py index 478c052..80ba480 100644 --- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py +++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py @@ -64,7 +64,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") @patch("resource_management.libraries.script.Script.put_structured_out") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") def test_normal_flow_rhel(self, @@ -124,7 +124,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") @patch("resource_management.libraries.script.Script.put_structured_out") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") def test_normal_flow_sles(self, write_actual_version_to_history_file_mock, @@ -185,7 +185,7 @@ class TestInstallPackages(RMFTestCase): @patch("ambari_commons.os_check.OSCheck.is_redhat_family") @patch("resource_management.libraries.script.Script.put_structured_out") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") def test_exclude_existing_repo(self, write_actual_version_to_history_file_mock, @@ -319,7 +319,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.core.resources.packaging.Package") @patch("resource_management.libraries.script.Script.put_structured_out") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") def test_format_package_name(self, write_actual_version_to_history_file_mock, @@ -381,7 +381,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") @patch("resource_management.libraries.script.Script.put_structured_out") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") def test_version_reporting__build_number_defined(self, @@ -460,7 +460,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") @patch("resource_management.libraries.script.Script.put_structured_out") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") @patch("os.path.exists") @@ -516,7 +516,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") @patch("resource_management.libraries.script.Script.put_structured_out") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") @patch("os.path.exists") @@ -608,7 +608,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") @patch("resource_management.libraries.script.Script.put_structured_out") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") def test_version_reporting__build_number_not_defined__usr_hdp_present(self, @@ -686,7 +686,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") @patch("resource_management.libraries.script.Script.put_structured_out") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") def test_version_reporting__wrong_build_number_specified__usr_hdp_present(self, @@ -764,7 +764,7 @@ class TestInstallPackages(RMFTestCase): @patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos") @patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages") @patch("resource_management.libraries.script.Script.put_structured_out") - @patch("resource_management.libraries.functions.hdp_select.get_hdp_versions") + @patch("resource_management.libraries.functions.stack_select.get_stack_versions") @patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file") @patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file") @patch("os.path.exists") http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py index 50bf712..e08e184 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py +++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py @@ -33,7 +33,7 @@ class TestMetricsCollector(RMFTestCase): classname = "AmsCollector", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.maxDiff=None @@ -88,7 +88,7 @@ class TestMetricsCollector(RMFTestCase): classname = "AmsCollector", command = "start", config_file="default_ams_embedded.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.maxDiff=None http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py index 294c15d..eab50d4 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py +++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py @@ -44,7 +44,7 @@ class TestMetricsGrafana(RMFTestCase): classname = "AmsGrafana", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.maxDiff=None http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 3e7c595..5ee1fd9 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 @@ -33,7 +33,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assert_configure_default() @@ -52,7 +52,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assert_configure_default() @@ -86,7 +86,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "start", config_file="flume_only.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assert_configure_default(check_mc=False) @@ -118,7 +118,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertTrue(glob_mock.called) @@ -140,7 +140,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) except: # expected since ComponentIsNotRunning gets raised @@ -188,7 +188,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) except: # expected since ComponentIsNotRunning gets raised @@ -213,7 +213,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) except: # expected since ComponentIsNotRunning gets raised @@ -344,7 +344,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "start", config_file="flume_target.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assert_configure_many() @@ -374,7 +374,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "start", config_file="flume_target.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assert_configure_many() @@ -403,7 +403,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "stop", config_file="flume_target.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertTrue(glob_mock.called) @@ -421,7 +421,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('File', '/etc/flume/conf/x1/ambari-meta.json', action = ['delete'], @@ -435,7 +435,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Directory', '/var/run/flume',) @@ -486,7 +486,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "configure", config_file="flume_22.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Directory', '/var/run/flume',) @@ -538,7 +538,7 @@ class TestFlumeHandler(RMFTestCase): classname = "FlumeHandler", command = "pre_upgrade_restart", config_file="flume_22.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'flume-server', '2.2.1.0-2067'), sudo=True) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_service_check.py index c862880..152d00c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_service_check.py @@ -30,7 +30,7 @@ class TestFlumeCheck(RMFTestCase): classname="FlumeServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_monitor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_monitor.py b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_monitor.py index fd27cde..47ee2f5 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_monitor.py +++ b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_monitor.py @@ -32,7 +32,7 @@ class TestGangliaMonitor(RMFTestCase): classname="GangliaMonitor", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -45,7 +45,7 @@ class TestGangliaMonitor(RMFTestCase): classname="GangliaMonitor", command="configure", config_file="default.non_gmetad_host.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -57,7 +57,7 @@ class TestGangliaMonitor(RMFTestCase): classname="GangliaMonitor", command="start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -73,7 +73,7 @@ class TestGangliaMonitor(RMFTestCase): classname="GangliaMonitor", command="stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E service hdp-gmond stop >> /tmp/gmond.log 2>&1 ; /bin/ps auwx | /bin/grep [g]mond >> /tmp/gmond.log 2>&1', @@ -87,7 +87,7 @@ class TestGangliaMonitor(RMFTestCase): classname="GangliaMonitor", command="install", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py index 53415b1..9df0adb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py @@ -33,7 +33,7 @@ class TestGangliaServer(RMFTestCase): classname="GangliaServer", command="configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -44,7 +44,7 @@ class TestGangliaServer(RMFTestCase): classname="GangliaServer", command="start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -60,7 +60,7 @@ class TestGangliaServer(RMFTestCase): classname="GangliaServer", command="stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E service hdp-gmetad stop >> /tmp/gmetad.log 2>&1 ; /bin/ps auwx | /bin/grep [g]metad >> /tmp/gmetad.log 2>&1', @@ -75,7 +75,7 @@ class TestGangliaServer(RMFTestCase): classname="GangliaServer", command="install", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 6dc4b0b..cbc9066 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 @@ -34,7 +34,7 @@ class TestHBaseClient(RMFTestCase): classname = "HbaseClient", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -131,7 +131,7 @@ class TestHBaseClient(RMFTestCase): classname = "HbaseClient", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/etc/hbase', @@ -228,7 +228,7 @@ class TestHBaseClient(RMFTestCase): classname = "HbaseClient", command = "restart", config_file="client-upgrade.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, mocks_dict = mocks_dict) @@ -253,7 +253,7 @@ class TestHBaseClient(RMFTestCase): classname = "HbaseClient", command = "restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.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 719ae3e..3045efa 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 @@ -33,7 +33,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "install", config_file="hbase_no_phx.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, try_install=True, checked_call_mocks = [(0, "OK.", ""),(0, "OK.", "")], @@ -54,7 +54,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "install", config_file="hbase_with_phx.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, try_install=True, checked_call_mocks = [(0, "OK.", ""),(0, "OK.", "")], @@ -73,7 +73,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -85,7 +85,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -101,7 +101,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -122,7 +122,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "decommission", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -153,7 +153,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "decommission", config_file="default.hbasedecom.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -172,7 +172,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -184,7 +184,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -200,7 +200,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -221,7 +221,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "decommission", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -517,7 +517,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "start", config_file="hbase-2.2.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Directory', '/etc/hbase', @@ -701,7 +701,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -723,7 +723,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -740,7 +740,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -758,7 +758,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -768,7 +768,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -778,7 +778,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMasterUpgrade", command = "take_snapshot", config_file="hbase-preupgrade.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', " echo 'snapshot_all' | /usr/hdp/current/hbase-client/bin/hbase shell", @@ -801,7 +801,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, mocks_dict = mocks_dict) self.assertResourceCalled('Execute', @@ -824,7 +824,7 @@ class TestHBaseMaster(RMFTestCase): classname = "HbaseMaster", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None, ''), (0, None, ''), (0, None, '')], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.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 9c846c8..8d187ec 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 @@ -33,7 +33,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "configure", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -45,7 +45,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "start", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -61,7 +61,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "stop", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -82,7 +82,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "configure", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -94,7 +94,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "start", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -110,7 +110,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "stop", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -327,7 +327,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "start", config_file="hbase-rs-2.2.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Directory', '/etc/hbase', @@ -441,7 +441,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "start", config_file="hbase-rs-2.2-phoenix.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Directory', '/etc/hbase', @@ -586,7 +586,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -608,7 +608,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -625,7 +625,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityIssuesFound": "Keytab file or principal are not set property."}) @@ -644,7 +644,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -654,7 +654,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -669,7 +669,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hbase-regionserver', version), sudo=True,) @@ -687,7 +687,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "post_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, call_mocks = [(0, "Dummy output c6401.ambari.apache.org:")], target = RMFTestCase.TARGET_COMMON_SERVICES, mocks_dict = mocks_dict) @@ -709,7 +709,7 @@ class TestHbaseRegionServer(RMFTestCase): classname = "HbaseRegionServer", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None), (0, None), (0, None)], mocks_dict = mocks_dict) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py index a5a360a..69a6665 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py @@ -33,7 +33,7 @@ class TestServiceCheck(RMFTestCase): classname="HbaseServiceCheck", command="service_check", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/hbaseSmokeVerify.sh', @@ -58,7 +58,7 @@ class TestServiceCheck(RMFTestCase): classname="HbaseServiceCheck", command="service_check", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/hbaseSmokeVerify.sh', @@ -91,7 +91,7 @@ class TestServiceCheck(RMFTestCase): classname="HbaseServiceCheck", command="service_check", config_file="hbase-check-2.2.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/hbaseSmokeVerify.sh', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 6c3ad89..9f52b57 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 @@ -38,7 +38,7 @@ class TestPhoenixQueryServer(RMFTestCase): classname = "PhoenixQueryServer", command = "configure", config_file = "hbase_default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, None)] ) @@ -52,7 +52,7 @@ class TestPhoenixQueryServer(RMFTestCase): classname = "PhoenixQueryServer", command = "start", config_file = "hbase_default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, None)] ) @@ -71,7 +71,7 @@ class TestPhoenixQueryServer(RMFTestCase): classname = "PhoenixQueryServer", command = "stop", config_file = "hbase_default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, None)] ) @@ -98,7 +98,7 @@ class TestPhoenixQueryServer(RMFTestCase): classname = "PhoenixQueryServer", command = "configure", config_file = "hbase_secure.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, None)] ) @@ -112,7 +112,7 @@ class TestPhoenixQueryServer(RMFTestCase): classname = "PhoenixQueryServer", command = "start", config_file = "hbase_secure.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, None)] ) @@ -131,7 +131,7 @@ class TestPhoenixQueryServer(RMFTestCase): classname = "PhoenixQueryServer", command = "stop", config_file = "hbase_secure.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, None)] ) @@ -164,7 +164,7 @@ class TestPhoenixQueryServer(RMFTestCase): classname = "PhoenixQueryServer", command = "start", config_file = "hbase-rs-2.4.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Directory', '/etc/hbase', @@ -470,7 +470,7 @@ class TestPhoenixQueryServer(RMFTestCase): command = "pre_upgrade_restart", config_dict = json_content, call_mocks = [(0, "/etc/hbase/2.3.0.0-1234/0", ''), (0, None, None), (0, None, None)], - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Directory', '/etc/hbase/2.3.0.0-1234/0', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 113fb7f..f939eed 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 @@ -35,7 +35,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "configure", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -46,7 +46,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "start", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -79,7 +79,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "stop", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh su hdfs -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited ; /usr/lib/hadoop/sbin/hadoop-daemon.sh --config /etc/hadoop/conf stop datanode'", @@ -95,7 +95,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "configure", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -106,7 +106,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "start", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -144,7 +144,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "start", config_dict = secured_json, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured("2.2", snappy_enabled=False) @@ -185,7 +185,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "start", config_dict = secured_json, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured("2.2", snappy_enabled=False) @@ -218,7 +218,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "stop", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E /usr/lib/hadoop/sbin/hadoop-daemon.sh --config /etc/hadoop/conf stop datanode', @@ -241,7 +241,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "stop", config_dict = secured_json, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E /usr/hdp/current/hadoop-client/sbin/hadoop-daemon.sh --config /usr/hdp/current/hadoop-client/conf stop datanode', @@ -266,7 +266,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "stop", config_dict = secured_json, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh su hdfs -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited ; /usr/hdp/current/hadoop-client/sbin/hadoop-daemon.sh --config /usr/hdp/current/hadoop-client/conf stop datanode'", @@ -437,7 +437,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-datanode', version), sudo=True,) @@ -457,7 +457,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -505,7 +505,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "post_upgrade_restart", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, shell_call_output)], mocks_dict = mocks_dict @@ -525,7 +525,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "post_upgrade_restart", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, 'There are no DataNodes here!')], mocks_dict = mocks_dict @@ -546,7 +546,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "post_upgrade_restart", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, 'some')], mocks_dict = mocks_dict @@ -574,7 +574,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "stop", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mock_side_effects, command_args=["rolling"]) @@ -604,7 +604,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "stop", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mock_side_effects, command_args=["rolling"]) @@ -649,7 +649,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -669,7 +669,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -685,7 +685,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -704,7 +704,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -723,7 +723,7 @@ class TestDatanode(RMFTestCase): classname = "DataNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) http://git-wip-us.apache.org/repos/asf/ambari/blob/f7221e5a/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 1e3057f..b5b43d6 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 @@ -40,7 +40,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "generate_configs", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/tmp', @@ -79,7 +79,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "restart", config_file="client-upgrade.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) @@ -114,7 +114,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -136,7 +136,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -149,7 +149,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -170,7 +170,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -180,7 +180,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "security_status", config_file="default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -199,7 +199,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict) @@ -226,7 +226,7 @@ class Test(RMFTestCase): classname = "HdfsClient", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalledIgnoreEarlier('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/f7221e5a/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 417921a..4d91897 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 @@ -33,7 +33,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "configure", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -44,7 +44,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "start", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -76,7 +76,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "stop", config_file = "default.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh su hdfs -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited ; /usr/lib/hadoop/sbin/hadoop-daemon.sh --config /etc/hadoop/conf stop journalnode'", @@ -91,7 +91,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "configure", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -102,7 +102,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "start", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -134,7 +134,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "stop", config_file = "secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', "ambari-sudo.sh su hdfs -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited ; /usr/lib/hadoop/sbin/hadoop-daemon.sh --config /etc/hadoop/conf stop journalnode'", @@ -286,7 +286,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "post_upgrade_restart", config_file = "journalnode-upgrade.json", checked_call_mocks = [(0, str(namenode_status_active)), (0, str(namenode_status_standby))], - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) # ensure that the mock was called with the http-style version of the URL @@ -305,7 +305,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "post_upgrade_restart", config_file = "journalnode-upgrade-hdfs-secure.json", checked_call_mocks = [(0, str(namenode_status_active)), (0, str(namenode_status_standby))], - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) # ensure that the mock was called with the http-style version of the URL @@ -327,7 +327,7 @@ class TestJournalnode(RMFTestCase): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/journalnode.py", classname = "JournalNode", command = "post_upgrade_restart", config_file = "journalnode-upgrade.json", - hdp_stack_version = self.UPGRADE_STACK_VERSION, + stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) self.fail("Expected a failure since the JMX JSON for JournalTransactionInfo was missing") @@ -365,7 +365,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -385,7 +385,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -401,7 +401,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) except: @@ -422,7 +422,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -442,7 +442,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "security_status", config_file="secured.json", - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @@ -458,7 +458,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-hdfs-journalnode', version), sudo=True,) self.assertNoMoreResources() @@ -476,7 +476,7 @@ class TestJournalnode(RMFTestCase): classname = "JournalNode", command = "pre_upgrade_restart", config_dict = json_content, - hdp_stack_version = self.STACK_VERSION, + stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None, ''), (0, None)], mocks_dict = mocks_dict)
