You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/03/21 15:12:01 UTC
[2/4] ambari git commit: Revert "AMBARI-15487. Add support for ECS
stack (Vijay Srinivasaraghavan via smohanty)"
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/metainfo.xml
deleted file mode 100644
index 97be2db..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/metainfo.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<metainfo>
- <schemaVersion>2.0</schemaVersion>
- <services>
- <service>
- <name>YARN</name>
- <version>2.7.1.2.3</version>
- <requiredServices>
- <service>ECS</service>
- <service>MAPREDUCE2</service>
- <service>ZOOKEEPER</service>
- </requiredServices>
- <components>
- <component>
- <name>NODEMANAGER</name>
- <displayName>NodeManager</displayName>
- <category>SLAVE</category>
- <cardinality>1+</cardinality>
- <versionAdvertised>true</versionAdvertised>
- <dependencies>
- <dependency>
- <name>ECS/ECS_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- <dependency>
- <name>TEZ/TEZ_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- </dependencies>
- </component>
- <component>
- <name>APP_TIMELINE_SERVER</name>
- <displayName>App Timeline Server</displayName>
- <category>MASTER</category>
- <cardinality>0-1</cardinality>
- <dependencies>
- <dependency>
- <name>ECS/ECS_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- </dependencies>
- </component>
- <component>
- <name>RESOURCEMANAGER</name>
- <category>MASTER</category>
- <cardinality>1-2</cardinality>
- <dependencies>
- <dependency>
- <name>TEZ/TEZ_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- <dependency>
- <name>ECS/ECS_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- </dependencies>
- <configuration-dependencies>
- <config-type>capacity-scheduler</config-type>
- </configuration-dependencies>
- </component>
- </components>
- </service>
-
- <service>
- <name>MAPREDUCE2</name>
- <version>2.7.1.2.3</version>
- <components>
- <component>
- <name>HISTORYSERVER</name>
- <displayName>History Server</displayName>
- <category>MASTER</category>
- <cardinality>1</cardinality>
- <versionAdvertised>true</versionAdvertised>
- <auto-deploy>
- <enabled>true</enabled>
- <co-locate>YARN/RESOURCEMANAGER</co-locate>
- </auto-deploy>
- <dependencies>
- <dependency>
- <name>ECS/ECS_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- <dependency>
- <name>TEZ/TEZ_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- </dependencies>
- </component>
-
- <component>
- <name>MAPREDUCE2_CLIENT</name>
- <displayName>MapReduce2 Client</displayName>
- <category>CLIENT</category>
- <cardinality>0+</cardinality>
- <versionAdvertised>true</versionAdvertised>
- </component>
- </components>
-
- <requiredServices>
- <service>YARN</service>
- </requiredServices>
-
- <configuration-dir>configuration-mapred</configuration-dir>
- </service>
-
- </services>
-</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml
deleted file mode 100644
index c2fe742..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<metainfo>
- <schemaVersion>2.0</schemaVersion>
- <services>
- <service>
- <name>ZOOKEEPER</name>
- <version>3.4.6.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>zookeeper_2_3_*</name>
- </package>
- <package>
- <name>zookeeper_2_3_*-server</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>zookeeper-2-3-.*</name>
- </package>
- <package>
- <name>zookeeper-2-3-.*-server</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
- </service>
- </services>
-</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index 63f50ff..dbcf70e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -177,7 +177,7 @@ public class AmbariManagementControllerTest {
private static final String PROPERTY_NAME = "hbase.regionserver.msginterval";
private static final String SERVICE_NAME = "HDFS";
private static final String FAKE_SERVICE_NAME = "FAKENAGIOS";
- private static final int STACK_VERSIONS_CNT = 15;
+ private static final int STACK_VERSIONS_CNT = 14;
private static final int REPOS_CNT = 3;
private static final int STACKS_CNT = 3;
private static final int STACK_PROPERTIES_CNT = 103;
@@ -4215,13 +4215,6 @@ public class AmbariManagementControllerTest {
Assert.assertEquals("a1", task.getRole().name());
Assert.assertEquals("h1", task.getHostName());
ExecutionCommand cmd = task.getExecutionCommandWrapper().getExecutionCommand();
- // h1 has only DATANODE, NAMENODE, CLIENT sch's
- Assert.assertEquals("h1", cmd.getHostname());
- Assert.assertFalse(cmd.getLocalComponents().isEmpty());
- Assert.assertTrue(cmd.getLocalComponents().contains(Role.DATANODE.name()));
- Assert.assertTrue(cmd.getLocalComponents().contains(Role.NAMENODE.name()));
- Assert.assertTrue(cmd.getLocalComponents().contains(Role.HDFS_CLIENT.name()));
- Assert.assertFalse(cmd.getLocalComponents().contains(Role.RESOURCEMANAGER.name()));
Type type = new TypeToken<Map<String, String>>(){}.getType();
Map<String, String> hostParametersStage = StageUtils.getGson().fromJson(stage.getHostParamsStage(), type);
Map<String, String> commandParametersStage = StageUtils.getGson().fromJson(stage.getCommandParamsStage(), type);
@@ -4274,13 +4267,6 @@ public class AmbariManagementControllerTest {
Assert.assertEquals("HDFS", cmd.getServiceName());
Assert.assertEquals("DATANODE", cmd.getComponentName());
Assert.assertEquals(requestProperties.get(REQUEST_CONTEXT_PROPERTY), response.getRequestContext());
- // h2 has only DATANODE sch
- Assert.assertEquals("h2", cmd.getHostname());
- Assert.assertFalse(cmd.getLocalComponents().isEmpty());
- Assert.assertTrue(cmd.getLocalComponents().contains(Role.DATANODE.name()));
- Assert.assertFalse(cmd.getLocalComponents().contains(Role.NAMENODE.name()));
- Assert.assertFalse(cmd.getLocalComponents().contains(Role.HDFS_CLIENT.name()));
- Assert.assertFalse(cmd.getLocalComponents().contains(Role.RESOURCEMANAGER.name()));
hosts = new ArrayList<String>() {{add("h3");}};
resourceFilters.clear();
@@ -10345,7 +10331,6 @@ public class AmbariManagementControllerTest {
Assert.assertTrue(commandParamsStage.containsKey("some_custom_param"));
Assert.assertEquals(null, cmd.getServiceName());
Assert.assertEquals(null, cmd.getComponentName());
- Assert.assertTrue(cmd.getLocalComponents().isEmpty());
Assert.assertEquals(requestProperties.get(REQUEST_CONTEXT_PROPERTY), response.getRequestContext());
@@ -10388,7 +10373,6 @@ public class AmbariManagementControllerTest {
Assert.assertTrue(commandParamsStage.containsKey("some_custom_param"));
Assert.assertEquals(null, cmd.getServiceName());
Assert.assertEquals(null, cmd.getComponentName());
- Assert.assertTrue(cmd.getLocalComponents().isEmpty());
Assert.assertEquals(requestProperties.get(REQUEST_CONTEXT_PROPERTY), response.getRequestContext());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
index c60c6ca..e06f4e8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
@@ -111,30 +111,19 @@ public class StackManagerTest {
@Test
public void testGetsStacks() throws Exception {
Collection<StackInfo> stacks = stackManager.getStacks();
- assertEquals(19, stacks.size());
+ assertEquals(18, stacks.size());
}
@Test
public void testGetStacksByName() {
Collection<StackInfo> stacks = stackManager.getStacks("HDP");
- assertEquals(15, stacks.size());
+ assertEquals(14, stacks.size());
stacks = stackManager.getStacks("OTHER");
assertEquals(2, stacks.size());
}
@Test
- public void testHCFSServiceType() {
-
- StackInfo stack = stackManager.getStack("HDP", "2.2.0.ECS");
- ServiceInfo service = stack.getService("ECS");
- assertEquals(service.getServiceType(),"HCFS");
-
- service = stack.getService("HDFS");
- assertNull(service);
- }
-
- @Test
public void testGetStack() {
StackInfo stack = stackManager.getStack("HDP", "0.1");
assertNotNull(stack);
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java
index 75e0991..df22acc 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java
@@ -62,13 +62,6 @@ public class ServiceInfoTest {
" <comment>Apache Hadoop Distributed File System</comment>\n" +
" <version>2.1.0.2.0</version>\n" +
" </service>\n" +
- " <service>\n" +
- " <name>HCFS_SERVICE</name>\n" +
- " <displayName>HCFS_SERVICE</displayName>\n" +
- " <comment>Hadoop Compatible File System</comment>\n" +
- " <version>2.1.1.0</version>\n" +
- " <serviceType>HCFS</serviceType>\n" +
- " </service>\n" +
" </services>\n" +
"</metainfo>\n";
@@ -77,7 +70,6 @@ public class ServiceInfoTest {
assertTrue(serviceInfoMap.get("RESTART").isRestartRequiredAfterRackChange());
assertFalse(serviceInfoMap.get("NO_RESTART").isRestartRequiredAfterRackChange());
assertNull(serviceInfoMap.get("DEFAULT_RESTART").isRestartRequiredAfterRackChange());
- assertEquals(serviceInfoMap.get("HCFS_SERVICE").getServiceType(),"HCFS");
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/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 2345439..30c0ac6 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
@@ -327,7 +327,6 @@ class TestMetricsCollector(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'ams',
mode = 0775,
hadoop_conf_dir = '/etc/hadoop/conf',
@@ -344,7 +343,6 @@ class TestMetricsCollector(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'ams',
mode = 0711,
hadoop_conf_dir = '/etc/hadoop/conf',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/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 c75f3c4..2401df3 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
@@ -337,7 +337,6 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hbase',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -351,7 +350,6 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hbase',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
@@ -366,7 +364,6 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -478,7 +475,6 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hbase',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -492,7 +488,6 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hbase',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
@@ -507,7 +502,6 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -630,7 +624,6 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
owner = 'hbase',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -646,7 +639,6 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
owner = 'hbase',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -665,7 +657,6 @@ class TestHBaseMaster(RMFTestCase):
user = 'hdfs',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
- dfs_type = ''
)
self.assertResourceCalled('Execute', '/usr/hdp/current/hbase-master/bin/hbase-daemon.sh --config /usr/hdp/current/hbase-master/conf start master',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/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 d6e32e8..0520ce8 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
@@ -106,7 +106,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -124,7 +123,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -142,7 +140,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -222,7 +219,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -240,7 +236,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -258,7 +253,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -350,7 +344,6 @@ class TestNamenode(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -365,7 +358,6 @@ class TestNamenode(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -381,7 +373,6 @@ class TestNamenode(RMFTestCase):
hadoop_bin_dir = '/usr/bin',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -453,7 +444,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -471,7 +461,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -489,7 +478,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -553,7 +541,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -571,7 +558,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -589,7 +575,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -659,7 +644,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -677,7 +661,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -695,7 +678,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -765,7 +747,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -783,7 +764,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -801,7 +781,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -870,7 +849,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -888,7 +866,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -906,7 +883,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -983,7 +959,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -1001,7 +976,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -1019,7 +993,6 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
index 881e467..10140f9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
@@ -70,7 +70,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -86,7 +85,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -102,7 +100,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -117,7 +114,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/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 7129d35..641d6f9 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
@@ -338,7 +338,6 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hcat',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -352,7 +351,6 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hcat',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -371,7 +369,6 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hive',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -385,7 +382,6 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hive',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -400,7 +396,6 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hive',
group = 'hdfs',
hadoop_bin_dir = '/usr/bin',
@@ -415,7 +410,6 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='missing_principal', default_fs=default_fs_default,
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -532,7 +526,6 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hcat',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -546,7 +539,6 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hcat',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -561,7 +553,6 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hive',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -575,7 +566,6 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hive',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -589,7 +579,6 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hive',
group = 'hdfs',
hadoop_bin_dir = '/usr/bin',
@@ -604,7 +593,6 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -939,7 +927,6 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='missing_principal', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
@@ -982,7 +969,6 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='missing_principal', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index 9e816b5..971cb8f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -101,7 +101,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'missing_principal',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -118,7 +117,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'missing_principal',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -134,7 +132,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'missing_principal',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -217,7 +214,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -234,7 +230,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -252,7 +247,6 @@ class TestServiceCheck(RMFTestCase):
user = 'hdfs',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
- dfs_type = ''
)
self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa 50111 idtest.ambari-qa.1431110511.43.pig /etc/security/keytabs/smokeuser.headless.keytab true /usr/bin/kinit ambari-qa@EXAMPLE.COM',
logoutput = True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/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 bfe0d25..d6a5c89 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
@@ -71,7 +71,6 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'oozie',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -85,7 +84,6 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -287,7 +285,6 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
owner = 'oozie',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -304,7 +301,6 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -514,7 +510,6 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
- dfs_type = '',
hdfs_site = self.getConfig()['configurations']['hdfs-site'],
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
@@ -534,7 +529,6 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -611,7 +605,6 @@ class TestOozieServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
- dfs_type = '',
hdfs_site = self.getConfig()['configurations']['hdfs-site'],
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
@@ -633,7 +626,6 @@ class TestOozieServer(RMFTestCase):
user = 'hdfs',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
- dfs_type = ''
)
self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-start.sh',
environment = {'OOZIE_CONFIG': '/etc/oozie/conf'},
@@ -668,7 +660,6 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'oozie',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
@@ -682,7 +673,6 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -854,7 +844,6 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'oozie',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
@@ -871,7 +860,6 @@ class TestOozieServer(RMFTestCase):
user = 'hdfs',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
- dfs_type = ''
)
self.assertResourceCalled('Directory', '/etc/oozie/conf',
owner = 'oozie',
@@ -1398,7 +1386,6 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
- dfs_type = '',
hdfs_site = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
@@ -1420,7 +1407,6 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/2.3.0.0-1234/hadoop/conf' )
@@ -1473,7 +1459,6 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
- dfs_type = '',
hdfs_site = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
@@ -1495,7 +1480,6 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/2.3.0.0-1234/hadoop/conf' )
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
index acb8222..3d70f88 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
@@ -90,7 +90,6 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -103,7 +102,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '//examples',
user = 'hdfs',
- dfs_type = '',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -117,7 +115,6 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -130,7 +127,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '//examples/input-data',
user = 'hdfs',
- dfs_type = '',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -144,7 +140,6 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
index 3eb81ef..f81deb2 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
@@ -43,7 +43,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -60,7 +59,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -76,7 +74,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -119,7 +116,6 @@ class TestPigServiceCheck(RMFTestCase):
hdfs_site = self.getConfig()['configurations']['hdfs-site'],
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
- dfs_type = '',
user = 'hdfs',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
@@ -137,7 +133,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -153,7 +148,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
index b1634d0..7cca7eb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
@@ -63,7 +63,6 @@ class TestHistoryServer(RMFTestCase):
type="directory",
action=["create_on_execute"], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u"hdfs",
- dfs_type = '',
owner=u"tez",
mode=493,
hadoop_bin_dir="/usr/bin",
@@ -82,7 +81,6 @@ class TestHistoryServer(RMFTestCase):
action=["create_on_execute"], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u'hdfs',
owner=u"tez",
- dfs_type = '',
mode=493,
hadoop_bin_dir="/usr/bin",
hadoop_conf_dir="/etc/hadoop/conf",
@@ -99,7 +97,6 @@ class TestHistoryServer(RMFTestCase):
action=['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u'hdfs',
hadoop_bin_dir="/usr/bin",
- dfs_type = '',
hadoop_conf_dir="/etc/hadoop/conf",
hdfs_site=self.getConfig()["configurations"]["hdfs-site"],
default_fs=u'hdfs://c6401.ambari.apache.org:8020',
@@ -203,7 +200,6 @@ class TestHistoryServer(RMFTestCase):
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
kinit_path_local = '/usr/bin/kinit',
recursive_chmod = True,
owner = 'yarn',
@@ -223,7 +219,6 @@ class TestHistoryServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
owner = 'yarn',
group = 'hadoop',
hadoop_conf_dir = '/etc/hadoop/conf',
@@ -236,8 +231,7 @@ class TestHistoryServer(RMFTestCase):
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
- user = 'hdfs',
- dfs_type = '',
+ user = 'hdfs',
owner = 'mapred',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -250,7 +244,6 @@ class TestHistoryServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -264,7 +257,6 @@ class TestHistoryServer(RMFTestCase):
change_permissions_for_parents = True,
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'mapred',
group = 'hadoop',
hadoop_bin_dir = '/usr/bin',
@@ -279,7 +271,6 @@ class TestHistoryServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -457,7 +448,6 @@ class TestHistoryServer(RMFTestCase):
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
user = 'hdfs',
- dfs_type = '',
kinit_path_local = '/usr/bin/kinit',
recursive_chmod = True,
owner = 'yarn',
@@ -477,7 +467,6 @@ class TestHistoryServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
owner = 'yarn',
group = 'hadoop',
hadoop_conf_dir = '/etc/hadoop/conf',
@@ -491,7 +480,6 @@ class TestHistoryServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'mapred',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -504,7 +492,6 @@ class TestHistoryServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -518,7 +505,6 @@ class TestHistoryServer(RMFTestCase):
change_permissions_for_parents = True,
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'mapred',
group = 'hadoop',
hadoop_bin_dir = '/usr/bin',
@@ -533,7 +519,6 @@ class TestHistoryServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -863,7 +848,6 @@ class TestHistoryServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
index 4f550ef..fddab87 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
@@ -47,7 +47,6 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -60,7 +59,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '/etc/passwd',
user = 'hdfs',
- dfs_type = '',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -72,7 +70,6 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -107,7 +104,6 @@ class TestServiceCheck(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -120,7 +116,6 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '/etc/passwd',
user = 'hdfs',
- dfs_type = '',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -132,7 +127,6 @@ class TestServiceCheck(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
index 86e1fa6..922f28f 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
@@ -139,7 +139,6 @@ class TestFalconServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'falcon',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -157,7 +156,6 @@ class TestFalconServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'falcon',
group='users',
hadoop_conf_dir = '/etc/hadoop/conf',
@@ -176,7 +174,6 @@ class TestFalconServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -328,7 +325,6 @@ class TestFalconServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
owner = 'falcon',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -347,7 +343,6 @@ class TestFalconServer(RMFTestCase):
source = '/usr/hdp/current/falcon-server/data-mirroring',
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
- dfs_type = '',
hdfs_site = self.getConfig()['configurations']['hdfs-site'],
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
@@ -370,7 +365,6 @@ class TestFalconServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
index c9bc6de..70f99a9 100644
--- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
@@ -46,7 +46,6 @@ class TestTezServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
@@ -59,7 +58,6 @@ class TestTezServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -73,7 +71,6 @@ class TestTezServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '/tmp/sample-tez-test',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -86,7 +83,6 @@ class TestTezServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -130,7 +126,6 @@ class TestTezServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -145,7 +140,6 @@ class TestTezServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -162,7 +156,6 @@ class TestTezServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -178,7 +171,6 @@ class TestTezServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/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 46a2fe0..b43a429 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
@@ -200,7 +200,6 @@ class TestAppTimelineServer(RMFTestCase):
user = 'hdfs',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
- dfs_type = ''
)
self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude',
owner = 'yarn',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
index a58fa9e..06edfd3 100644
--- a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
@@ -48,7 +48,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -65,7 +64,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'file',
@@ -81,7 +79,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
@@ -114,7 +111,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -131,7 +127,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'file',
@@ -149,7 +144,6 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
index e01c041..75559f4 100644
--- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
+++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
@@ -61,7 +61,6 @@ class TestJobHistoryServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
@@ -126,7 +125,6 @@ class TestJobHistoryServer(RMFTestCase):
kinit_path_local='/usr/bin/kinit',
principal_name=UnknownConfigurationMock(),
security_enabled=True,
- dfs_type = '',
user=UnknownConfigurationMock()
)
@@ -177,7 +175,6 @@ class TestJobHistoryServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
owner = 'spark',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -194,7 +191,6 @@ class TestJobHistoryServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
@@ -252,7 +248,6 @@ class TestJobHistoryServer(RMFTestCase):
user = UnknownConfigurationMock(),
owner = 'spark',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
- dfs_type = '',
type = 'directory',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
mode = 0775,
@@ -269,7 +264,6 @@ class TestJobHistoryServer(RMFTestCase):
user = UnknownConfigurationMock(),
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
- dfs_type = '',
)
self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf',
owner = 'spark',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py
index a231a2f..414b6f3 100644
--- a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py
@@ -45,7 +45,6 @@ class TestMahoutClient(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -57,7 +56,6 @@ class TestMahoutClient(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -71,7 +69,6 @@ class TestMahoutClient(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '/tmp/sample-mahout-test.txt',
user = 'hdfs',
- dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'file',
@@ -84,7 +81,6 @@ class TestMahoutClient(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
- dfs_type = '',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
index 17a347b..23f2ae6 100644
--- a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
@@ -106,7 +106,6 @@ class TestSparkThriftServer(RMFTestCase):
type = 'directory',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
mode = 0775,
- dfs_type = ''
)
self.assertResourceCalled('HdfsResource', None,
immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
@@ -120,7 +119,6 @@ class TestSparkThriftServer(RMFTestCase):
user = 'hdfs',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
- dfs_type = ''
)
self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf',
owner = 'spark',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py b/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py
index 60e4808..68708c7 100644
--- a/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py
+++ b/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py
@@ -168,7 +168,6 @@ class TestAts(RMFTestCase):
type = 'directory',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
mode = 0755,
- dfs_type = ''
)
self.assertResourceCalled('HdfsResource', '/ats/done',
immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
@@ -186,7 +185,6 @@ class TestAts(RMFTestCase):
type = 'directory',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
mode = 0700,
- dfs_type = ''
)
self.assertResourceCalled('HdfsResource', '/ats',
immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
@@ -205,7 +203,6 @@ class TestAts(RMFTestCase):
type = 'directory',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
mode = 0755,
- dfs_type = ''
)
self.assertResourceCalled('HdfsResource', '/ats/active',
immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
@@ -223,7 +220,6 @@ class TestAts(RMFTestCase):
type = 'directory',
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
mode = 01777,
- dfs_type = ''
)
self.assertResourceCalled('HdfsResource', None,
immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
@@ -237,7 +233,6 @@ class TestAts(RMFTestCase):
user = 'hdfs',
action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hadoop_conf_dir = '/etc/hadoop/conf',
- dfs_type = ''
)
self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude',
owner = 'yarn',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/metainfo.xml
deleted file mode 100644
index 43bcda5..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/metainfo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<metainfo>
- <versions>
- <active>true</active>
- </versions>
- <extends>2.2.0</extends>
-</metainfo>
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/hdp.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/hdp.json b/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/hdp.json
deleted file mode 100644
index 37a6a60..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/hdp.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "HDP-2.2.0": {
- "latest": {
- "centos6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.0.0-123",
- "redhat6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-123",
- "oraclelinux6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.0.0-123",
- "suse11": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11/2.x/BUILDS/2.2.0.0-123/hdp.repo"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml
deleted file mode 100644
index 6c2f99a..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<reposinfo>
- <latest>./hdp.json</latest>
- <os family="centos6">
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0</baseurl>
- <repoid>HDP-2.2.0</repoid>
- <reponame>HDP</reponame>
- </repo>
- </os>
- <os family="centos5">
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0</baseurl>
- <repoid>HDP-2.2.0</repoid>
- <reponame>HDP</reponame>
- </repo>
- </os>
- <os family="redhat6">
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0</baseurl>
- <repoid>HDP-2.2.0</repoid>
- <reponame>HDP</reponame>
- </repo>
- </os>
- <os family="redhat5">
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0</baseurl>
- <repoid>HDP-2.2.0</repoid>
- <reponame>HDP</reponame>
- </repo>
- </os>
- <os family="suse11">
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.2.0.0</baseurl>
- <repoid>HDP-2.2.0</repoid>
- <reponame>HDP</reponame>
- </repo>
- </os>
- <os family="any">
- <repo>
- <baseurl>http://public-repo.emc.com/ECS/2.2/updates/2.2.0.0</baseurl>
- <repoid>ECS-2.2.0.0</repoid>
- <reponame>ECS</reponame>
- </repo>
- </os>
-</reposinfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f189015a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/services/ECS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/services/ECS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/services/ECS/metainfo.xml
deleted file mode 100644
index 1990b67..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/services/ECS/metainfo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<metainfo>
- <schemaVersion>2.0</schemaVersion>
- <services>
- <service>
- <name>ECS</name>
- <displayName>ECS</displayName>
- <serviceType>HCFS</serviceType>
- <comment>An Hadoop Compatible File System</comment>
- <version>2.2.0.0</version>
- <components>
- <component>
- <name>ECS_CLIENT</name>
- <category>CLIENT</category>
- </component>
- </components>
- </service>
- </services>
-</metainfo>