ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmitriu...@apache.org
Subject [07/21] ambari git commit: AMBARI-9068. Remove HDP 1.3 stack defn from Ambari. (dlysnichenko)
Date Mon, 12 Jan 2015 11:53:02 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
deleted file mode 100644
index 64ed904..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
+++ /dev/null
@@ -1,421 +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 TestJobtracker(RMFTestCase):
-
-  @patch("os.path.exists", new = MagicMock(return_value=True))
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertNoMoreResources()
-
-  @patch("os.path.exists", new = MagicMock(return_value=True))
-  def test_start_default(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "start",
-                       config_file="default.json"
-      )
-    self.assert_configure_default()
-    self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start jobtracker',
-                       user = 'mapred',
-                       not_if = 'ls /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid` >/dev/null 2>&1'
-    )
-    self.assertResourceCalled('Execute', 'ls /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid` >/dev/null 2>&1',
-                       user = 'mapred',
-                       initial_wait = 5,
-                       not_if= 'ls /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid` >/dev/null 2>&1'
-    )
-    self.assertNoMoreResources()
-
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "stop",
-                       config_file="default.json"
-    )
-
-    self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop jobtracker',
-                              user = 'mapred'
-    )
-    self.assertResourceCalled('File', '/var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid',
-        action = ['delete'],
-    )
-    self.assertNoMoreResources()
-
-  def test_decommission_default(self):
-
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "decommission",
-                       config_file="default.json"
-    )
-
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
-                       owner = 'mapred',
-                       content = Template('exclude_hosts_list.j2'),
-                       group = 'hadoop',
-    )
-    self.assertResourceCalled('ExecuteHadoop', 'mradmin -refreshNodes',
-                       conf_dir = '/etc/hadoop/conf',
-                       kinit_override = True,
-                       user = 'mapred',
-    )
-    self.assertNoMoreResources()
-
-  def test_decommission_default_no_refersh(self):
-
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "decommission",
-                       config_file="default.hbasedecom.json"
-    )
-
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
-                              owner = 'mapred',
-                              content = Template('exclude_hosts_list.j2'),
-                              group = 'hadoop',
-                              )
-    self.assertNoMoreResources()
-
-  @patch("os.path.exists", new = MagicMock(return_value=True))
-  def test_configure_secured(self):
-
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertNoMoreResources()
-
-  @patch("os.path.exists", new = MagicMock(return_value=True))
-  def test_start_secured(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "start",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start jobtracker',
-                       user = 'mapred',
-                       not_if = 'ls /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid` >/dev/null 2>&1'
-    )
-    self.assertResourceCalled('Execute', 'ls /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid` >/dev/null 2>&1',
-                       user = 'mapred',
-                       initial_wait = 5,
-                       not_if= 'ls /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid` >/dev/null 2>&1'
-    )
-    self.assertNoMoreResources()
-
-  def test_stop_secured(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "stop",
-                       config_file="secured.json"
-    )
-
-    self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop jobtracker',
-                       user = 'mapred'
-    )
-    self.assertResourceCalled('File', '/var/run/hadoop/mapred/hadoop-mapred-jobtracker.pid',
-        action = ['delete'],
-    )
-    self.assertNoMoreResources()
-
-  def test_decommission_secured(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/jobtracker.py",
-                       classname = "Jobtracker",
-                       command = "decommission",
-                       config_file="secured.json"
-    )
-
-    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/jt.service.keytab jt/c6402.ambari.apache.org@EXAMPLE.COM',
-                       user = 'mapred',
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
-                       owner = 'mapred',
-                       content = Template('exclude_hosts_list.j2'),
-                       group = 'hadoop',
-    )
-
-    self.assertResourceCalled('ExecuteHadoop', 'mradmin -refreshNodes',
-                       conf_dir = '/etc/hadoop/conf',
-                       kinit_override = True,
-                       user = 'mapred',
-    )
-    self.assertNoMoreResources()
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('HdfsDirectory', '/mapred',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              owner = 'mapred',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/mapred/system',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              owner = 'mapred',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/mapred/history',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              owner = 'mapred',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              mode = 0777,
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/mapred/history/done',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              mode = 0777,
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              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.assertResourceCalled('Directory', '/var/run/hadoop/mapred',
-      owner = 'mapred',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/mapred',
-      owner = 'mapred',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
-      mode = 01777,
-      recursive = True,
-    )
-    self.assertResourceCalled('File', '/var/log/hadoop/mapred/hadoop-mapreduce.jobsummary.log',
-      owner = 'mapred',
-      group = 'hadoop',
-      mode = 0664
-    )
-    self.assertResourceCalled('Directory', '/hadoop/mapred',
-      owner = 'mapred',
-      recursive = True,
-      mode = 0755,
-      ignore_failures=True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/mapred1',
-      owner = 'mapred',
-      recursive = True,
-      mode = 0755,
-      ignore_failures=True,
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
-      owner = 'mapred',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.include',
-      owner = 'mapred',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/taskcontroller.cfg',
-                              content = Template('taskcontroller.cfg.j2'),
-                              owner = 'hdfs',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = self.getConfig()['configurations']['mapred-site'],
-                              configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/fair-scheduler.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-client.xml.example',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-server.xml.example',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-
-  def assert_configure_secured(self):
-    self.assertResourceCalled('HdfsDirectory', '/mapred',
-                              security_enabled = True,
-                              keytab = '/etc/security/keytabs/hdfs.headless.keytab',
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              owner = 'mapred',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/mapred/system',
-                              security_enabled = True,
-                              keytab = '/etc/security/keytabs/hdfs.headless.keytab',
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              owner = 'mapred',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/mapred/history',
-                              security_enabled = True,
-                              keytab = '/etc/security/keytabs/hdfs.headless.keytab',
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              owner = 'mapred',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/mr-history/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 = 'mapred',
-                              group = 'hadoop',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/mapred/history/done',
-                              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 = 'mapred',
-                              group = 'hadoop',
-                              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.assertResourceCalled('Directory', '/var/run/hadoop/mapred',
-      owner = 'mapred',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/mapred',
-      owner = 'mapred',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
-      mode = 01777,
-      recursive = True,
-    )
-    self.assertResourceCalled('File', '/var/log/hadoop/mapred/hadoop-mapreduce.jobsummary.log',
-      owner = 'mapred',
-      group = 'hadoop',
-      mode = 0664
-    )
-    self.assertResourceCalled('Directory', '/hadoop/mapred',
-      owner = 'mapred',
-      recursive = True,
-      mode = 0755,
-      ignore_failures=True,
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
-      owner = 'mapred',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.include',
-      owner = 'mapred',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/usr/lib/hadoop/bin/task-controller',
-                              owner = 'root',
-                              group = 'hadoop',
-                              mode = 06050,
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/taskcontroller.cfg',
-                              content = Template('taskcontroller.cfg.j2'),
-                              owner = 'root',
-                              group = 'hadoop',
-                              mode = 0644,
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = self.getConfig()['configurations']['mapred-site'],
-                              configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/fair-scheduler.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-client.xml.example',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-server.xml.example',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_service_check.py
deleted file mode 100644
index 7391a04..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_service_check.py
+++ /dev/null
@@ -1,78 +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 TestServiceCheck(RMFTestCase):
-
-  def test_service_check_default(self):
-
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/service_check.py",
-                        classname="ServiceCheck",
-                        command="service_check",
-                        config_file="default.json"
-    )
-    self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr mapredsmokeoutput mapredsmokeinput ; hadoop dfs -put /etc/passwd mapredsmokeinput',
-                        try_sleep = 5,
-                        tries = 1,
-                        user = 'ambari-qa',
-                        conf_dir = '/etc/hadoop/conf',
-    )
-    self.assertResourceCalled('ExecuteHadoop', 'jar /usr/lib/hadoop//hadoop-examples.jar wordcount mapredsmokeinput mapredsmokeoutput',
-                        logoutput = True,
-                        try_sleep = 5,
-                        tries = 1,
-                        user = 'ambari-qa',
-                        conf_dir = '/etc/hadoop/conf',
-    )
-    self.assertResourceCalled('ExecuteHadoop', 'fs -test -e mapredsmokeoutput',
-                        user = 'ambari-qa',
-                        conf_dir = '/etc/hadoop/conf',
-    )
-    self.assertNoMoreResources()
-
-  def test_service_check_secured(self):
-
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/service_check.py",
-                       classname="ServiceCheck",
-                       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.assertResourceCalled('ExecuteHadoop', 'dfs -rmr mapredsmokeoutput mapredsmokeinput ; hadoop dfs -put /etc/passwd mapredsmokeinput',
-                       try_sleep = 5,
-                       tries = 1,
-                       user = 'ambari-qa',
-                       conf_dir = '/etc/hadoop/conf',
-    )
-    self.assertResourceCalled('ExecuteHadoop', 'jar /usr/lib/hadoop//hadoop-examples.jar wordcount mapredsmokeinput mapredsmokeoutput',
-                       logoutput = True,
-                       try_sleep = 5,
-                       tries = 1,
-                       user = 'ambari-qa',
-                       conf_dir = '/etc/hadoop/conf',
-    )
-    self.assertResourceCalled('ExecuteHadoop', 'fs -test -e mapredsmokeoutput',
-                       user = 'ambari-qa',
-                       conf_dir = '/etc/hadoop/conf',
-    )
-    self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
deleted file mode 100644
index 9e380bb..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
+++ /dev/null
@@ -1,240 +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 *
-import os
-
-origin_exists = os.path.exists
-@patch.object(os.path, "exists", new=MagicMock(
-  side_effect=lambda *args: origin_exists(args[0])
-  if args[0][-2:] == "j2" else True))
-class TestTasktracker(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/tasktracker.py",
-                       classname = "Tasktracker",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assert_configure_default()
-    self.assertNoMoreResources()
-
-  def test_start_default(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/tasktracker.py",
-                         classname = "Tasktracker",
-                         command = "start",
-                         config_file="default.json"
-      )
-    self.assert_configure_default()
-    self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start tasktracker',
-                              user = 'mapred',
-                              not_if = 'ls /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid` >/dev/null 2>&1'
-    )
-    self.assertResourceCalled('Execute', 'ls /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid` >/dev/null 2>&1',
-                              user = 'mapred',
-                              initial_wait = 5,
-                              not_if= 'ls /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid` >/dev/null 2>&1'
-    )
-    self.assertNoMoreResources()
-
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/tasktracker.py",
-                       classname = "Tasktracker",
-                       command = "stop",
-                       config_file="default.json"
-    )
-
-    self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop tasktracker',
-                              user = 'mapred'
-    )
-    self.assertResourceCalled('File', '/var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid',
-        action = ['delete'],
-    )
-    self.assertNoMoreResources()
-
-
-  def test_configure_secured(self):
-
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/tasktracker.py",
-                       classname = "Tasktracker",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertNoMoreResources()
-
-  def test_start_secured(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/tasktracker.py",
-                         classname = "Tasktracker",
-                         command = "start",
-                         config_file="secured.json"
-    )
-    self.assert_configure_secured()
-    self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start tasktracker',
-                              user = 'mapred',
-                              not_if = 'ls /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid` >/dev/null 2>&1'
-    )
-    self.assertResourceCalled('Execute', 'ls /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid` >/dev/null 2>&1',
-                              user = 'mapred',
-                              initial_wait = 5,
-                              not_if= 'ls /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid` >/dev/null 2>&1'
-    )
-    self.assertNoMoreResources()
-
-  def test_stop_secured(self):
-    self.executeScript("1.3.2/services/MAPREDUCE/package/scripts/tasktracker.py",
-                       classname = "Tasktracker",
-                       command = "stop",
-                       config_file="secured.json"
-    )
-
-    self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec && /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf stop tasktracker',
-                              user = 'mapred'
-    )
-    self.assertResourceCalled('File', '/var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid',
-        action = ['delete'],
-    )
-    self.assertNoMoreResources()
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('Directory', '/var/run/hadoop/mapred',
-      owner = 'mapred',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/mapred',
-      owner = 'mapred',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
-      mode = 01777,
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/mapred',
-      owner = 'mapred',
-      recursive = True,
-      mode = 0755,
-      ignore_failures=True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/mapred1',
-      owner = 'mapred',
-      recursive = True,
-      mode = 0755,
-      ignore_failures=True,
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
-      owner = 'mapred',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.include',
-      owner = 'mapred',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/taskcontroller.cfg',
-                              content = Template('taskcontroller.cfg.j2'),
-                              owner = 'hdfs',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = self.getConfig()['configurations']['mapred-site'],
-                              configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/fair-scheduler.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-client.xml.example',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-server.xml.example',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-  def assert_configure_secured(self):
-    self.assertResourceCalled('Directory', '/var/run/hadoop/mapred',
-      owner = 'mapred',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/mapred',
-      owner = 'mapred',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
-      mode = 01777,
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/mapred',
-      owner = 'mapred',
-      recursive = True,
-      mode = 0755,
-      ignore_failures=True,
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
-      owner = 'mapred',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.include',
-      owner = 'mapred',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/usr/lib/hadoop/bin/task-controller',
-                              owner = 'root',
-                              group = 'hadoop',
-                              mode = 06050,
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/taskcontroller.cfg',
-                              content = Template('taskcontroller.cfg.j2'),
-                              owner = 'root',
-                              group = 'hadoop',
-                              mode = 0644,
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/mapred-queue-acls.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              conf_dir = '/etc/hadoop/conf',
-                              configurations = self.getConfig()['configurations']['mapred-site'],
-                              configuration_attributes = self.getConfig()['configuration_attributes']['mapred-site']
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/fair-scheduler.xml',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-client.xml.example',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/hadoop/conf/ssl-server.xml.example',
-                              owner = 'mapred',
-                              group = 'hadoop',
-                              )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
deleted file mode 100644
index ee47f45..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
+++ /dev/null
@@ -1,124 +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 TestOozieClient(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_client.py",
-                       classname = "OozieClient",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-      mode = 0664,
-      conf_dir = '/etc/oozie/conf',
-      configurations = self.getConfig()['configurations']['oozie-site'],
-      configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
-    )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
-      owner = 'oozie',
-      content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              mode = 0644,
-                              content = 'log4jproperties\nline2'
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/hadoop-config.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-default.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf/action-conf',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/action-conf/hive.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertNoMoreResources()
-
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_client.py",
-                       classname = "OozieClient",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-      mode = 0664,
-      conf_dir = '/etc/oozie/conf',
-      configurations = self.getConfig()['configurations']['oozie-site'],
-      configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
-    )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
-      owner = 'oozie',
-      content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              mode = 0644,
-                              content = 'log4jproperties\nline2'
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/hadoop-config.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-default.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf/action-conf',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/action-conf/hive.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
deleted file mode 100644
index 7a0a8cc..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
+++ /dev/null
@@ -1,511 +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 TestOozieServer(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_server.py",
-                       classname = "OozieServer",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('HdfsDirectory', '/user/oozie',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              mode = 0775,
-                              owner = 'oozie',
-                              action = ['create'],
-    )
-    self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-      mode = 0664,
-      conf_dir = '/etc/oozie/conf',
-      configurations = self.getConfig()['configurations']['oozie-site'],
-      configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
-    )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
-      owner = 'oozie',
-      content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              mode = 0644,
-                              content = 'log4jproperties\nline2'
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/hadoop-config.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-default.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf/action-conf',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/action-conf/hive.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
-                              action=["delete"],
-                              not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
-    )
-    self.assertResourceCalled('Directory', '/var/run/oozie',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/log/oozie',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/tmp/oozie',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/oozie/data',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/lib/oozie/',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server/webapps/',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/usr/lib/oozie/libext',
-        recursive = True,
-    )
-    self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'),
-        not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        sudo = True,
-    )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
-        not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        user = 'oozie',
-    )
-    self.assertNoMoreResources()
-
-
-  def test_start_default(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_server.py",
-                         classname = "OozieServer",
-                         command = "start",
-                         config_file="default.json"
-    )
-    self.configure_default()
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/ooziedb.sh create -sqlfile oozie.sql -run',
-      not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-      ignore_failures = True,
-      user = 'oozie',
-    )
-    self.assertResourceCalled('Execute', ' hadoop dfs -put /usr/lib/oozie/share /user/oozie ; hadoop dfs -chmod -R 755 /user/oozie/share',
-      not_if = " hadoop dfs -ls /user/oozie/share | awk 'BEGIN {count=0;} /share/ {count++} END {if (count > 0) {exit 0} else {exit 1}}'",
-      user = 'oozie',
-    )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-start.sh',
-      not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-      user = 'oozie',
-    )
-    self.assertNoMoreResources()
-
-
-
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_server.py",
-                         classname = "OozieServer",
-                         command = "stop",
-                         config_file="default.json"
-    )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh',
-        only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        user = 'oozie',
-    )
-    self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
-        action = ['delete'],
-    )
-    self.assertNoMoreResources()
-
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_server.py",
-                       classname = "OozieServer",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    self.assertResourceCalled('HdfsDirectory', '/user/oozie',
-                              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 = 0775,
-                              owner = 'oozie',
-                              action = ['create'],
-    )
-    self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-      mode = 0664,
-      conf_dir = '/etc/oozie/conf',
-      configurations = self.getConfig()['configurations']['oozie-site'],
-      configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
-    )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
-      owner = 'oozie',
-      content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              mode = 0644,
-                              content = 'log4jproperties\nline2'
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/hadoop-config.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-default.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf/action-conf',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/oozie/conf/action-conf/hive.xml',
-      owner = 'oozie',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
-                              action=["delete"],
-                              not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
-    )
-    self.assertResourceCalled('Directory', '/var/run/oozie',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/log/oozie',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/tmp/oozie',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/oozie/data',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/lib/oozie/',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server/webapps/',
-      owner = 'oozie',
-      recursive = True,
-      mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/usr/lib/oozie/libext',
-        recursive = True,
-    )
-    self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'),
-        not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        sudo = True,
-    )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
-        not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        user = 'oozie',
-    )
-    self.assertNoMoreResources()
-
-
-  def test_start_secured(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_server.py",
-                         classname = "OozieServer",
-                         command = "start",
-                         config_file="secured.json"
-    )
-    self.configure_secured()
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/ooziedb.sh create -sqlfile oozie.sql -run',
-      not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-      ignore_failures = True,
-      user = 'oozie',
-    )
-    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/oozie.service.keytab oozie/c6402.ambari.apache.org@EXAMPLE.COM; hadoop dfs -put /usr/lib/oozie/share /user/oozie ; hadoop dfs -chmod -R 755 /user/oozie/share',
-      not_if = "/usr/bin/kinit -kt /etc/security/keytabs/oozie.service.keytab oozie/c6402.ambari.apache.org@EXAMPLE.COM; hadoop dfs -ls /user/oozie/share | awk 'BEGIN {count=0;} /share/ {count++} END {if (count > 0) {exit 0} else {exit 1}}'",
-      user = 'oozie',
-    )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-start.sh',
-      not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-      user = 'oozie',
-    )
-    self.assertNoMoreResources()
-
-
-  def test_stop_secured(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_server.py",
-                         classname = "OozieServer",
-                         command = "stop",
-                         config_file="secured.json"
-    )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh',
-        only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        user = 'oozie',
-    )
-    self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
-        action = ['delete'],
-    )
-    self.assertNoMoreResources()
-
-  def configure_default(self):
-    self.assertResourceCalled('HdfsDirectory', '/user/oozie',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = '/usr/bin/kinit',
-                              mode = 0775,
-                              owner = 'oozie',
-                              action = ['create'],
-                              )
-    self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              mode = 0664,
-                              conf_dir = '/etc/oozie/conf',
-                              configurations = self.getConfig()['configurations']['oozie-site'],
-                              configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
-                              )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
-                              owner = 'oozie',
-                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              mode = 0644,
-                              content = 'log4jproperties\nline2'
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/hadoop-config.xml',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-default.xml',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf/action-conf',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/action-conf/hive.xml',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
-                              action=["delete"],
-                              not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
-    )
-    self.assertResourceCalled('Directory', '/var/run/oozie',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/oozie',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/var/tmp/oozie',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/hadoop/oozie/data',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/var/lib/oozie/',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server/webapps/',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/usr/lib/oozie/libext',
-        recursive = True,
-    )
-    self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'),
-        not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        sudo = True,
-    )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
-        not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        user = 'oozie',
-    )
-
-  def configure_secured(self):
-    self.assertResourceCalled('HdfsDirectory', '/user/oozie',
-                              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 = 0775,
-                              owner = 'oozie',
-                              action = ['create'],
-                              )
-    self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              mode = 0664,
-                              conf_dir = '/etc/oozie/conf',
-                              configurations = self.getConfig()['configurations']['oozie-site'],
-                              configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
-                              )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
-                              owner = 'oozie',
-                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              mode = 0644,
-                              content = 'log4jproperties\nline2'
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/hadoop-config.xml',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-default.xml',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('Directory', '/etc/oozie/conf/action-conf',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/etc/oozie/conf/action-conf/hive.xml',
-                              owner = 'oozie',
-                              group = 'hadoop',
-                              )
-    self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
-                              action=["delete"],
-                              not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
-    )
-    self.assertResourceCalled('Directory', '/var/run/oozie',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/var/log/oozie',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/var/tmp/oozie',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/hadoop/oozie/data',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/var/lib/oozie/',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server/webapps/',
-                              owner = 'oozie',
-                              recursive = True,
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Directory', '/usr/lib/oozie/libext',
-        recursive = True,
-    )
-    self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'),
-        not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        sudo = True,
-    )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
-        not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
-        user = 'oozie',
-    )
\ 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/OOZIE/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_service_check.py
deleted file mode 100644
index bc56e2a..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_service_check.py
+++ /dev/null
@@ -1,56 +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
-
-class TestServiceCheck(RMFTestCase):
-  def test_service_check_default(self):
-    self.executeScript("1.3.2/services/OOZIE/package/scripts/service_check.py",
-                        classname="OozieServiceCheck",
-                        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/OOZIE/package/scripts/service_check.py",
-                        classname="OozieServiceCheck",
-                        command="service_check",
-                        config_file="default.json"
-    )
-
-    self.assert_service_check()
-    self.assertNoMoreResources()
-        
-  def assert_service_check(self):
-    self.assertResourceCalled('File', '/tmp/oozieSmoke.sh',
-        content = StaticFile('oozieSmoke.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('Execute', '/tmp/oozieSmoke.sh',
-        logoutput = True,
-        tries = 3,
-        command = 'sh /tmp/oozieSmoke.sh /etc/oozie/conf /etc/hadoop/conf ambari-qa False',
-        try_sleep = 5,
-    )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py b/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py
deleted file mode 100644
index d97a797..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py
+++ /dev/null
@@ -1,81 +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 TestPigClient(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/PIG/package/scripts/pig_client.py",
-                       classname = "PigClient",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    
-    self.assertResourceCalled('Directory', '/etc/pig/conf',
-      owner = 'hdfs',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/pig/conf/pig-env.sh',
-      owner = 'hdfs',
-      content = InlineTemplate(self.getConfig()['configurations']['pig-env']['content'])
-    )
-    self.assertResourceCalled('File', '/etc/pig/conf/pig.properties',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              mode = 0644,
-                              content = 'pigproperties\nline2'
-    )
-    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
-      owner = 'hdfs',
-      group = 'hadoop',
-      mode = 0644,
-      content = 'log4jproperties\nline2'
-    )
-    self.assertNoMoreResources()
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/PIG/package/scripts/pig_client.py",
-                       classname = "PigClient",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-    
-    self.assertResourceCalled('Directory', '/etc/pig/conf',
-      owner = 'hdfs',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/pig/conf/pig-env.sh',
-      owner = 'hdfs',
-      content = InlineTemplate(self.getConfig()['configurations']['pig-env']['content']),
-    )
-    self.assertResourceCalled('File', '/etc/pig/conf/pig.properties',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              mode = 0644,
-                              content = 'pigproperties\nline2'
-    )
-    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
-      owner = 'hdfs',
-      group = 'hadoop',
-      mode = 0644,
-      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/PIG/test_pig_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_service_check.py
deleted file mode 100644
index 67dcf74..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_service_check.py
+++ /dev/null
@@ -1,93 +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 TestPigServiceCheck(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/PIG/package/scripts/service_check.py",
-                       classname = "PigServiceCheck",
-                       command = "service_check",
-                       config_file="default.json"
-    )
-    
-    self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop dfs -put /etc/passwd passwd ',
-      try_sleep = 5,
-      tries = 3,
-      user = 'ambari-qa',
-      conf_dir = '/etc/hadoop/conf',
-      security_enabled = False,
-      keytab = UnknownConfigurationMock(),
-      kinit_path_local = '/usr/bin/kinit',
-    )
-       
-    self.assertResourceCalled('File', '/tmp/pigSmoke.sh',
-      content = StaticFile('pigSmoke.sh'),
-      mode = 0755,
-    )
-       
-    self.assertResourceCalled('Execute', 'pig /tmp/pigSmoke.sh',
-      path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-      tries = 3,
-      user = 'ambari-qa',
-      try_sleep = 5,
-    )
-       
-    self.assertResourceCalled('ExecuteHadoop', 'fs -test -e pigsmoke.out',
-      user = 'ambari-qa',
-      conf_dir = '/etc/hadoop/conf',
-    )
-    self.assertNoMoreResources()
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/PIG/package/scripts/service_check.py",
-                       classname = "PigServiceCheck",
-                       command = "service_check",
-                       config_file="secured.json"
-    )
-    
-    self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop dfs -put /etc/passwd passwd ',
-      try_sleep = 5,
-      tries = 3,
-      user = 'ambari-qa',
-      conf_dir = '/etc/hadoop/conf',
-      security_enabled = True, 
-      keytab = '/etc/security/keytabs/smokeuser.headless.keytab',
-      kinit_path_local = '/usr/bin/kinit',
-    )
-       
-    self.assertResourceCalled('File', '/tmp/pigSmoke.sh',
-      content = StaticFile('pigSmoke.sh'),
-      mode = 0755,
-    )
-       
-    self.assertResourceCalled('Execute', 'pig /tmp/pigSmoke.sh',
-      path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-      tries = 3,
-      user = 'ambari-qa',
-      try_sleep = 5,
-    )
-       
-    self.assertResourceCalled('ExecuteHadoop', 'fs -test -e pigsmoke.out',
-      user = 'ambari-qa',
-      conf_dir = '/etc/hadoop/conf',
-    )
-    self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/SQOOP/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/SQOOP/test_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/SQOOP/test_service_check.py
deleted file mode 100644
index 938f372..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/SQOOP/test_service_check.py
+++ /dev/null
@@ -1,50 +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 TestSqoopServiceCheck(RMFTestCase):
-
-  def test_service_check_secured(self):
-    self.executeScript("1.3.2/services/SQOOP/package/scripts/service_check.py",
-                       classname = "SqoopServiceCheck",
-                       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.assertResourceCalled('Execute', 'sqoop version',
-                              logoutput = True,
-                              user = 'ambari-qa',)
-    self.assertNoMoreResources()
-
-  def test_service_check_default(self):
-    self.executeScript("1.3.2/services/SQOOP/package/scripts/service_check.py",
-                         classname = "SqoopServiceCheck",
-                         command = "service_check",
-                         config_file="default.json")
-    self.assertResourceCalled('Execute', 'sqoop version',
-                              logoutput = True,
-                              user = 'ambari-qa',)
-    self.assertNoMoreResources()
-
-
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/SQOOP/test_sqoop.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/SQOOP/test_sqoop.py b/ambari-server/src/test/python/stacks/1.3.2/SQOOP/test_sqoop.py
deleted file mode 100644
index fcded8a..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/SQOOP/test_sqoop.py
+++ /dev/null
@@ -1,52 +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 TestSqoop(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/SQOOP/package/scripts/sqoop_client.py",
-                       classname = "SqoopClient",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('Link', '/usr/lib/sqoop/lib/mysql-connector-java.jar',
-                              to = '/usr/share/java/mysql-connector-java.jar',)
-    self.assertResourceCalled('Directory', '/usr/lib/sqoop/conf',
-                              owner = 'sqoop',
-                              group = 'hadoop',)
-    self.assertResourceCalled('File', '/usr/lib/sqoop/conf/sqoop-env.sh',
-                              owner = 'sqoop',
-                              content = InlineTemplate(self.getConfig()['configurations']['sqoop-env']['content']),)
-    self.assertResourceCalled('File', '/usr/lib/sqoop/conf/sqoop-env-template.sh',
-                              owner = 'sqoop',
-                              group = 'hadoop',)
-    self.assertResourceCalled('File', '/usr/lib/sqoop/conf/sqoop-site-template.xml',
-                              owner = 'sqoop',
-                              group = 'hadoop',)
-    self.assertResourceCalled('File', '/usr/lib/sqoop/conf/sqoop-site.xml',
-                              owner = 'sqoop',
-                              group = 'hadoop',)
-    self.assertNoMoreResources()
-
-
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py
deleted file mode 100644
index 0a4119d..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_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 *
-
-@patch("os.path.exists", new = MagicMock(return_value=True))
-class TestZookeeperClient(RMFTestCase):
-
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/ZOOKEEPER/package/scripts/zookeeper_client.py",
-                       classname = "ZookeeperClient",
-                       command = "configure",
-                       config_file="default.json"
-    )
-    self.assertResourceCalled('Directory', '/etc/zookeeper/conf',
-      owner = 'zookeeper',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo.cfg',
-      owner = 'zookeeper',
-      content = Template('zoo.cfg.j2'),
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper-env.sh',
-      owner = 'zookeeper',
-      content = InlineTemplate(self.getConfig()['configurations']['zookeeper-env']['content']),
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/configuration.xsl',
-      owner = 'zookeeper',
-      content = Template('configuration.xsl.j2'),
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('Directory', '/var/run/zookeeper',
-      owner = 'zookeeper',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/zookeeper',
-      owner = 'zookeeper',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/zookeeper',
-      owner = 'zookeeper',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('File',
-                              '/etc/zookeeper/conf/log4j.properties',
-                              content='log4jproperties\nline2',
-                              mode=0644,
-                              group='hadoop',
-                              owner='zookeeper'
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
-      owner = 'zookeeper',
-      group = 'hadoop',
-    )
-    self.assertNoMoreResources()
-
-  def test_configure_secured(self):
-
-    self.executeScript("1.3.2/services/ZOOKEEPER/package/scripts/zookeeper_client.py",
-                       classname = "ZookeeperClient",
-                       command = "configure",
-                       config_file="secured.json"
-    )
-
-    self.assertResourceCalled('Directory', '/etc/zookeeper/conf',
-      owner = 'zookeeper',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo.cfg',
-      owner = 'zookeeper',
-      content = Template('zoo.cfg.j2'),
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper-env.sh',
-      owner = 'zookeeper',
-      content = InlineTemplate(self.getConfig()['configurations']['zookeeper-env']['content']),
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/configuration.xsl',
-      owner = 'zookeeper',
-      content = Template('configuration.xsl.j2'),
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('Directory', '/var/run/zookeeper',
-      owner = 'zookeeper',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/zookeeper',
-      owner = 'zookeeper',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/zookeeper',
-      owner = 'zookeeper',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('File',
-                              '/etc/zookeeper/conf/log4j.properties',
-                              content='log4jproperties\nline2',
-                              mode=0644,
-                              group='hadoop',
-                              owner='zookeeper'
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_client_jaas.conf',
-      owner = 'zookeeper',
-      content = Template('zookeeper_client_jaas.conf.j2'),
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
-      owner = 'zookeeper',
-      group = 'hadoop',
-    )
-    self.assertNoMoreResources()


Mime
View raw message