http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/ecs_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/ecs_client.py b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/ecs_client.py index df7f0cd..452eaa9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/ecs_client.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/package/scripts/ecs_client.py @@ -44,7 +44,7 @@ class ECSClient(Script): XmlConfig("core-site.xml", conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations']['core-site'], - configuration_attributes=params.config['configuration_attributes']['core-site'], + configuration_attributes=params.config['configurationAttributes']['core-site'], owner=params.hdfs_user, group=params.user_group, only_if=format("ls {hadoop_conf_dir}")) @@ -52,7 +52,7 @@ class ECSClient(Script): XmlConfig("hdfs-site.xml", conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations']['hdfs-site'], - configuration_attributes=params.config['configuration_attributes']['hdfs-site'], + configuration_attributes=params.config['configurationAttributes']['hdfs-site'], owner=params.hdfs_user, group=params.user_group, only_if=format("ls {hadoop_conf_dir}"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 652c23e..705b1ee 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 @@ -38,7 +38,7 @@ jdk_location = config['hostLevelParams']['jdk_location'] 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']) +stack_version_unformatted = str(config['clusterLevelParams']['stack_version']) stack_version_formatted = format_stack_version(stack_version_unformatted) hadoop_bin_dir = stack_select.get_hadoop_dir("bin") http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py index 91ae05d..3063dd3 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py @@ -43,7 +43,7 @@ class AfterInstallHook(Hook): configurations=params.config['configurations']['core-site'], owner=params.hdfs_user, mode="f", - configuration_attributes=params.config['configuration_attributes']['core-site'] + configuration_attributes=params.config['configurationAttributes']['core-site'] ) File(format("{params.hadoop_install_root}/cluster.properties"), http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/common-services/HAWQ/hawq_base_test_case.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/common-services/HAWQ/hawq_base_test_case.py b/ambari-server/src/test/python/common-services/HAWQ/hawq_base_test_case.py index 892dca3..75f87c4 100644 --- a/ambari-server/src/test/python/common-services/HAWQ/hawq_base_test_case.py +++ b/ambari-server/src/test/python/common-services/HAWQ/hawq_base_test_case.py @@ -72,7 +72,7 @@ class HawqBaseTestCase(RMFTestCase): self.assertResourceCalled('XmlConfig', 'hdfs-client.xml', conf_dir = self.CONF_DIR, configurations = self.getConfig()['configurations']['hdfs-client'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-client'], + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-client'], group = self.GPADMIN, owner = self.GPADMIN, mode = 0644 @@ -81,7 +81,7 @@ class HawqBaseTestCase(RMFTestCase): self.assertResourceCalled('XmlConfig', 'yarn-client.xml', conf_dir = self.CONF_DIR, configurations = self.getConfig()['configurations']['yarn-client'], - configuration_attributes = self.getConfig()['configuration_attributes']['yarn-client'], + configuration_attributes = self.getConfig()['configurationAttributes']['yarn-client'], group = self.GPADMIN, owner = self.GPADMIN, mode = 0644 @@ -90,7 +90,7 @@ class HawqBaseTestCase(RMFTestCase): self.assertResourceCalled('XmlConfig', 'hawq-site.xml', conf_dir = self.CONF_DIR, configurations = self.getConfig()['configurations']['hawq-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hawq-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['hawq-site'], group = self.GPADMIN, owner = self.GPADMIN, mode = 0644 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/common-services/HAWQ/test_hawqstandby.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/common-services/HAWQ/test_hawqstandby.py b/ambari-server/src/test/python/common-services/HAWQ/test_hawqstandby.py index e553514..f5ce010 100644 --- a/ambari-server/src/test/python/common-services/HAWQ/test_hawqstandby.py +++ b/ambari-server/src/test/python/common-services/HAWQ/test_hawqstandby.py @@ -120,7 +120,7 @@ class TestHawqStandby(HawqBaseTestCase): self.assertResourceCalled('XmlConfig', 'hawq-site.xml', conf_dir = self.CONF_DIR, configurations = self.getConfig()['configurations']['hawq-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hawq-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['hawq-site'], group = self.GPADMIN, owner = self.GPADMIN, mode = 0644 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/common-services/PXF/test_pxf.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/common-services/PXF/test_pxf.py b/ambari-server/src/test/python/common-services/PXF/test_pxf.py index b426d03..8a49f60 100644 --- a/ambari-server/src/test/python/common-services/PXF/test_pxf.py +++ b/ambari-server/src/test/python/common-services/PXF/test_pxf.py @@ -60,7 +60,7 @@ class TestPxf(RMFTestCase): self.assertResourceCalled('XmlConfig', 'pxf-site.xml', conf_dir='/etc/pxf/conf', configurations=self.getConfig()['configurations']['pxf-site'], - configuration_attributes=self.getConfig()['configuration_attributes']['pxf-site']) + configuration_attributes=self.getConfig()['configurationAttributes']['pxf-site']) self.assertResourceCalled('Execute', 'service pxf-service init', timeout=self.DEFAULT_TIMEOUT, http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/common-services/configs/hawq_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/common-services/configs/hawq_default.json b/ambari-server/src/test/python/common-services/configs/hawq_default.json index 1b6fafb..4d22e64 100644 --- a/ambari-server/src/test/python/common-services/configs/hawq_default.json +++ b/ambari-server/src/test/python/common-services/configs/hawq_default.json @@ -1,18 +1,161 @@ { "roleCommand": "SERVICE_CHECK", "clusterName": "phd", - "hostname": "c6401.ambari.apache.org", "commandType": "EXECUTION_COMMAND", "serviceName": "HAWQ", "role": "HAWQ_SERVICE_CHECK", - "hostLevelParams": { + "commandParams": { + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package", + "script": "scripts/service_check.py", + "hooks_folder": "stack-hooks", + "version": "2.1.0.0-1234", + "command_timeout": "300", + "script_type": "PYTHON" + }, + "clusterLevelParams": { + "stack_version": "2.1", "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, - "stack_name": "PHD", - "stack_version": "3.3", - "jdk_name": "jdk-8u60-linux-x64.tar.gz" + "hooks_folder": "stack-hooks", + "stack_name": "HDP", + "group_list": "[\"hdfs\",\"hadoop\",\"users\"]", + "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}", + "cluster_name": "c1", + "user_list": "[\"ambari-qa\",\"hdfs\"]" + }, + "ambariLevelParams": { + "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, + "agent_stack_retry_count": "5", + "db_driver_filename": "mysql-connector-java.jar", + "agent_stack_retry_on_unavailability": "false", + "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", + "jce_name": "jce_policy-7.zip", + "java_version": "7", + "ambari_db_rca_password": "mapred", + "host_sys_prepped": "false", + "db_name": "ambari", + "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar";, + "ambari_db_rca_driver": "org.postgresql.Driver", + "ambari_db_rca_username": "mapred", + "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"; + }, + "repositoryFile": { + "resolved": true, + "repoVersion": "2.6.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + }, + "agentLevelParams": { + "public_hostname": null, + "hostname": "c6401.ambari.apache.org", + "agentConfigParams": { + "agent": { + "parallel_execution": 0, + "use_system_proxy_settings": true + } + }, + "agentCacheDir": "/var/lib/ambari-agent/cache" + }, + "hostLevelParams": { + "recoveryConfig": { + "retryGap": "5", + "windowInMinutes": "60", + "maxLifetimeCount": "1024", + "components": "", + "maxCount": "6", + "type": "AUTO_START" + }, + "hostRepositories": { + "componentRepos": { + "NAMENODE": 1, + "SECONDARY_NAMENODE": 1, + "DATANODE": 1, + "HDFS_CLIENT": 1 + }, + "commandRepos": { + "1": { + "resolved": true, + "repoVersion": "2.1.4.0-60", + "repositories": [ + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";, + "repoName": "HDP-GPL", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-2.6-GPL-repo-1" + }, + { + "mirrorsList": null, + "ambariManaged": true, + "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";, + "repoName": "HDP-UTILS", + "components": null, + "osType": "redhat6", + "distribution": null, + "repoId": "HDP-UTILS-1.1.0.22-repo-1" + } + ], + "feature": { + "m_isScoped": true, + "m_isPreInstalled": false + }, + "stackName": "HDP", + "repoVersionId": 1 + } + } + } }, - "configuration_attributes": { + "configurationAttributes": { "yarn-client": {}, "hdfs-site": {}, "core-site": {}, http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 fb6ec20..400af49 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 @@ -116,7 +116,7 @@ class TestRUSetAll(RMFTestCase): json_payload = json.load(json_file) json_payload['hostLevelParams']['stack_name'] = "HDP" - json_payload['hostLevelParams']['stack_version'] = "2.3" + json_payload['clusterLevelParams']['stack_version'] = "2.3" json_payload['commandParams']['version'] = "2.3.0.0-1234" json_payload["configurations"]["cluster-env"]["stack_tools"] = self.get_stack_tools() json_payload["configurations"]["cluster-env"]["stack_features"] = self.get_stack_features() http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 900ccfb..58418f9 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 @@ -147,7 +147,7 @@ class TestMetricsCollector(RMFTestCase): group = 'hadoop', conf_dir = '/etc/ambari-metrics-collector/conf', configurations = self.getConfig()['configurations']['ams-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['ams-hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['ams-hbase-site'] ) self.assertResourceCalled('XmlConfig', 'ssl-server.xml', @@ -155,7 +155,7 @@ class TestMetricsCollector(RMFTestCase): group = 'hadoop', conf_dir = '/etc/ambari-metrics-collector/conf', configurations = self.getConfig()['configurations']['ams-ssl-server'], - configuration_attributes = self.getConfig()['configuration_attributes']['ams-ssl-server'] + configuration_attributes = self.getConfig()['configurationAttributes']['ams-ssl-server'] ) merged_ams_hbase_site = {} merged_ams_hbase_site.update(self.getConfig()['configurations']['ams-hbase-site']) @@ -167,7 +167,7 @@ class TestMetricsCollector(RMFTestCase): group = 'hadoop', conf_dir = '/etc/ambari-metrics-collector/conf', configurations = merged_ams_hbase_site, - configuration_attributes = self.getConfig()['configuration_attributes']['ams-hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['ams-hbase-site'] ) self.assertResourceCalled('File', '/etc/ambari-metrics-collector/conf/log4j.properties', owner = 'ams', @@ -215,7 +215,7 @@ class TestMetricsCollector(RMFTestCase): mode=0644, conf_dir = '/etc/ambari-metrics-collector/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'ams', @@ -223,7 +223,7 @@ class TestMetricsCollector(RMFTestCase): mode=0644, conf_dir = '/etc/ams-hbase/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'ams', @@ -231,7 +231,7 @@ class TestMetricsCollector(RMFTestCase): mode=0644, conf_dir = '/etc/ambari-metrics-collector/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'ams', @@ -239,7 +239,7 @@ class TestMetricsCollector(RMFTestCase): mode=0644, conf_dir = '/etc/ams-hbase/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) def assert_hbase_configure(self, name=None, distributed=False): @@ -281,14 +281,14 @@ class TestMetricsCollector(RMFTestCase): group = 'hadoop', conf_dir = '/etc/ams-hbase/conf', configurations = self.getConfig()['configurations']['ams-hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['ams-hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['ams-hbase-site'] ) self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'ams', group = 'hadoop', conf_dir = '/etc/ams-hbase/conf', configurations = self.getConfig()['configurations']['ams-hbase-policy'], - configuration_attributes = self.getConfig()['configuration_attributes']['ams-hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['ams-hbase-site'] ) self.assertResourceCalled('File', '/etc/ams-hbase/conf/hbase-env.sh', owner = 'ams', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 1cde55a..6c19d19 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 @@ -64,21 +64,21 @@ class TestHBaseClient(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', @@ -153,21 +153,21 @@ class TestHBaseClient(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 e32393d..e153225 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 @@ -327,21 +327,21 @@ class TestHBaseMaster(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', @@ -458,21 +458,21 @@ class TestHBaseMaster(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', @@ -600,28 +600,28 @@ class TestHBaseMaster(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-master/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site']) + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site']) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-master/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site']) + configuration_attributes = self.getConfig()['configurationAttributes']['core-site']) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-master/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site']) self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-master/conf', configurations = self.getConfig()['configurations']['hbase-policy'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-policy']) + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-policy']) self.assertResourceCalled('File', '/usr/hdp/current/hbase-master/conf/hbase-env.sh', owner = 'hbase', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 6f27ecc..a1dbf00 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 @@ -18,11 +18,11 @@ See the License for the specific language governing permissions and limitations under the License. ''' import json -import upgrade +#import upgrade from mock.mock import MagicMock, patch from stacks.utils.RMFTestCase import * -@patch.object(upgrade, 'check_process_status', new = MagicMock()) +#@patch.object(upgrade, 'check_process_status', new = MagicMock()) @patch("platform.linux_distribution", new = MagicMock(return_value="Linux")) @patch("os.path.exists", new = MagicMock(return_value=True)) class TestHbaseRegionServer(RMFTestCase): @@ -156,21 +156,21 @@ class TestHbaseRegionServer(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', @@ -245,21 +245,21 @@ class TestHbaseRegionServer(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', @@ -347,27 +347,27 @@ class TestHbaseRegionServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site']) + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site']) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site']) self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-policy'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-policy']) + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-policy']) self.assertResourceCalled('File', '/usr/hdp/current/hbase-regionserver/conf/hbase-env.sh', owner = 'hbase', @@ -454,27 +454,27 @@ class TestHbaseRegionServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site']) + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-site']) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site']) self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-policy'], - configuration_attributes = self.getConfig()['configuration_attributes']['hbase-policy']) + configuration_attributes = self.getConfig()['configurationAttributes']['hbase-policy']) self.assertResourceCalled('File', '/usr/hdp/current/hbase-regionserver/conf/hbase-env.sh', owner = 'hbase', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 f27a3b9..a3d6037 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 @@ -181,14 +181,14 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'hbase-site']) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hbase', group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'core-site'] ) self.assertResourceCalled('File', @@ -247,7 +247,7 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'hbase-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', @@ -255,7 +255,7 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', @@ -263,7 +263,7 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', @@ -271,7 +271,7 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-policy'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'hbase-policy'] ) self.assertResourceCalled('File', @@ -348,7 +348,7 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'hbase-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', @@ -356,7 +356,7 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'core-site'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', @@ -364,7 +364,7 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', @@ -372,7 +372,7 @@ class TestPhoenixQueryServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hbase-regionserver/conf', configurations = self.getConfig()['configurations']['hbase-policy'], - configuration_attributes = self.getConfig()['configuration_attributes'][ + configuration_attributes = self.getConfig()['configurationAttributes'][ 'hbase-policy'] ) self.assertResourceCalled('File', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 ef59e84..cd0f925 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 @@ -156,7 +156,7 @@ class TestDatanode(RMFTestCase): with open(config_file, "r") as f: secured_json = json.load(f) - secured_json['hostLevelParams']['stack_version']= '2.2' + secured_json['clusterLevelParams']['stack_version']= '2.2' self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/datanode.py", classname = "DataNode", @@ -196,7 +196,7 @@ class TestDatanode(RMFTestCase): with open(config_file, "r") as f: secured_json = json.load(f) - secured_json['hostLevelParams']['stack_version']= '2.2' + secured_json['clusterLevelParams']['stack_version']= '2.2' secured_json['configurations']['hdfs-site']['dfs.http.policy']= 'HTTPS_ONLY' secured_json['configurations']['hdfs-site']['dfs.datanode.address']= '0.0.0.0:10000' secured_json['configurations']['hdfs-site']['dfs.datanode.https.address']= '0.0.0.0:50000' @@ -271,7 +271,7 @@ class TestDatanode(RMFTestCase): with open(config_file, "r") as f: secured_json = json.load(f) - secured_json['hostLevelParams']['stack_version']= '2.2' + secured_json['clusterLevelParams']['stack_version']= '2.2' self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/datanode.py", classname = "DataNode", @@ -301,7 +301,7 @@ class TestDatanode(RMFTestCase): with open(config_file, "r") as f: secured_json = json.load(f) - secured_json['hostLevelParams']['stack_version']= '2.2' + secured_json['clusterLevelParams']['stack_version']= '2.2' secured_json['configurations']['hdfs-site']['dfs.http.policy']= 'HTTPS_ONLY' secured_json['configurations']['hdfs-site']['dfs.datanode.address']= '0.0.0.0:10000' secured_json['configurations']['hdfs-site']['dfs.datanode.https.address']= '0.0.0.0:50000' @@ -350,14 +350,14 @@ class TestDatanode(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hadoop-client/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/usr/hdp/current/hadoop-client/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/hadoop-client/conf/slaves', @@ -435,7 +435,7 @@ class TestDatanode(RMFTestCase): group = 'hadoop', conf_dir = conf_dir, configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', @@ -443,7 +443,7 @@ class TestDatanode(RMFTestCase): group = 'hadoop', conf_dir = conf_dir, configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', conf_dir + '/slaves', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 fc169f7..cceff28 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 @@ -53,7 +53,7 @@ class Test(RMFTestCase): self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', conf_dir = '/tmp/123', mode=0600, - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'], configurations = self.getConfig()['configurations']['hdfs-site'], ) self.assertResourceCalled('File', '/tmp/123/hadoop-env.sh', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 22e4827..d87a50b 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 @@ -186,14 +186,14 @@ class TestJournalnode(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -247,14 +247,14 @@ class TestJournalnode(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 4e1124a..6381e11 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 @@ -1132,14 +1132,14 @@ class TestNamenode(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -1200,14 +1200,14 @@ class TestNamenode(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -1597,7 +1597,7 @@ class TestNamenode(RMFTestCase): with open(config_file, "r") as f: json_content = json.load(f) json_content['hostLevelParams']['stack_name'] = 'HDP' - json_content['hostLevelParams']['stack_version'] = '2.0' + json_content['clusterLevelParams']['stack_version'] = '2.0' mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py", @@ -1623,7 +1623,7 @@ class TestNamenode(RMFTestCase): version = '2.2.0.0-1234' del json_content['commandParams']['version'] json_content['hostLevelParams']['stack_name'] = 'HDP' - json_content['hostLevelParams']['stack_version'] = '2.2' + json_content['clusterLevelParams']['stack_version'] = '2.2' json_content['commandParams']['version'] = version mocks_dict = {} @@ -1652,7 +1652,7 @@ class TestNamenode(RMFTestCase): json_content['commandParams']['version'] = version json_content['commandParams']['upgrade_direction'] = 'upgrade' json_content['hostLevelParams']['stack_name'] = 'HDP' - json_content['hostLevelParams']['stack_version'] = '2.3' + json_content['clusterLevelParams']['stack_version'] = '2.3' mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py", http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 4317c30..4641e0c 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 @@ -201,14 +201,14 @@ class TestNFSGateway(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -260,14 +260,14 @@ class TestNFSGateway(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -288,7 +288,7 @@ class TestNFSGateway(RMFTestCase): version = '2.3.1.0-3242' json_content['commandParams']['version'] = version stack_version = '2.3' - json_content['hostLevelParams']['stack_version'] = stack_version + json_content['clusterLevelParams']['stack_version'] = stack_version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nfsgateway.py", classname = "NFSGateway", command = "pre_upgrade_restart", http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py index b3d7016..780b608 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py @@ -194,14 +194,14 @@ class TestSNamenode(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -263,14 +263,14 @@ class TestSNamenode(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py index 0fe200c..7e61984 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py @@ -62,14 +62,14 @@ class TestZkfc(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -174,14 +174,14 @@ class TestZkfc(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -270,14 +270,14 @@ class TestZkfc(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', @@ -352,14 +352,14 @@ class TestZkfc(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hdfs-site'] ) self.assertResourceCalled('XmlConfig', 'core-site.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) self.assertResourceCalled('File', '/etc/hadoop/conf/slaves', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py index 457fccf..7a62905 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py @@ -55,7 +55,7 @@ class TestHcatClient(RMFTestCase): mode = 0644, conf_dir = '/usr/hdp/current/hive-server2/conf', configurations = self.getConfig()['configurations']['hive-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hive-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hive-site'] ) self.assertResourceCalled('File', '/etc/hive-hcatalog/conf/hcat-env.sh', content = InlineTemplate(self.getConfig()['configurations']['hcat-env']['content']), @@ -94,7 +94,7 @@ class TestHcatClient(RMFTestCase): mode = 0644, conf_dir = '/usr/hdp/current/hive-server2/conf', configurations = self.getConfig()['configurations']['hive-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hive-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['hive-site'] ) self.assertResourceCalled('File', '/etc/hive-hcatalog/conf/hcat-env.sh', content = InlineTemplate(self.getConfig()['configurations']['hcat-env']['content']), http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 f7af5b9..322c256 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 @@ -49,7 +49,7 @@ class TestHiveClient(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hive-client/conf', mode = 0644, - configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['mapred-site'], owner = 'hive', configurations = self.getConfig()['configurations']['mapred-site'], ) @@ -79,7 +79,7 @@ class TestHiveClient(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hive-client/conf', mode = 0644, - configuration_attributes = self.getConfig()['configuration_attributes']['hive-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['hive-site'], owner = 'hive', configurations = self.getConfig()['configurations']['hive-site'], ) @@ -130,7 +130,7 @@ class TestHiveClient(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hive-client/conf', mode = 0644, - configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['mapred-site'], owner = 'hive', configurations = self.getConfig()['configurations']['mapred-site'], ) @@ -160,7 +160,7 @@ class TestHiveClient(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hive-client/conf', mode = 0644, - configuration_attributes = self.getConfig()['configuration_attributes']['hive-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['hive-site'], owner = 'hive', configurations = self.getConfig()['configurations']['hive-site'], ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py index bacfe3c..ed8a72d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py @@ -417,7 +417,7 @@ class TestHiveMetastore(RMFTestCase): version = "2.3.0.0-1234" json_content['commandParams']['version'] = version json_content['hostLevelParams']['stack_name'] = "HDP" - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" json_content['role'] = "HIVE_SERVER" json_content['configurations']['hive-site']['javax.jdo.option.ConnectionPassword'] = "aaa" http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 8d19e77..99c2d56 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 @@ -454,7 +454,7 @@ class TestHiveServer(RMFTestCase): conf_dir = '/usr/hdp/current/hive-server2/conf/conf.server', mode = 0600, owner = 'hive', - configuration_attributes = self.getConfig()['configuration_attributes']['hiveserver2-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['hiveserver2-site'], configurations = self.getConfig()['configurations']['hiveserver2-site'], ) # Verify creating of Hcat and Hive directories @@ -668,7 +668,7 @@ class TestHiveServer(RMFTestCase): conf_dir = '/usr/hdp/current/hive-server2/conf/conf.server', mode = 0600, owner = 'hive', - configuration_attributes = self.getConfig()['configuration_attributes']['hiveserver2-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['hiveserver2-site'], configurations = self.getConfig()['configurations']['hiveserver2-site'], ) self.assertResourceCalled('HdfsResource', '/apps/webhcat', @@ -871,7 +871,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b""" json_content = json.load(f) version = '2.2.1.0-3242' json_content['commandParams']['version'] = version - json_content['hostLevelParams']['stack_version'] = '2.2' + json_content['clusterLevelParams']['stack_version'] = '2.2' self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "pre_upgrade_restart", @@ -907,7 +907,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b""" json_content = json.load(f) version = '2.3.0.0-1234' json_content['commandParams']['version'] = version - json_content['hostLevelParams']['stack_version'] = '2.3' + json_content['clusterLevelParams']['stack_version'] = '2.3' copy_to_hdfs_mock.return_value = True mocks_dict = {} http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 b4652ac..86b0782 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 @@ -226,7 +226,7 @@ class TestWebHCatServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hive-webhcat/etc/webhcat', configurations = self.getConfig()['configurations']['webhcat-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['webhcat-site'] ) self.assertResourceCalled('File', '/usr/hdp/current/hive-webhcat/etc/webhcat/webhcat-env.sh', content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), @@ -268,7 +268,7 @@ class TestWebHCatServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hive-webhcat/etc/webhcat', configurations = self.getConfig()['configurations']['webhcat-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['webhcat-site'] ) self.assertResourceCalledIgnoreEarlier('File', '/usr/hdp/current/hive-webhcat/etc/webhcat/webhcat-env.sh', @@ -294,7 +294,7 @@ class TestWebHCatServer(RMFTestCase): json_content = json.load(f) version = '2.2.1.0-3242' json_content['commandParams']['version'] = version - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer", command = "pre_upgrade_restart", @@ -316,7 +316,7 @@ class TestWebHCatServer(RMFTestCase): json_content = json.load(f) version = '2.3.0.0-1234' json_content['commandParams']['version'] = version - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", @@ -347,7 +347,7 @@ class TestWebHCatServer(RMFTestCase): json_content = json.load(f) version = '2.3.0.0-1234' json_content['commandParams']['version'] = version - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", @@ -383,7 +383,7 @@ class TestWebHCatServer(RMFTestCase): group = 'hadoop', conf_dir = '/usr/hdp/current/hive-webhcat/etc/webhcat', configurations = self.getConfig()['configurations']['webhcat-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site']) + configuration_attributes = self.getConfig()['configurationAttributes']['webhcat-site']) self.assertResourceCalled('XmlConfig', 'hive-site.xml', owner = 'hive', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 f160029..3ead054 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 @@ -49,7 +49,7 @@ class TestOozieClient(RMFTestCase): mode = 0664, conf_dir = '/etc/oozie/conf', configurations = self.getConfig()['configurations']['oozie-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['oozie-site'] ) self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh', owner = 'oozie', @@ -115,7 +115,7 @@ class TestOozieClient(RMFTestCase): mode = 0664, conf_dir = '/etc/oozie/conf', configurations = self.getConfig()['configurations']['oozie-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['oozie-site'] ) self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh', owner = 'oozie', @@ -168,7 +168,7 @@ class TestOozieClient(RMFTestCase): default_json = json.load(f) - default_json['hostLevelParams']['stack_version']= '2.2' + default_json['clusterLevelParams']['stack_version']= '2.2' self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_client.py", classname = "OozieClient", command = "configure", @@ -187,7 +187,7 @@ class TestOozieClient(RMFTestCase): mode = 0664, conf_dir = '/usr/hdp/current/oozie-client/conf', configurations = self.getConfig()['configurations']['oozie-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['oozie-site'] ) self.assertResourceCalled('File', '/usr/hdp/current/oozie-client/conf/oozie-env.sh', owner = 'oozie', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 4d94723..6b277f2 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 @@ -788,7 +788,7 @@ class TestOozieServer(RMFTestCase): mode = 0664, conf_dir = '/etc/oozie/conf', configurations = self.getConfig()['configurations']['oozie-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['oozie-site'] ) self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh', owner = 'oozie', @@ -987,7 +987,7 @@ class TestOozieServer(RMFTestCase): mode = 0664, conf_dir = '/etc/oozie/conf', configurations = expected_oozie_site, - configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['oozie-site'] ) self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh', owner = 'oozie', @@ -1159,7 +1159,7 @@ class TestOozieServer(RMFTestCase): with open(config_file, "r") as f: default_json = json.load(f) - default_json['hostLevelParams']['stack_version']= '2.2' + default_json['clusterLevelParams']['stack_version']= '2.2' self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "configure", @@ -1254,7 +1254,7 @@ class TestOozieServer(RMFTestCase): version = '2.3.0.0-1234' json_content['commandParams']['version'] = version - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", @@ -1315,7 +1315,7 @@ class TestOozieServer(RMFTestCase): version = '2.3.0.0-1234' json_content['commandParams']['version'] = version - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" json_content['upgradeSummary'] = { 'services': { 'OOZIE': { 'sourceStackId': 'HDP-2.3' }}, 'direction': 'UPGRADE', @@ -1403,7 +1403,7 @@ class TestOozieServer(RMFTestCase): version = '2.3.0.0-1234' json_content['commandParams']['version'] = version json_content['hostLevelParams']['stack_name'] = "HDP" - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server_upgrade.py", classname = "OozieUpgrade", command = "upgrade_oozie_database_and_sharelib", @@ -1466,7 +1466,7 @@ class TestOozieServer(RMFTestCase): version = '2.3.0.0-1234' json_content['commandParams']['version'] = version json_content['hostLevelParams']['stack_name'] = "HDP" - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" # use mysql external database json_content['configurations']['oozie-site']['oozie.service.JPAService.jdbc.driver'] = "com.mysql.jdbc.Driver" http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py index 4edaacc..aa706d6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py @@ -40,7 +40,7 @@ class TestOozieServiceCheck(RMFTestCase): version = '2.3.0.0-1234' json_content['commandParams']['version'] = version json_content['hostLevelParams']['stack_name'] = 'HDP' - json_content['hostLevelParams']['stack_version'] = '2.3' + json_content['clusterLevelParams']['stack_version'] = '2.3' json_content['configurations']['oozie-env']['service_check_job_name'] = 'map-reduce' mocks_dict = {} http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 3c4f899..0d35cb5 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 @@ -101,7 +101,7 @@ class TestPigClient(RMFTestCase): with open(config_file, "r") as f: default_json = json.load(f) - default_json['hostLevelParams']['stack_version'] = '2.2' + default_json['clusterLevelParams']['stack_version'] = '2.2' self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/pig_client.py", classname = "PigClient",
