Repository: ambari Updated Branches: refs/heads/branch-3.0-perf 366f6ca9b -> f51351e54
http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py index 19c81a8..7a8afc4 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py @@ -55,7 +55,7 @@ class TestHookAfterInstall(RMFTestCase): 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'], only_if="ls /etc/hadoop/conf") self.assertResourceCalled('Directory', '/etc/ambari-logsearch-logfeeder/conf', @@ -83,7 +83,7 @@ class TestHookAfterInstall(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" self.executeScript("after-INSTALL/scripts/hook.py", classname="AfterInstallHook", @@ -102,7 +102,7 @@ class TestHookAfterInstall(RMFTestCase): group = 'hadoop', conf_dir = "/usr/hdp/2.3.0.0-1234/hadoop/conf", configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], only_if="ls /usr/hdp/2.3.0.0-1234/hadoop/conf") self.assertResourceCalled('Directory', @@ -151,7 +151,7 @@ class TestHookAfterInstall(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" self.executeScript("after-INSTALL/scripts/hook.py", classname="AfterInstallHook", @@ -170,7 +170,7 @@ class TestHookAfterInstall(RMFTestCase): group = 'hadoop', conf_dir = "/usr/hdp/2.3.0.0-1234/hadoop/conf", configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], only_if="ls /usr/hdp/2.3.0.0-1234/hadoop/conf") self.assertResourceCalled('Directory', @@ -223,7 +223,7 @@ class TestHookAfterInstall(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" self.executeScript("after-INSTALL/scripts/hook.py", classname="AfterInstallHook", @@ -255,7 +255,7 @@ class TestHookAfterInstall(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['roleParams']['upgrade_suspended'] = "true" self.executeScript("after-INSTALL/scripts/hook.py", @@ -273,7 +273,7 @@ class TestHookAfterInstall(RMFTestCase): group = 'hadoop', conf_dir = "/usr/hdp/2.3.0.0-1234/hadoop/conf", configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], only_if="ls /usr/hdp/2.3.0.0-1234/hadoop/conf") self.assertResourceCalled('Directory', @@ -321,7 +321,7 @@ class TestHookAfterInstall(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['hostLevelParams']['host_sys_prepped'] = "true" self.executeScript("after-INSTALL/scripts/hook.py", http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index d91bcf4..c56514a 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -484,7 +484,7 @@ class TestHiveMetastore(RMFTestCase): json_content['commandParams']['version'] = '2.3.0.0-1234' json_content['commandParams']['upgrade_direction'] = Direction.UPGRADE - json_content['hostLevelParams']['stack_version'] = '2.3.0.0-0' + json_content['clusterLevelParams']['stack_version'] = '2.3.0.0-0' # now try it in an upgrade self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_metastore.py", @@ -540,7 +540,7 @@ class TestHiveMetastore(RMFTestCase): version = '2.4.0.0-1234' json_content['commandParams']['version'] = version json_content['commandParams']['upgrade_direction'] = Direction.UPGRADE - json_content['hostLevelParams']['stack_version'] = "2.4" + json_content['clusterLevelParams']['stack_version'] = "2.4" json_content["upgradeSummary"] = { "services":{ "HIVE":{ @@ -763,7 +763,7 @@ class TestHiveMetastore(RMFTestCase): version = '2.3.0.0-1234' json_content['commandParams']['version'] = version json_content['commandParams']['upgrade_direction'] = Direction.UPGRADE - json_content['hostLevelParams']['stack_version'] = "2.3" + json_content['clusterLevelParams']['stack_version'] = "2.3" # trigger the code to think it needs to copy the JAR json_content['configurations']['hive-site']['javax.jdo.option.ConnectionDriverName'] = "sap.jdbc4.sqlanywhere.IDriver" http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py index 59b2166..476ccfd 100644 --- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py +++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_tez_client.py @@ -54,7 +54,7 @@ class TestTezClient(RMFTestCase): group = 'hadoop', conf_dir = '/etc/tez/conf', configurations = self.getConfig()['configurations']['tez-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['tez-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['tez-site'], mode = 0664 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py index b352920..1de5445 100644 --- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py +++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py @@ -169,7 +169,7 @@ class TestAppTimelineServer(RMFTestCase): mode = 0644, 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'] ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hdfs', @@ -177,7 +177,7 @@ class TestAppTimelineServer(RMFTestCase): mode = 0644, 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', 'mapred-site.xml', owner = 'yarn', @@ -185,7 +185,7 @@ class TestAppTimelineServer(RMFTestCase): mode = 0644, conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['mapred-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['mapred-site'] ) self.assertResourceCalled('XmlConfig', 'yarn-site.xml', owner = 'yarn', @@ -193,7 +193,7 @@ class TestAppTimelineServer(RMFTestCase): mode = 0644, conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['yarn-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['yarn-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['yarn-site'] ) self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml', owner = 'yarn', @@ -201,7 +201,7 @@ class TestAppTimelineServer(RMFTestCase): mode = 0644, conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['capacity-scheduler'], - configuration_attributes = self.getConfig()['configuration_attributes']['capacity-scheduler'] + configuration_attributes = self.getConfig()['configurationAttributes']['capacity-scheduler'] ) self.assertResourceCalled('File', '/etc/security/limits.d/yarn.conf', content = Template('yarn.conf.j2'), @@ -246,14 +246,14 @@ class TestAppTimelineServer(RMFTestCase): group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['mapred-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['mapred-site'] ) self.assertResourceCalled('XmlConfig', 'capacity-scheduler.xml', owner = 'hdfs', group = 'hadoop', conf_dir = '/etc/hadoop/conf', configurations = self.getConfig()['configurations']['capacity-scheduler'], - configuration_attributes = self.getConfig()['configuration_attributes']['capacity-scheduler'] + configuration_attributes = self.getConfig()['configurationAttributes']['capacity-scheduler'] ) self.assertResourceCalled('File', '/etc/hadoop/conf/fair-scheduler.xml', owner = 'mapred', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json index 013bb8b..c84038d 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json @@ -1,5 +1,5 @@ { - "configuration_attributes": { + "configurationAttributes": { "mapred-site": {}, "hbase-policy": {}, "oozie-env": {}, @@ -42,35 +42,159 @@ "version": "2.2.1.0-2067", "command_timeout": "900", "script_type": "PYTHON" - }, - "roleCommand": "CUSTOM_COMMAND", - "clusterName": "c1", - "hostname": "c6403.ambari.apache.org", - "hostLevelParams": { + }, + "clusterLevelParams": { + "stack_version": "2.1", "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "agent_stack_retry_count": "5", - "agent_stack_retry_on_unavailability": "false", - "jdk_location": "http://10.0.0.15:8080/resources/";, - "ambari_db_rca_password": "mapred", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "java_version": "8", - "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", - "jce_name": "UnlimitedJCEPolicyJDK7.zip", - "custom_command": "RESTART", - "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar";, - "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.0.0-2041\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\"}]";, - "group_list": "[\"hadoop\",\"users\"]", - "agentCacheDir": "/var/lib/ambari-agent/cache", - "stack_version": "2.2", + "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", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", - "db_driver_filename": "mysql-connector-java.jar", - "user_list": "[\"oozie\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"yarn\"]", - "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar"; - }, + "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 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" + }, + "roleCommand": "CUSTOM_COMMAND", + "clusterName": "c1", + "hostname": "c6403.ambari.apache.org", "commandType": "EXECUTION_COMMAND", "roleParams": { "component_category": "CLIENT" http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.1/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json index 536074e..a15c2d9 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json @@ -14,38 +14,168 @@ ], "roleCommand": "SERVICE_CHECK", "clusterName": "c1", - "hostname": "c6401.ambari.apache.org", - "hostLevelParams": { - "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]", - "agent_stack_retry_count": "5", - "agent_stack_retry_on_unavailability": "false", - "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";, - "ambari_db_rca_password": "mapred", - "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", - "jce_name": "UnlimitedJCEPolicyJDK7.zip", - "stack_version": "2.1", - "stack_name": "HDP", - "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u67-linux-x64.tar.gz", - "ambari_db_rca_username": "mapred", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "java_version": "8", - "db_name": "ambari" - }, "commandType": "EXECUTION_COMMAND", "roleParams": {}, "serviceName": "HIVE", "role": "HIVE_SERVER", + "taskId": 152, "commandParams": { - "version": "2.2.1.0-2067", - "command_timeout": "300", - "service_package_folder": "OOZIE", - "script_type": "PYTHON", - "script": "scripts/service_check.py", - "excluded_hosts": "host1,host2" + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package", + "script": "scripts/service_check.py", + "hooks_folder": "stack-hooks", + "version": "2.2.1.0-2067", + "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\"]", + "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 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" }, - "taskId": 152, - "public_hostname": "c6401.ambari.apache.org", "configurations": { "falcon-startup.properties": { "*.oozie.feed.workflow.builder": "org.apache.falcon.workflow.OozieFeedWorkflowBuilder", @@ -810,7 +940,7 @@ "XAAUDIT.SOLR.MAX_QUEUE_SIZE": "1" } }, - "configuration_attributes": { + "configurationAttributes": { "yarn-site": { "final": { "yarn.nodemanager.disk-health-checker.min-healthy-disks": "true", @@ -950,22 +1080,22 @@ "ambari_server_host": [ "c6401.ambari.apache.org" ], - "snamenode_host": [ + "snamenode_hosts": [ "c6402.ambari.apache.org" ], - "nm_hosts": [ + "nodemanager_hosts": [ "c6402.ambari.apache.org" ], "drpc_server_hosts": [ "c6402.ambari.apache.org" ], - "slave_hosts": [ + "datanode_hosts": [ "c6402.ambari.apache.org" ], - "ganglia_server_host": [ + "ganglia_server_hosts": [ "c6402.ambari.apache.org" ], - "hive_server_host": [ + "hive_server_hosts": [ "c6402.ambari.apache.org" ], "logviewer_server_hosts": [ @@ -974,13 +1104,13 @@ "hive_metastore_host": [ "c6402.ambari.apache.org" ], - "hbase_rs_hosts": [ + "hbase_regionservers_hosts": [ "c6402.ambari.apache.org" ], - "webhcat_server_host": [ + "webhcat_server_hosts": [ "c6402.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org", "c6402.ambari.apache.org" ], @@ -996,7 +1126,7 @@ "8670", "8670" ], - "rm_host": [ + "resourcemanaer_hosts": [ "c6402.ambari.apache.org" ], "all_hosts": [ @@ -1006,22 +1136,22 @@ "storm_ui_server_hosts": [ "c6401.ambari.apache.org" ], - "oozie_server": [ + "oozie_server_hosts": [ "c6402.ambari.apache.org" ], - "hs_host": [ + "historyserver_hosts": [ "c6402.ambari.apache.org" ], "nimbus_hosts": [ "c6401.ambari.apache.org" ], - "namenode_host": [ + "namenode_hosts": [ "c6401.ambari.apache.org" ], "hbase_master_hosts": [ "c6402.ambari.apache.org" ], - "hive_mysql_host": [ + "mysql_server_hosts": [ "c6402.ambari.apache.org" ], "falcon_server_hosts": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.1/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json index e2c22be..48c4365 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json @@ -14,43 +14,169 @@ ], "roleCommand": "INSTALL", "clusterName": "c1", - "hostname": "c6401.ambari.apache.org", - "hostLevelParams": { + "commandType": "EXECUTION_COMMAND", + "roleParams": {}, + "serviceName": "HIVE", + "role": "HIVE_SERVER", + "taskId": 186, + "commandParams": { + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package", + "script": "scripts/service_check.py", + "hooks_folder": "stack-hooks", + "version": "2.2.1.0-2067", + "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\"]", - "agent_stack_retry_count": "5", - "agent_stack_retry_on_unavailability": "false", + "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/";, - "ambari_db_rca_password": "mapred", + "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": "UnlimitedJCEPolicyJDK7.zip", - "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";, - "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]";, - "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", - "stack_version": "2.1", - "stack_name": "HDP", + "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", - "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "java_version": "8", - "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar";, - "db_name": "ambari" - }, - "commandType": "EXECUTION_COMMAND", - "roleParams": {}, - "serviceName": "HIVE", - "role": "HIVE_SERVER", - "commandParams": { - "command_timeout": "600", - "service_package_folder": "YARN", - "script_type": "PYTHON", - "script": "scripts/yarn_client.py", - "excluded_hosts": "host1" - }, - "taskId": 186, - "public_hostname": "c6401.ambari.apache.org", - "configuration_attributes": { + "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 + } + } + } + }, + "serviceLevelParams": { + "credentialStoreEnabled": false, + "status_commands_timeout": 300, + "version": "2.7.3", + "service_package_folder": "common-services/HDFS/2.1.0.2.0/package" + }, + "configurationAttributes": { }, "configurations": { @@ -933,37 +1059,37 @@ "ambari_server_host": [ "c6401.ambari.apache.org" ], - "snamenode_host": [ + "snamenode_hosts": [ "c6402.ambari.apache.org" ], - "nm_hosts": [ + "nodemanager_hosts": [ "c6402.ambari.apache.org" ], "drpc_server_hosts": [ "c6402.ambari.apache.org" ], - "slave_hosts": [ + "datanode_hosts": [ "c6402.ambari.apache.org" ], - "ganglia_server_host": [ + "ganglia_server_hosts": [ "c6402.ambari.apache.org" ], - "hive_server_host": [ + "hive_server_hosts": [ "c6402.ambari.apache.org" ], "logviewer_server_hosts": [ "c6402.ambari.apache.org" ], - "hive_metastore_host": [ + "hive_metastore_hosts": [ "c6402.ambari.apache.org" ], - "hbase_rs_hosts": [ + "hbase_regionserver_hosts": [ "c6402.ambari.apache.org" ], - "webhcat_server_host": [ + "webhcat_server_hosts": [ "c6402.ambari.apache.org" ], - "zookeeper_hosts": [ + "zookeeper_server_hosts": [ "c6401.ambari.apache.org", "c6402.ambari.apache.org" ], @@ -979,7 +1105,7 @@ "8670", "8670" ], - "rm_host": [ + "resourcemanager_hosts": [ "c6402.ambari.apache.org" ], "all_hosts": [ @@ -989,22 +1115,22 @@ "storm_ui_server_hosts": [ "c6401.ambari.apache.org" ], - "oozie_server": [ + "oozie_server_hosts": [ "c6402.ambari.apache.org" ], - "hs_host": [ + "historyserver_hosts": [ "c6402.ambari.apache.org" ], "nimbus_hosts": [ "c6401.ambari.apache.org" ], - "namenode_host": [ + "namenode_hosts": [ "c6401.ambari.apache.org" ], "hbase_master_hosts": [ "c6402.ambari.apache.org" ], - "hive_mysql_host": [ + "hive_server_hosts": [ "c6402.ambari.apache.org" ], "falcon_server_hosts": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py index 3114fa8..c6ad147 100644 --- a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py +++ b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py @@ -85,7 +85,7 @@ class TestKnoxGateway(RMFTestCase): group = 'knox', conf_dir = '/usr/hdp/current/knox-server/conf', configurations = self.getConfig()['configurations']['gateway-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['gateway-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['gateway-site'] ) self.assertResourceCalled('File', '/usr/hdp/current/knox-server/conf/gateway-log4j.properties', @@ -385,7 +385,7 @@ class TestKnoxGateway(RMFTestCase): group = 'knox', conf_dir = '/usr/hdp/current/knox-server/conf', configurations = self.getConfig()['configurations']['gateway-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['gateway-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['gateway-site'] ) self.assertResourceCalled('File', '/usr/hdp/current/knox-server/conf/gateway-log4j.properties', http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py index e136fa9..2632f40 100644 --- a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py +++ b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py @@ -52,7 +52,7 @@ class TestMahoutClient(RMFTestCase): mode = 0644, conf_dir = '/usr/hdp/2.2.1.0-2067/hadoop/conf', configurations = self.getConfig()['configurations']['yarn-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['yarn-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['yarn-site'] ) self.assertResourceCalled('File', @@ -93,7 +93,7 @@ class TestMahoutClient(RMFTestCase): # test to make sure conf_select is working correctly 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( http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py index 9ba1275..4536066 100644 --- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py @@ -314,7 +314,7 @@ class TestRangerAdmin(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-admin/conf', configurations = ranger_admin_site_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-admin-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-admin-site'], mode = 0644 ) @@ -348,7 +348,7 @@ class TestRangerAdmin(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-admin/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) @@ -470,7 +470,7 @@ class TestRangerAdmin(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-admin/conf', configurations = ranger_admin_site_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-admin-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-admin-site'], mode = 0644 ) @@ -504,6 +504,6 @@ class TestRangerAdmin(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-admin/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py index dba3a6a..ae98915 100644 --- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py +++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_tagsync.py @@ -126,7 +126,7 @@ class TestRangerTagsync(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-tagsync/conf', configurations = self.getConfig()['configurations']['ranger-tagsync-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-tagsync-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-tagsync-site'], mode=0644 ) @@ -159,6 +159,6 @@ class TestRangerTagsync(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-tagsync/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py index 3f0d21b..9eaae87 100644 --- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py +++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py @@ -143,7 +143,7 @@ class TestRangerUsersync(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-usersync/conf', configurations = ranger_ugsync_site_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-ugsync-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-ugsync-site'], mode = 0644 ) @@ -205,6 +205,6 @@ class TestRangerUsersync(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-usersync/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py index 34ca102..fca5a1b 100644 --- a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py +++ b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py @@ -114,7 +114,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = plugin_audit_properties_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-kms-audit'] + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-kms-audit'] ) self.assertResourceCalled('XmlConfig', 'ranger-kms-security.xml', @@ -123,7 +123,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = self.getConfig()['configurations']['ranger-kms-security'], - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-kms-security'] + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-kms-security'] ) ranger_kms_policymgr_ssl_copy = {} @@ -139,7 +139,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = ranger_kms_policymgr_ssl_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-kms-policymgr-ssl'] + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-kms-policymgr-ssl'] ) self.assertResourceCalled('Execute', ('/usr/hdp/current/ranger-kms/ranger_credential_helper.py', '-l', '/usr/hdp/current/ranger-kms/cred/lib/*', '-f', '/etc/ranger/c1_kms/cred.jceks', '-k', 'sslKeyStore', '-v', 'myKeyFilePassword', '-c', '1'), @@ -451,7 +451,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = dbks_site_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['dbks-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['dbks-site'] ) self.assertResourceCalled('XmlConfig', 'ranger-kms-site.xml', @@ -460,7 +460,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = self.getConfig()['configurations']['ranger-kms-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-kms-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-kms-site'] ) self.assertResourceCalled('XmlConfig', 'kms-site.xml', @@ -469,7 +469,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = self.getConfig()['configurations']['kms-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['kms-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['kms-site'] ) self.assertResourceCalled('File', '/usr/hdp/current/ranger-kms/conf/kms-log4j.properties', @@ -554,7 +554,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = plugin_audit_properties_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-kms-audit'] + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-kms-audit'] ) self.assertResourceCalled('XmlConfig', 'ranger-kms-security.xml', @@ -563,7 +563,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = self.getConfig()['configurations']['ranger-kms-security'], - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-kms-security'] + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-kms-security'] ) ranger_kms_policymgr_ssl_copy = {} @@ -579,7 +579,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = ranger_kms_policymgr_ssl_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-kms-policymgr-ssl'] + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-kms-policymgr-ssl'] ) self.assertResourceCalled('Execute', ('/usr/hdp/current/ranger-kms/ranger_credential_helper.py', '-l', '/usr/hdp/current/ranger-kms/cred/lib/*', '-f', '/etc/ranger/c1_kms/cred.jceks', '-k', 'sslKeyStore', '-v', 'myKeyFilePassword', '-c', '1'), @@ -874,7 +874,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = dbks_site_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['dbks-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['dbks-site'] ) self.assertResourceCalled('XmlConfig', 'ranger-kms-site.xml', @@ -883,7 +883,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = self.getConfig()['configurations']['ranger-kms-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-kms-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-kms-site'] ) self.assertResourceCalled('XmlConfig', 'kms-site.xml', @@ -892,7 +892,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = self.getConfig()['configurations']['kms-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['kms-site'] + configuration_attributes = self.getConfig()['configurationAttributes']['kms-site'] ) self.assertResourceCalled('File', '/usr/hdp/current/ranger-kms/conf/kms-log4j.properties', @@ -907,7 +907,7 @@ class TestRangerKMS(RMFTestCase): group = 'kms', conf_dir = '/usr/hdp/current/ranger-kms/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py index e8bacbd..edbcda5 100644 --- a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py @@ -357,7 +357,7 @@ class TestRangerAdmin(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-admin/conf', configurations = ranger_admin_site_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-admin-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-admin-site'], mode = 0644 ) @@ -403,7 +403,7 @@ class TestRangerAdmin(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-admin/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) @@ -535,7 +535,7 @@ class TestRangerAdmin(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-admin/conf', configurations = ranger_admin_site_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-admin-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-admin-site'], mode = 0644 ) @@ -581,7 +581,7 @@ class TestRangerAdmin(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-admin/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py index 0642428..1d1459a 100644 --- a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py +++ b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_tagsync.py @@ -126,7 +126,7 @@ class TestRangerTagsync(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-tagsync/conf', configurations = self.getConfig()['configurations']['ranger-tagsync-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-tagsync-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-tagsync-site'], mode=0644 ) @@ -155,7 +155,7 @@ class TestRangerTagsync(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-tagsync/conf', configurations = ranger_tagsync_policymgr_ssl_copy, - configuration_attributes = self.getConfig()['configuration_attributes']['ranger-tagsync-policymgr-ssl'], + configuration_attributes = self.getConfig()['configurationAttributes']['ranger-tagsync-policymgr-ssl'], mode = 0644, ) @@ -276,6 +276,6 @@ class TestRangerTagsync(RMFTestCase): group = 'ranger', conf_dir = '/usr/hdp/current/ranger-tagsync/conf', configurations = self.getConfig()['configurations']['core-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['core-site'], + configuration_attributes = self.getConfig()['configurationAttributes']['core-site'], mode = 0644 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py b/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py index f9ad166..5cfe6f6 100644 --- a/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py +++ b/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py @@ -42,7 +42,7 @@ def hive(name=None): XmlConfig("hive-site.xml", conf_dir=hive_config_dir, configurations=params.config['configurations']['hive-site'], - configuration_attributes=params.config['configuration_attributes']['hive-site'], + configuration_attributes=params.config['configurationAttributes']['hive-site'], owner=params.hive_user, group=params.user_group, mode=config_file_mode http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py b/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py index f9ad166..5cfe6f6 100644 --- a/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py +++ b/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py @@ -42,7 +42,7 @@ def hive(name=None): XmlConfig("hive-site.xml", conf_dir=hive_config_dir, configurations=params.config['configurations']['hive-site'], - configuration_attributes=params.config['configuration_attributes']['hive-site'], + configuration_attributes=params.config['configurationAttributes']['hive-site'], owner=params.hive_user, group=params.user_group, mode=config_file_mode
