http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py 
b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py
deleted file mode 100644
index c8906b3..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-from stacks.utils.RMFTestCase import *
-
-class TestDatanode(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/datanode.py",
-                       classname = "DataNode",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertNoMoreResources()
-
-  def test_start_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/datanode.py",
-                       classname = "DataNode",
-                       command = "start",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start datanode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 
2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 
2>&1',
-    )
-    self.assertNoMoreResources()
-
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/datanode.py",
-                       classname = "DataNode",
-                       command = "stop",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop datanode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = None,
-    )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid',
-                              action = ['delete'],
-                              )
-    self.assertNoMoreResources()
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/datanode.py",
-                       classname = "DataNode",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertNoMoreResources()
-
-  def test_start_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/datanode.py",
-                       classname = "DataNode",
-                       command = "start",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', '/usr/bin/sudo [RMF_ENV_PLACEHOLDER] 
-H -E /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start 
datanode',
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 
2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 
2>&1',
-    )
-    self.assertNoMoreResources()
-
-  def test_stop_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/datanode.py",
-                       classname = "DataNode",
-                       command = "stop",
-                       config_file="secured.json"
-    )
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', '/usr/bin/sudo [RMF_ENV_PLACEHOLDER] 
-H -E /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop 
datanode',
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = None,
-    )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid',
-                              action = ['delete'],
-                              )
-    self.assertNoMoreResources()
-  def assert_configure_default(self):
-    self.assertResourceCalled('Directory', '/etc/security/limits.d',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', '/etc/security/limits.d/hdfs.conf',
-                              content = Template('hdfs.conf.j2'),
-                              owner = 'root',
-                              group = 'root',
-                              mode = 0644,
-                              )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = 
self.getConfig()['configurations']['hdfs-site'],
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/slaves',
-                              content = Template('slaves.j2'),
-                              owner = 'hdfs',
-                              )
-    self.assertResourceCalled('Directory', '/var/lib/hadoop-hdfs',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              mode = 0751,
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/hadoop/hdfs',
-                              ignore_failures = True,
-                              mode = 0755,
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/hadoop/hdfs/data',
-                              owner = 'hdfs',
-                              ignore_failures = True,
-                              group = 'hadoop',
-                              mode = 0750,
-                              recursive = False,
-                              )
-
-  def assert_configure_secured(self):
-    self.assertResourceCalled('Directory', '/etc/security/limits.d',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', '/etc/security/limits.d/hdfs.conf',
-                              content = Template('hdfs.conf.j2'),
-                              owner = 'root',
-                              group = 'root',
-                              mode = 0644,
-                              )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = 
self.getConfig()['configurations']['hdfs-site'],
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/slaves',
-                              content = Template('slaves.j2'),
-                              owner = 'root',
-                              )
-    self.assertResourceCalled('Directory', '/var/lib/hadoop-hdfs',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              mode = 0751,
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/hadoop/hdfs',
-                              mode = 0755,
-                              recursive = True,
-                              ignore_failures=True,
-                              )
-    self.assertResourceCalled('Directory', '/hadoop/hdfs/data',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              mode = 0750,
-                              recursive = False,
-                              ignore_failures=True,
-                              )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_hdfs_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_hdfs_client.py 
b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_hdfs_client.py
deleted file mode 100644
index f670ac4..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_hdfs_client.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-from mock.mock import MagicMock, call, patch
-import tempfile
-import tarfile
-import contextlib
-from stacks.utils.RMFTestCase import *
-import os
-
-class Test(RMFTestCase):
-
-  @patch.object(tarfile,"open", new = MagicMock())
-  @patch.object(tempfile,"mkdtemp", new = MagicMock(return_value='/tmp/123'))
-  @patch.object(contextlib,"closing", new = MagicMock())
-  @patch("os.path.exists", new = MagicMock(return_value=True))
-  def test_generate_configs_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/hdfs_client.py",
-                       classname = "HdfsClient",
-                       command = "generate_configs",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('Directory', '/tmp',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('XmlConfig', 'core-site.xml',
-                              conf_dir = '/tmp/123',
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['core-site'],
-                              configurations = 
self.getConfig()['configurations']['core-site'],
-                              )
-    self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
-                              conf_dir = '/tmp/123',
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['mapred-site'],
-                              configurations = 
self.getConfig()['configurations']['mapred-site'],
-                              )
-    self.assertResourceCalled('File', '/tmp/123/log4j.properties',
-                              content = 
InlineTemplate("log4jproperties\nline2log4jproperties\nline2\nambari.jobhistory.database=jdbc:postgresql://c6401.ambari.apache.org/ambarirca\nambari.jobhistory.driver=org.postgresql.Driver\nambari.jobhistory.user=mapred\nambari.jobhistory.password=mapred\nambari.jobhistory.logger=${hadoop.root.logger}\n\nlog4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender\nlog4j.appender.JHA.database=jdbc:postgresql://c6401.ambari.apache.org/ambarirca\nlog4j.appender.JHA.driver=org.postgresql.Driver\nlog4j.appender.JHA.user=mapred\nlog4j.appender.JHA.password=mapred\n\nlog4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=DEBUG,JHA\nlog4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true\n\n"),
-                              )
-    self.assertResourceCalled('PropertiesFile', '/tmp/123/runtime.properties',
-                              properties = UnknownConfigurationMock(),
-    )
-    self.assertResourceCalled('PropertiesFile', '/tmp/123/startup.properties',
-                              properties = UnknownConfigurationMock(),
-    )
-    self.assertResourceCalled('Directory', '/tmp/123',
-                              action = ['delete'],
-                              )
-    self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py 
b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
deleted file mode 100644
index 0ee2e2e..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
+++ /dev/null
@@ -1,337 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-from stacks.utils.RMFTestCase import *
-from ambari_commons import OSCheck
-from mock.mock import MagicMock, patch
-
-class TestNamenode(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertNoMoreResources()
-
-  def test_start_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "start",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertResourceCalled('File', '/tmp/checkForFormat.sh',
-                              content = StaticFile('checkForFormat.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Execute', '/tmp/checkForFormat.sh hdfs 
/etc/hadoop/conf /var/run/hadoop/hdfs/namenode/formatted/ 
/hadoop/hdfs/namenode',
-                              path = 
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-                              not_if = 'test -d 
/var/run/hadoop/hdfs/namenode/formatted/',
-                              )
-    self.assertResourceCalled('Directory', 
'/var/run/hadoop/hdfs/namenode/formatted/',
-        recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start namenode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 
2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 
2>&1',
-    )
-    self.assertResourceCalled('Execute', "hadoop dfsadmin -safemode get | grep 
'Safe mode is OFF'",
-                              tries = 40,
-                              user = 'hdfs',
-                              try_sleep = 10,
-    )
-    self.assertResourceCalled('HdfsDirectory', '/tmp',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              mode = 0777,
-                              owner = 'hdfs',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/user/ambari-qa',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              mode = 0770,
-                              owner = 'ambari-qa',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', None,
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              action = ['create'],
-                              )
-    self.assertNoMoreResources()
-
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "stop",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop namenode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = None,
-    )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid',
-                              action = ['delete'],
-                              )
-    self.assertNoMoreResources()
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertNoMoreResources()
-
-  def test_start_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "start",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertResourceCalled('File', '/tmp/checkForFormat.sh',
-                              content = StaticFile('checkForFormat.sh'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Execute', '/tmp/checkForFormat.sh hdfs 
/etc/hadoop/conf /var/run/hadoop/hdfs/namenode/formatted/ 
/hadoop/hdfs/namenode',
-                              path = 
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-                              not_if = 'test -d 
/var/run/hadoop/hdfs/namenode/formatted/',
-                              )
-    self.assertResourceCalled('Directory', 
'/var/run/hadoop/hdfs/namenode/formatted/',
-        recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start namenode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 
2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 
2>&1',
-    )
-    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hdfs.headless.keytab hdfs',
-                              user = 'hdfs',
-                              )
-    self.assertResourceCalled('Execute', "hadoop dfsadmin -safemode get | grep 
'Safe mode is OFF'",
-                              tries = 40,
-                              try_sleep = 10,
-                              user = 'hdfs'
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/tmp',
-                              security_enabled = True,
-                              keytab = 
'/etc/security/keytabs/hdfs.headless.keytab',
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              mode = 0777,
-                              owner = 'hdfs',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/user/ambari-qa',
-                              security_enabled = True,
-                              keytab = 
'/etc/security/keytabs/hdfs.headless.keytab',
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              mode = 0770,
-                              owner = 'ambari-qa',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', None,
-                              security_enabled = True,
-                              keytab = 
'/etc/security/keytabs/hdfs.headless.keytab',
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              action = ['create'],
-                              )
-    self.assertNoMoreResources()
-
-  def test_stop_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "stop",
-                       config_file="secured.json"
-    )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop namenode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = None,
-    )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid',
-                              action = ['delete'],
-                              )
-    self.assertNoMoreResources()
-    
-    
-  def test_decommission_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "decommission",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
-        owner = 'hdfs',
-        content = Template('exclude_hosts_list.j2'),
-        group = 'hadoop',
-    )
-    self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -refreshNodes',
-        conf_dir = '/etc/hadoop/conf',
-        kinit_override = True,
-        user = 'hdfs',
-    )
-    self.assertNoMoreResources()
-
-  def test_decommission_update_exclude_file_only(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "decommission",
-                       config_file="default_update_exclude_file_only.json"
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
-        owner = 'hdfs',
-        content = Template('exclude_hosts_list.j2'),
-        group = 'hadoop',
-    )
-    self.assertNoMoreResources()
-    
-  def test_decommission_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/namenode.py",
-                       classname = "NameNode",
-                       command = "decommission",
-                       config_file="secured.json"
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
-        owner = 'hdfs',
-        content = Template('exclude_hosts_list.j2'),
-        group = 'hadoop',
-    )
-    self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -refreshNodes',
-        conf_dir = '/etc/hadoop/conf',
-        kinit_override = True,
-        user = 'hdfs',
-    )
-    self.assertNoMoreResources()
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('Directory', '/etc/security/limits.d',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', '/etc/security/limits.d/hdfs.conf',
-                              content = Template('hdfs.conf.j2'),
-                              owner = 'root',
-                              group = 'root',
-                              mode = 0644,
-                              )
-
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = 
self.getConfig()['configurations']['hdfs-site'],
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-                              )
-
-    self.assertResourceCalled('File', '/etc/hadoop/conf/slaves',
-                              content = Template('slaves.j2'),
-                              owner = 'hdfs',
-                              )
-
-    self.assertResourceCalled('Directory', '/hadoop/hdfs/namenode',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              recursive = True,
-                              mode = 0755,
-                              )
-
-  def assert_configure_secured(self):
-    self.assertResourceCalled('Directory', '/etc/security/limits.d',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', '/etc/security/limits.d/hdfs.conf',
-                              content = Template('hdfs.conf.j2'),
-                              owner = 'root',
-                              group = 'root',
-                              mode = 0644,
-                              )
-
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = 
self.getConfig()['configurations']['hdfs-site'],
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-                              )
-
-    self.assertResourceCalled('File', '/etc/hadoop/conf/slaves',
-                              content = Template('slaves.j2'),
-                              owner = 'root',
-                              )
-
-    self.assertResourceCalled('Directory', '/hadoop/hdfs/namenode',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              recursive = True,
-                              mode = 0755,
-                              )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py 
b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py
deleted file mode 100644
index 02d427c..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_service_check.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-from stacks.utils.RMFTestCase import *
-import resource_management.libraries.functions
-from mock.mock import MagicMock, call, patch
-
[email protected](resource_management.libraries.functions, 
"get_unique_id_and_date", new = MagicMock(return_value=''))
-class TestServiceCheck(RMFTestCase):
-  def test_service_check_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/service_check.py",
-                        classname="HdfsServiceCheck",
-                        command="service_check",
-                        config_file="default.json"
-    )
-    
-    self.assert_service_check()
-    self.assertNoMoreResources()
-    
-  def test_service_check_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/service_check.py",
-                        classname="HdfsServiceCheck",
-                        command="service_check",
-                        config_file="secured.json"
-    )
-    self.assertResourceCalled('Execute', "/usr/bin/kinit -kt 
/etc/security/keytabs/smokeuser.headless.keytab ambari-qa",user='ambari-qa')
-    self.assert_service_check()
-    self.assertNoMoreResources()
-        
-  def assert_service_check(self):
-    self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -safemode get | grep 
OFF',
-                              logoutput = True,
-                              tries = 20,
-                              conf_dir = '/etc/hadoop/conf',
-                              try_sleep = 15,
-                              user = 'ambari-qa',
-                              )
-    self.assertResourceCalled('ExecuteHadoop', 'fs -mkdir /tmp ; hadoop fs 
-chmod 777 /tmp',
-                              conf_dir = '/etc/hadoop/conf',
-                              logoutput = True,
-                              not_if = "/usr/bin/sudo su ambari-qa -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]hadoop fs -test -e /tmp'",
-                              try_sleep = 3,
-                              tries = 5,
-                              user = 'ambari-qa',
-                              )
-    self.assertResourceCalled('ExecuteHadoop', 'fs -rm /tmp/; hadoop fs -put 
/etc/passwd /tmp/',
-                              logoutput = True,
-                              tries = 5,
-                              conf_dir = '/etc/hadoop/conf',
-                              try_sleep = 3,
-                              user = 'ambari-qa',
-                              )
-    self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /tmp/',
-                              logoutput = True,
-                              tries = 5,
-                              conf_dir = '/etc/hadoop/conf',
-                              try_sleep = 3,
-                              user = 'ambari-qa',
-                              )
-    self.assertNoMoreResources()
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py 
b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
deleted file mode 100644
index 65f68f0..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-from stacks.utils.RMFTestCase import *
-from ambari_commons import OSCheck
-from mock.mock import MagicMock, patch
-
-class TestSNamenode(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/snamenode.py",
-                       classname = "SNameNode",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
-                              owner = 'hdfs',
-                              content = Template('exclude_hosts_list.j2'),
-                              group = 'hadoop',
-                              )
-    self.assertNoMoreResources()
-
-  def test_start_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/snamenode.py",
-                       classname = "SNameNode",
-                       command = "start",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
-                              owner = 'hdfs',
-                              content = Template('exclude_hosts_list.j2'),
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid >/dev/null 2>&1 && ps -p 
`cat /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start 
secondarynamenode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid 
>/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid` >/dev/null 2>&1',
-    )
-    self.assertNoMoreResources()
-
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/snamenode.py",
-                       classname = "SNameNode",
-                       command = "stop",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid >/dev/null 2>&1 && ps -p 
`cat /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop 
secondarynamenode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = None,
-    )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid',
-                              action = ['delete'],
-                              )
-    self.assertNoMoreResources()
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/snamenode.py",
-                       classname = "SNameNode",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
-                              owner = 'hdfs',
-                              content = Template('exclude_hosts_list.j2'),
-                              group = 'hadoop',
-                              )
-    self.assertNoMoreResources()
-
-  def test_start_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/snamenode.py",
-                       classname = "SNameNode",
-                       command = "start",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
-                              owner = 'hdfs',
-                              content = Template('exclude_hosts_list.j2'),
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid >/dev/null 2>&1 && ps -p 
`cat /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start 
secondarynamenode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid 
>/dev/null 2>&1 && ps -p `cat 
/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid` >/dev/null 2>&1',
-    )
-    self.assertNoMoreResources()
-
-  def test_stop_secured(self):
-    self.executeScript("1.3.2/services/HDFS/package/scripts/snamenode.py",
-                       classname = "SNameNode",
-                       command = "stop",
-                       config_file="secured.json"
-    )
-    self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs',
-                              owner = 'hdfs',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid',
-                              action = ['delete'],
-                              not_if='ls 
/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid >/dev/null 2>&1 && ps -p 
`cat /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid` >/dev/null 2>&1',
-                              )
-    self.assertResourceCalled('Execute', "/usr/bin/sudo su hdfs -l -s 
/bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ulimit -c unlimited &&  
/usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop 
secondarynamenode'",
-        environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
-        not_if = None,
-    )
-    self.assertResourceCalled('File', 
'/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid',
-                              action = ['delete'],
-                              )
-    self.assertNoMoreResources()
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('Directory', '/etc/security/limits.d',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', '/etc/security/limits.d/hdfs.conf',
-                              content = Template('hdfs.conf.j2'),
-                              owner = 'root',
-                              group = 'root',
-                              mode = 0644,
-                              )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = 
self.getConfig()['configurations']['hdfs-site'],
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/slaves',
-                              content = Template('slaves.j2'),
-                              owner = 'hdfs',
-                              )
-    self.assertResourceCalled('Directory', '/hadoop/hdfs/namesecondary',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              mode = 0755,
-                              recursive = True,
-                              )
-
-  def assert_configure_secured(self):
-    self.assertResourceCalled('Directory', '/etc/security/limits.d',
-                              owner = 'root',
-                              group = 'root',
-                              recursive = True,
-                              )
-    self.assertResourceCalled('File', '/etc/security/limits.d/hdfs.conf',
-                              content = Template('hdfs.conf.j2'),
-                              owner = 'root',
-                              group = 'root',
-                              mode = 0644,
-                              )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = 
self.getConfig()['configurations']['hdfs-site'],
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/slaves',
-                              content = Template('slaves.j2'),
-                              owner = 'root',
-                              )
-    self.assertResourceCalled('Directory', '/hadoop/hdfs/namesecondary',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              mode = 0755,
-                              recursive = True,
-                              )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py 
b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py
deleted file mode 100644
index bff8218..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
-
-class TestHcatClient(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hcat_client.py",
-                       classname = "HCatClient",
-                       command = "configure",
-                       config_file="default.json"
-    )
-
-    self.assertResourceCalled('Directory', '/etc/hcatalog/conf',
-      owner = 'hcat',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('Directory', '/var/run/webhcat',
-      owner = 'hcat',
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hive-site.xml',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0644,
-      conf_dir = '/etc/hive/conf',
-      configurations = self.getConfig()['configurations']['hive-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hive-site']
-    )
-    self.assertResourceCalled('File', '/etc/hcatalog/conf/hcat-env.sh',
-                              content = 
InlineTemplate(self.getConfig()['configurations']['hcat-env']['content']),
-                              owner = 'hcat',
-                              group = 'hadoop',
-                              )
-
-    self.assertNoMoreResources()
-
-
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hcat_client.py",
-                         classname = "HCatClient",
-                         command = "configure",
-                         config_file="secured.json"
-    )
-
-    self.assertResourceCalled('Directory', '/etc/hcatalog/conf',
-      owner = 'hcat',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('Directory', '/var/run/webhcat',
-      owner = 'hcat',
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hive-site.xml',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0644,
-      conf_dir = '/etc/hive/conf',
-      configurations = self.getConfig()['configurations']['hive-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hive-site']
-    )
-    self.assertResourceCalled('File', '/etc/hcatalog/conf/hcat-env.sh',
-                              content = 
InlineTemplate(self.getConfig()['configurations']['hcat-env']['content']),
-                              owner = 'hcat',
-                              group = 'hadoop',
-                              )
-    self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py 
b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
deleted file mode 100644
index 45426b1..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
-
-class TestHiveClient(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hive_client.py",
-                       classname = "HiveClient",
-                       command = "configure",
-                       config_file="default_client.json"
-    )
-    self.assertResourceCalled('Directory', '/etc/hive/conf',
-      owner = 'hive',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/etc/hive/conf.server',
-      owner = 'hive',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Execute', "/bin/sh -c 'cd 
/usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 
http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o 
DBConnectionVerification.jar'",
-      not_if = '[ -f /usr/lib/ambari-agent/DBConnectionVerification.jar ]',
-      environment = {'no_proxy': 'c6401.ambari.apache.org'}
-    )
-    self.assertResourceCalled('XmlConfig', 'hive-site.xml',
-                              owner = 'hive',
-                              group = 'hadoop',
-                              mode = 0644,
-                              conf_dir = '/etc/hive/conf',
-                              configurations = 
self.getConfig()['configurations']['hive-site'],
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['hive-site']
-    )
-    self.assertResourceCalled('File', '/etc/hive/conf/hive-env.sh',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', 
'/etc/hive/conf/hive-default.xml.template',
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hive/conf/hive-env.sh.template',
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-exec-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertNoMoreResources()
-
-
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hive_client.py",
-                       classname = "HiveClient",
-                       command = "configure",
-                       config_file="secured_client.json"
-    )
-    self.assertResourceCalled('Directory', '/etc/hive/conf',
-      owner = 'hive',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/etc/hive/conf.server',
-      owner = 'hive',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Execute', "/bin/sh -c 'cd 
/usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 
http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o 
DBConnectionVerification.jar'",
-      not_if = '[ -f /usr/lib/ambari-agent/DBConnectionVerification.jar ]',
-      environment = {'no_proxy': 'c6401.ambari.apache.org'}
-    )
-    self.assertResourceCalled('XmlConfig', 'hive-site.xml',
-                              owner = 'hive',
-                              group = 'hadoop',
-                              mode = 0644,
-                              conf_dir = '/etc/hive/conf',
-                              configurations = 
self.getConfig()['configurations']['hive-site'],
-                              configuration_attributes = 
self.getConfig()['configuration_attributes']['hive-site']
-    )
-    self.assertResourceCalled('File', '/etc/hive/conf/hive-env.sh',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', 
'/etc/hive/conf/hive-default.xml.template',
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hive/conf/hive-env.sh.template',
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-exec-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py 
b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
deleted file mode 100644
index 9fdb4ab..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-from mock.mock import MagicMock, call, patch
-from stacks.utils.RMFTestCase import *
-
-class TestHiveMetastore(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hive_metastore.py",
-                       classname = "HiveMetastore",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-exec-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertNoMoreResources()
-
-  def test_start_default(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hive_metastore.py",
-                       classname = "HiveMetastore",
-                       command = "start",
-                       config_file="default.json"
-    )
-
-    self.assert_configure_default()
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-exec-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr 
JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script 
/var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid 
/etc/hive/conf.server /var/log/hive',
-                              not_if = 'ls /var/run/hive/hive.pid >/dev/null 
2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1',
-                              user = 'hive'
-    )
-
-    self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp 
/usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar
 org.apache.ambari.server.DBConnectionVerification 
\'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' 
hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
-                              
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
-    )
-
-    self.assertNoMoreResources()
-
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hive_metastore.py",
-                       classname = "HiveMetastore",
-                       command = "stop",
-                       config_file="default.json"
-    )
-
-    self.assertResourceCalled('Execute', 'sudo kill `cat 
/var/run/hive/hive.pid`',
-        not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hive/hive.pid` >/dev/null 2>&1)',
-    )
-    self.assertResourceCalled('File', '/var/run/hive/hive.pid',
-        action = ['delete'],
-    )
-    self.assertNoMoreResources()
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hive_metastore.py",
-                       classname = "HiveMetastore",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    self.assert_configure_default()
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-exec-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertNoMoreResources()
-
-  def test_start_secured(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hive_metastore.py",
-                       classname = "HiveMetastore",
-                       command = "start",
-                       config_file="secured.json"
-    )
-
-    self.assert_configure_secured()
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-exec-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hive/conf/hive-log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hive',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr 
JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script 
/var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid 
/etc/hive/conf.server /var/log/hive',
-                              not_if = 'ls /var/run/hive/hive.pid >/dev/null 
2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1',
-                              user = 'hive'
-    )
-
-    self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp 
/usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar
 org.apache.ambari.server.DBConnectionVerification 
\'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' 
hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
-                              
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
-    )
-
-    self.assertNoMoreResources()
-
-  def test_stop_secured(self):
-    self.executeScript("1.3.2/services/HIVE/package/scripts/hive_metastore.py",
-                       classname = "HiveMetastore",
-                       command = "stop",
-                       config_file="secured.json"
-    )
-
-    self.assertResourceCalled('Execute', 'sudo kill `cat 
/var/run/hive/hive.pid`',
-        not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat 
/var/run/hive/hive.pid` >/dev/null 2>&1)',
-    )
-    self.assertResourceCalled('File', '/var/run/hive/hive.pid',
-        action = ['delete'],
-    )
-    self.assertNoMoreResources()
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('Execute', ('cp', 
'/usr/share/java/mysql-connector-java.jar', 
'/usr/lib/hive/lib//mysql-connector-java.jar'),
-                              path = ['/bin', '/usr/bin/'],
-                              creates = 
'/usr/lib/hive/lib//mysql-connector-java.jar',
-                              sudo = True,
-                              not_if = 'test -f 
/usr/lib/hive/lib//mysql-connector-java.jar',
-                              )
-    self.assertResourceCalled('Directory', '/etc/hive/conf',
-      owner = 'hive',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/etc/hive/conf.server',
-      owner = 'hive',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Execute', "/bin/sh -c 'cd 
/usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 
http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o 
DBConnectionVerification.jar'",
-      not_if = '[ -f /usr/lib/ambari-agent/DBConnectionVerification.jar ]',
-      environment = {'no_proxy': 'c6401.ambari.apache.org'}
-    )
-    self.assertResourceCalled('File', '/tmp/start_metastore_script',
-      content = StaticFile('startMetastore.sh'),
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/run/hive',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0755,
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hive',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0755,
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/lib/hive',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0755,
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hive-site.xml',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0600,
-      conf_dir = '/etc/hive/conf.server',
-      configurations = self.getConfig()['configurations']['hive-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hive-site']
-    )
-    self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', 
'/etc/hive/conf/hive-default.xml.template',
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hive/conf/hive-env.sh.template',
-      owner = 'hive',
-      group = 'hadoop',
-    )
-
-  def assert_configure_secured(self):
-    self.assertResourceCalled('Execute', ('cp', 
'/usr/share/java/mysql-connector-java.jar', 
'/usr/lib/hive/lib//mysql-connector-java.jar'),
-                              path = ['/bin', '/usr/bin/'],
-                              creates = 
'/usr/lib/hive/lib//mysql-connector-java.jar',
-                              sudo = True,
-                              not_if = 'test -f 
/usr/lib/hive/lib//mysql-connector-java.jar',
-                              )
-    self.assertResourceCalled('Directory', '/etc/hive/conf',
-      owner = 'hive',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/etc/hive/conf.server',
-      owner = 'hive',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Execute', "/bin/sh -c 'cd 
/usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 
http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o 
DBConnectionVerification.jar'",
-      not_if = '[ -f /usr/lib/ambari-agent/DBConnectionVerification.jar ]',
-      environment = {'no_proxy': 'c6401.ambari.apache.org'}
-    )
-    self.assertResourceCalled('File', '/tmp/start_metastore_script',
-      content = StaticFile('startMetastore.sh'),
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/run/hive',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0755,
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hive',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0755,
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/lib/hive',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0755,
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hive-site.xml',
-      owner = 'hive',
-      group = 'hadoop',
-      mode = 0600,
-      conf_dir = '/etc/hive/conf.server',
-      configurations = self.getConfig()['configurations']['hive-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hive-site']
-    )
-    self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', 
'/etc/hive/conf/hive-default.xml.template',
-      owner = 'hive',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hive/conf/hive-env.sh.template',
-      owner = 'hive',
-      group = 'hadoop',
-    )
-

Reply via email to