http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/role_command_order.json
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/role_command_order.json 
b/ambari-server/src/main/resources/stacks/HDP/1.3/role_command_order.json
deleted file mode 100644
index f610d79..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/1.3/role_command_order.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "_comment" : "Record format:",
-  "_comment" : "blockedRole-blockedCommand: [blockerRole1-blockerCommand1, 
blockerRole2-blockerCommand2, ...]",
-  "general_deps" : {
-    "_comment" : "dependencies for all cases",
-    "HBASE_MASTER-START": ["ZOOKEEPER_SERVER-START"],
-    "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"],
-    "OOZIE_SERVER-START": ["JOBTRACKER-START", "TASKTRACKER-START"],
-    "WEBHCAT_SERVER-START": ["TASKTRACKER-START", "HIVE_SERVER-START"],
-    "HIVE_METASTORE-START": ["MYSQL_SERVER-START"],
-    "HIVE_SERVER-START": ["TASKTRACKER-START", "MYSQL_SERVER-START"],
-    "HUE_SERVER-START": ["HIVE_SERVER-START", "HCAT-START", 
"OOZIE_SERVER-START"],
-    "MAPREDUCE_SERVICE_CHECK-SERVICE_CHECK": ["JOBTRACKER-START", 
"TASKTRACKER-START"],
-    "OOZIE_SERVICE_CHECK-SERVICE_CHECK": ["OOZIE_SERVER-START"],
-    "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", 
"HBASE_REGIONSERVER-START"],
-    "HIVE_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START", 
"HIVE_METASTORE-START","WEBHCAT_SERVER-START"],
-    "PIG_SERVICE_CHECK-SERVICE_CHECK": ["JOBTRACKER-START", 
"TASKTRACKER-START"],
-    "SQOOP_SERVICE_CHECK-SERVICE_CHECK": ["JOBTRACKER-START", 
"TASKTRACKER-START"],
-    "ZOOKEEPER_SERVICE_CHECK-SERVICE_CHECK": ["ZOOKEEPER_SERVER-START"],
-    "ZOOKEEPER_QUORUM_SERVICE_CHECK-SERVICE_CHECK": ["ZOOKEEPER_SERVER-START"],
-    "ZOOKEEPER_SERVER-STOP" : ["HBASE_MASTER-STOP", "HBASE_REGIONSERVER-STOP"],
-    "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"],
-    "TASKTRACKER-UPGRADE": ["JOBTRACKER-UPGRADE"],
-    "MAPREDUCE_CLIENT-UPGRADE": ["TASKTRACKER-UPGRADE", "JOBTRACKER-UPGRADE"],
-    "ZOOKEEPER_SERVER-UPGRADE": ["MAPREDUCE_CLIENT-UPGRADE"],
-    "ZOOKEEPER_CLIENT-UPGRADE": ["ZOOKEEPER_SERVER-UPGRADE"],
-    "HBASE_MASTER-UPGRADE": ["ZOOKEEPER_CLIENT-UPGRADE"],
-    "HBASE_REGIONSERVER-UPGRADE": ["HBASE_MASTER-UPGRADE"],
-    "HBASE_CLIENT-UPGRADE": ["HBASE_REGIONSERVER-UPGRADE"],
-    "HIVE_SERVER-UPGRADE" : ["HBASE_CLIENT-UPGRADE"],
-    "HIVE_METASTORE-UPGRADE" : ["HIVE_SERVER-UPGRADE"],
-    "MYSQL_SERVER-UPGRADE": ["HIVE_METASTORE-UPGRADE"],
-    "HIVE_CLIENT-UPGRADE": ["MYSQL_SERVER-UPGRADE"],
-    "HCAT-UPGRADE": ["HIVE_CLIENT-UPGRADE"],
-    "OOZIE_SERVER-UPGRADE" : ["HCAT-UPGRADE"],
-    "OOZIE_CLIENT-UPGRADE" : ["OOZIE_SERVER-UPGRADE"],
-    "WEBHCAT_SERVER-UPGRADE" : ["OOZIE_CLIENT-UPGRADE"],
-    "PIG-UPGRADE" : ["WEBHCAT_SERVER-UPGRADE"],
-    "SQOOP-UPGRADE" : ["PIG-UPGRADE"],
-    "GANGLIA_SERVER-UPGRADE" : ["SQOOP-UPGRADE"],
-    "GANGLIA_MONITOR-UPGRADE" : ["GANGLIA_SERVER-UPGRADE"]
-  },
-  "_comment" : "GLUSTERFS-specific dependencies",
-  "optional_glusterfs": {
-    "HBASE_MASTER-START": ["PEERSTATUS-START"],
-    "JOBTRACKER-START": ["PEERSTATUS-START"],
-    "TASKTRACKER-START": ["PEERSTATUS-START"],
-    "GLUSTERFS_SERVICE_CHECK-SERVICE_CHECK": ["PEERSTATUS-START"],
-    "JOBTRACKER-UPGRADE": ["GLUSTERFS_CLIENT-UPGRADE"]
-  },
-  "_comment" : "Dependencies that are used when GLUSTERFS is not present in 
cluster",
-  "optional_no_glusterfs": {
-    "SECONDARY_NAMENODE-START": ["NAMENODE-START"],
-    "RESOURCEMANAGER-START": ["NAMENODE-START", "DATANODE-START"],
-    "NODEMANAGER-START": ["NAMENODE-START", "DATANODE-START", 
"RESOURCEMANAGER-START"],
-    "HISTORYSERVER-START": ["NAMENODE-START", "DATANODE-START"],
-    "HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START"],
-    "JOBTRACKER-START": ["NAMENODE-START", "DATANODE-START"],
-    "TASKTRACKER-START": ["NAMENODE-START", "DATANODE-START"],
-    "HIVE_SERVER-START": ["DATANODE-START"],
-    "WEBHCAT_SERVER-START": ["DATANODE-START"],
-    "HDFS_SERVICE_CHECK-SERVICE_CHECK": ["NAMENODE-START", "DATANODE-START",
-        "SECONDARY_NAMENODE-START"],
-    "MAPREDUCE2_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START",
-        "RESOURCEMANAGER-START", "HISTORYSERVER-START", 
"YARN_SERVICE_CHECK-SERVICE_CHECK"],
-    "YARN_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", 
"RESOURCEMANAGER-START"],
-    "RESOURCEMANAGER_SERVICE_CHECK-SERVICE_CHECK": ["RESOURCEMANAGER-START"],
-    "PIG_SERVICE_CHECK-SERVICE_CHECK": ["RESOURCEMANAGER-START", 
"NODEMANAGER-START"],
-    "NAMENODE-STOP": ["JOBTRACKER-STOP", "TASKTRACKER-STOP", 
"RESOURCEMANAGER-STOP",
-        "NODEMANAGER-STOP", "HISTORYSERVER-STOP", "HBASE_MASTER-STOP"],
-    "DATANODE-STOP": ["JOBTRACKER-STOP", "TASKTRACKER-STOP", 
"RESOURCEMANAGER-STOP",
-        "NODEMANAGER-STOP", "HISTORYSERVER-STOP", "HBASE_MASTER-STOP"],
-    "SECONDARY_NAMENODE-UPGRADE": ["NAMENODE-UPGRADE"],
-    "DATANODE-UPGRADE": ["SECONDARY_NAMENODE-UPGRADE"],
-    "HDFS_CLIENT-UPGRADE": ["DATANODE-UPGRADE"],
-    "JOBTRACKER-UPGRADE": ["HDFS_CLIENT-UPGRADE"]
-  },
-  "_comment" : "Dependencies that are used in HA NameNode cluster",
-  "namenode_optional_ha": {
-    "NAMENODE-START": ["JOURNALNODE-START", "ZOOKEEPER_SERVER-START"],
-    "ZKFC-START": ["NAMENODE-START"],
-    "HDFS_SERVICE_CHECK-SERVICE_CHECK": ["ZKFC-START"]
-  },
-  "_comment" : "Dependencies that are used in ResourceManager HA cluster",
-  "resourcemanager_optional_ha" : {
-    "RESOURCEMANAGER-START": ["ZOOKEEPER_SERVER-START"]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/HBASE/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/HBASE/metainfo.xml
deleted file mode 100644
index 16ad575..0000000
--- 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/HBASE/metainfo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>HBASE</name>
-      <comment>Non-relational distributed database and centralized service for 
configuration management &amp;
-        synchronization
-      </comment>
-      <version>0.94.6.1.3</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/HDFS/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/HDFS/metainfo.xml
deleted file mode 100644
index 86234c4..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/1.3/services/HDFS/metainfo.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>HDFS</name>
-      <comment>Apache Hadoop Distributed File System</comment>
-      <version>1.2.0.1.3</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/HIVE/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/HIVE/metainfo.xml
deleted file mode 100644
index ca181f3..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/1.3/services/HIVE/metainfo.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>HIVE</name>
-      <comment>Data warehouse system for ad-hoc queries &amp; analysis of 
large datasets and table &amp; storage management service</comment>
-      <version>0.11.0.1.3</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/MAPREDUCE/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/MAPREDUCE/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/MAPREDUCE/metainfo.xml
deleted file mode 100644
index ab3cc6f..0000000
--- 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/MAPREDUCE/metainfo.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>MAPREDUCE</name>
-      <comment>Apache Hadoop Distributed Processing Framework</comment>
-      <version>1.2.0.1.3</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/OOZIE/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/OOZIE/metainfo.xml
deleted file mode 100644
index a5e0cc4..0000000
--- 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/OOZIE/metainfo.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>OOZIE</name>
-      <comment>System for workflow coordination and execution of Apache Hadoop 
jobs.  This also includes the installation of the optional Oozie Web Console 
which relies on and will install the &lt;a target="_blank" 
href="http://www.sencha.com/legal/open-source-faq/"&gt;ExtJS&lt;/a&gt; Library.
-      </comment>
-      <version>3.3.2.1.3</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/PIG/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/PIG/metainfo.xml
deleted file mode 100644
index 6a5c2ce..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/1.3/services/PIG/metainfo.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>PIG</name>
-      <comment>Scripting platform for analyzing large datasets</comment>
-      <version>0.11.1.1.3</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/SQOOP/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/SQOOP/metainfo.xml
deleted file mode 100644
index ffa68da..0000000
--- 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/SQOOP/metainfo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>SQOOP</name>
-      <comment>Tool for transferring bulk data between Apache Hadoop and
-        structured data stores such as relational databases
-      </comment>
-      <version>1.4.3.1.3</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/ZOOKEEPER/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/ZOOKEEPER/metainfo.xml
deleted file mode 100644
index b9dbd45..0000000
--- 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/ZOOKEEPER/metainfo.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>ZOOKEEPER</name>
-      <comment>Centralized service which provides highly reliable distributed 
coordination.</comment>
-      <version>3.4.5.1.3</version>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/main/resources/stacks/HDP/1.3/services/stack_advisor.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/1.3/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/1.3/services/stack_advisor.py
deleted file mode 100644
index 9360646..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/1.3/services/stack_advisor.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ambari-python-wrap
-"""
-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.
-"""
-
-class HDP13StackAdvisor(HDP133StackAdvisor):
-  pass
\ 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/GANGLIA/test_ganglia_monitor.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py 
b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py
deleted file mode 100644
index d969263..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_monitor.py
+++ /dev/null
@@ -1,300 +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 TestGangliaMonitor(RMFTestCase):
-
-  def test_configure_default(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
-                       classname="GangliaMonitor",
-                       command="configure",
-                       config_file="default.json"
-                      )
-    self.assert_configure_default()
-    self.assert_gmond_master_conf_generated()
-    self.assertNoMoreResources()
-
-
-  def test_configure_non_gmetad_node(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
-                       classname="GangliaMonitor",
-                       command="configure",
-                       config_file="default.non_gmetad_host.json",
-    )
-    self.assert_configure_default()
-    self.assertNoMoreResources()
-
-
-  def test_start_default(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
-                       classname="GangliaMonitor",
-                       command="start",
-                       config_file="default.json",
-    )
-    self.assert_configure_default()
-    self.assert_gmond_master_conf_generated()
-    self.assertResourceCalled('Execute', 'service hdp-gmond start >> 
/tmp/gmond.log  2>&1 ; /bin/ps auwx | /bin/grep [g]mond  >> /tmp/gmond.log  
2>&1',
-        path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-    )
-    self.assertNoMoreResources()
-
-
-  def test_stop_default(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
-                       classname="GangliaMonitor",
-                       command="stop",
-                       config_file="default.json",
-    )
-    self.assertResourceCalled('Execute', 'service hdp-gmond stop >> 
/tmp/gmond.log  2>&1 ; /bin/ps auwx | /bin/grep [g]mond  >> /tmp/gmond.log  
2>&1',
-                              path = 
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-                              )
-    self.assertNoMoreResources()
-
-
-  def test_install_default(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_monitor.py",
-                       classname="GangliaMonitor",
-                       command="install",
-                       config_file="default.json",
-    )
-    self.assert_configure_default()
-    self.assert_gmond_master_conf_generated()
-    self.assertResourceCalled('Execute', 'chkconfig gmond off',
-                              path = 
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 'chkconfig gmetad off',
-                              path = 
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-    )
-    self.assertNoMoreResources()
-
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('Group', 'hadoop',
-    )
-    self.assertResourceCalled('Group', 'nobody',
-    )
-    self.assertResourceCalled('Group', 'nobody',
-    )
-    self.assertResourceCalled('User', 'nobody',
-        groups = [u'nobody'],
-    )
-    self.assertResourceCalled('User', 'nobody',
-        groups = [u'nobody'],
-    )
-    self.assertResourceCalled('Directory', '/etc/ganglia/hdp',
-        owner = 'root',
-        group = 'hadoop',
-        recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/usr/libexec/hdp/ganglia',
-        owner = 'root',
-        group = 'root',
-        recursive = True,
-    )
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmetad',
-        content = StaticFile('gmetad.init'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmond',
-        content = StaticFile('gmond.init'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkGmond.sh',
-        content = StaticFile('checkGmond.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/checkRrdcached.sh',
-        content = StaticFile('checkRrdcached.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmetadLib.sh',
-        content = StaticFile('gmetadLib.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmondLib.sh',
-        content = StaticFile('gmondLib.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/rrdcachedLib.sh',
-        content = StaticFile('rrdcachedLib.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh',
-        content = StaticFile('setupGanglia.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/startGmetad.sh',
-        content = StaticFile('startGmetad.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmond.sh',
-        content = StaticFile('startGmond.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/startRrdcached.sh',
-        content = StaticFile('startRrdcached.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmetad.sh',
-        content = StaticFile('stopGmetad.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmond.sh',
-        content = StaticFile('stopGmond.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/stopRrdcached.sh',
-        content = StaticFile('stopRrdcached.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/teardownGanglia.sh',
-        content = StaticFile('teardownGanglia.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/usr/libexec/hdp/ganglia/gangliaClusters.conf',
-        owner = 'root',
-        template_tag = None,
-        group = 'root',
-        mode = 0755,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/usr/libexec/hdp/ganglia/gangliaEnv.sh',
-        owner = 'root',
-        template_tag = None,
-        group = 'root',
-        mode = 0755,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/usr/libexec/hdp/ganglia/gangliaLib.sh',
-        owner = 'root',
-        template_tag = None,
-        group = 'root',
-        mode = 0755,
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -o root -g hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -o root -g 
hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -o root -g hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -o root -g hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -o root -g 
hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Directory', '/etc/ganglia/conf.d',
-        owner = 'root',
-        group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/ganglia/conf.d/modgstatus.conf',
-        owner = 'root',
-        group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/ganglia/conf.d/multicpu.conf',
-        owner = 'root',
-        group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/ganglia/gmond.conf',
-        owner = 'root',
-        group = 'hadoop',
-    )
-
-
-  def assert_gmond_master_conf_generated(self):
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPNameNode -m -o root -g hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPJobTracker -m -o root -g 
hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseMaster -m -o root -g 
hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHistoryServer -m -o root -g 
hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPDataNode -m -o root -g hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPTaskTracker -m -o root -g 
hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPHBaseRegionServer -m -o root -g 
hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPSlaves -m -o root -g hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
\ 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/GANGLIA/test_ganglia_server.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py 
b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
deleted file mode 100644
index 63e3387..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py
+++ /dev/null
@@ -1,197 +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 mock.mock import MagicMock, call, patch
-
-class TestGangliaServer(RMFTestCase):
-
-  def test_configure_default(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_server.py",
-                       classname="GangliaServer",
-                       command="configure",
-                       config_file="default.json",
-    )
-    self.assert_configure_default()
-    self.assertNoMoreResources()
-
-  def test_start_default(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_server.py",
-                       classname="GangliaServer",
-                       command="start",
-                       config_file="default.json",
-    )
-    self.assert_configure_default()
-    self.assertResourceCalled('Execute', 'service hdp-gmetad start >> 
/tmp/gmetad.log  2>&1 ; /bin/ps auwx | /bin/grep [g]metad  >> /tmp/gmetad.log  
2>&1',
-                              path = 
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-                              )
-    self.assertResourceCalled('MonitorWebserver', 'restart',
-                              )
-    self.assertNoMoreResources()
-
-  def test_stop_default(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_server.py",
-                       classname="GangliaServer",
-                       command="stop",
-                       config_file="default.json",
-    )
-    self.assertResourceCalled('Execute', 'service hdp-gmetad stop >> 
/tmp/gmetad.log  2>&1 ; /bin/ps auwx | /bin/grep [g]metad  >> /tmp/gmetad.log  
2>&1',
-                              path = 
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
-                              )
-    self.assertResourceCalled('MonitorWebserver', 'restart',
-                              )
-    self.assertNoMoreResources()
-
-
-  def test_install_default(self):
-    
self.executeScript("1.3.2/services/GANGLIA/package/scripts/ganglia_server.py",
-                       classname="GangliaServer",
-                       command="install",
-                       config_file="default.json",
-    )
-    self.test_configure_default()
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('Group', 'hadoop')
-    self.assertResourceCalled('Group', 'nobody')
-    self.assertResourceCalled('Group', 'nobody')
-    self.assertResourceCalled('User', 'nobody',
-        groups = [u'nobody'],
-    )
-    self.assertResourceCalled('User', 'nobody',
-        groups = [u'nobody'],
-    )
-    self.assertResourceCalled('Directory', '/usr/libexec/hdp/ganglia',
-        owner = 'root',
-        group = 'root',
-        recursive = True,
-    )
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmetad',
-        content = StaticFile('gmetad.init'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/etc/init.d/hdp-gmond',
-        content = StaticFile('gmond.init'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/checkGmond.sh',
-        content = StaticFile('checkGmond.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/checkRrdcached.sh',
-        content = StaticFile('checkRrdcached.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmetadLib.sh',
-        content = StaticFile('gmetadLib.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/gmondLib.sh',
-        content = StaticFile('gmondLib.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/rrdcachedLib.sh',
-        content = StaticFile('rrdcachedLib.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh',
-        content = StaticFile('setupGanglia.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/startGmetad.sh',
-        content = StaticFile('startGmetad.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/startGmond.sh',
-        content = StaticFile('startGmond.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/startRrdcached.sh',
-        content = StaticFile('startRrdcached.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmetad.sh',
-        content = StaticFile('stopGmetad.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/usr/libexec/hdp/ganglia/stopGmond.sh',
-        content = StaticFile('stopGmond.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/stopRrdcached.sh',
-        content = StaticFile('stopRrdcached.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', 
'/usr/libexec/hdp/ganglia/teardownGanglia.sh',
-        content = StaticFile('teardownGanglia.sh'),
-        mode = 0755,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/usr/libexec/hdp/ganglia/gangliaClusters.conf',
-        owner = 'root',
-        template_tag = None,
-        group = 'root',
-        mode = 0755,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/usr/libexec/hdp/ganglia/gangliaEnv.sh',
-        owner = 'root',
-        template_tag = None,
-        group = 'root',
-        mode = 0755,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/usr/libexec/hdp/ganglia/gangliaLib.sh',
-        owner = 'root',
-        template_tag = None,
-        group = 'root',
-        mode = 0755,
-    )
-    self.assertResourceCalled('Execute', 
'/usr/libexec/hdp/ganglia/setupGanglia.sh -t -o root -g hadoop',
-        path = ['/usr/libexec/hdp/ganglia',
-           '/usr/sbin',
-           '/sbin:/usr/local/bin',
-           '/bin',
-           '/usr/bin'],
-    )
-    self.assertResourceCalled('Directory', '/var/lib/ganglia-web/dwoo',
-        recursive = True,
-        mode = 0755,
-    )
-    self.assertResourceCalled('Execute', 'chown -R wwwrun 
/var/lib/ganglia-web/dwoo',)
-    self.assertResourceCalled('Directory', '/srv/www/cgi-bin',
-        recursive = True,
-    )
-    self.assertResourceCalled('TemplateConfig', '/srv/www/cgi-bin/rrd.py',
-        owner = "root",
-        group = "root",
-        mode = 0755,
-    )
-    self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds',
-        owner = 'nobody',
-        group = 'nobody',
-        recursive = True,
-        mode = 0755,
-    )
-    self.assertResourceCalled('File', '/etc/apache2/conf.d/ganglia.conf',
-                              content = Template('ganglia.conf.j2'),
-                              mode = 0644,
-                              )
-    self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf',
-        owner = 'root',
-        group = 'hadoop',
-    )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py 
b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
deleted file mode 100644
index 479b407..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py
+++ /dev/null
@@ -1,156 +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 TestHBaseClient(RMFTestCase):
-  
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_client.py",
-                   classname = "HbaseClient",
-                   command = "configure",
-                   config_file="secured.json"
-    )
-    
-    self.assertResourceCalled('Directory', '/etc/hbase/conf',
-      owner = 'hbase',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hbase-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hbase-site']
-    )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hdfs-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-    )
-    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/hbase/conf/hbase-policy.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
-      owner = 'hbase',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hadoop-metrics.properties',
-      owner = 'hbase',
-      template_tag = 'GANGLIA-RS',
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/regionservers',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hbase_client_jaas.conf',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hbase/conf/log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hbase',
-                              content='log4jproperties\nline2'
-    )
-    self.assertNoMoreResources()
-    
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_client.py",
-                   classname = "HbaseClient",
-                   command = "configure",
-                   config_file="default.json"
-    )
-    
-    self.assertResourceCalled('Directory', '/etc/hbase/conf',
-      owner = 'hbase',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hbase-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hbase-site']
-    )    
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hdfs-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-    )
-    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/hbase/conf/hbase-policy.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-    )    
-    self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
-      owner = 'hbase',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
-    )    
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hadoop-metrics.properties',
-      owner = 'hbase',
-      template_tag = 'GANGLIA-RS',
-    )    
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/regionservers',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hbase/conf/log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hbase',
-                              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/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py 
b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
deleted file mode 100644
index 4868c82..0000000
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
+++ /dev/null
@@ -1,352 +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, patch
-from stacks.utils.RMFTestCase import *
-
-@patch("os.path.exists", new = MagicMock(return_value=True))
-class TestHBaseMaster(RMFTestCase):
-  def test_configure_default(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                   classname = "HbaseMaster",
-                   command = "configure",
-                   config_file="default.json"
-    )
-    
-    self.assert_configure_default()
-    self.assertNoMoreResources()
-    
-  def test_start_default(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                   classname = "HbaseMaster",
-                   command = "start",
-                   config_file="default.json"
-    )
-    
-    self.assert_configure_default()
-    self.assertResourceCalled('Execute', '/usr/lib/hbase/bin/hbase-daemon.sh 
--config /etc/hbase/conf start master',
-      not_if = 'ls /var/run/hbase/hbase-hbase-master.pid >/dev/null 2>&1 && ps 
-p `cat /var/run/hbase/hbase-hbase-master.pid` >/dev/null 2>&1',
-      user = 'hbase'
-    )
-    self.assertNoMoreResources()
-    
-  def test_stop_default(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                   classname = "HbaseMaster",
-                   command = "stop",
-                   config_file="default.json"
-    )
-    
-    self.assertResourceCalled('Execute', '/usr/lib/hbase/bin/hbase-daemon.sh 
--config /etc/hbase/conf stop master && rm -f 
/var/run/hbase/hbase-hbase-master.pid',
-      not_if = None,
-      user = 'hbase',
-    )
-    self.assertNoMoreResources()
-
-  def test_decom_default(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                       classname = "HbaseMaster",
-                       command = "decommission",
-                       config_file="default.json"
-    )
-
-    self.assertResourceCalled('File', '/usr/lib/hbase/bin/draining_servers.rb',
-                              content = StaticFile('draining_servers.rb'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb add 
host1',
-                              logoutput = True,
-                              user = 'hbase',
-                              )
-    self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/region_mover.rb unload host1',
-                              logoutput = True,
-                              user = 'hbase',
-                              )
-    self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb add 
host2',
-                              logoutput = True,
-                              user = 'hbase',
-                              )
-    self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/region_mover.rb unload host2',
-                              logoutput = True,
-                              user = 'hbase',
-                              )
-    self.assertNoMoreResources()
-
-  def test_decom_default_draining_only(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                       classname = "HbaseMaster",
-                       command = "decommission",
-                       config_file="default.hbasedecom.json"
-    )
-
-    self.assertResourceCalled('File', '/usr/lib/hbase/bin/draining_servers.rb',
-                              content = StaticFile('draining_servers.rb'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb remove 
host1',
-                              logoutput = True,
-                              user = 'hbase',
-                              )
-    self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb remove 
host2',
-                              logoutput = True,
-                              user = 'hbase',
-                              )
-    self.assertNoMoreResources()
-
-  def test_configure_secured(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                   classname = "HbaseMaster",
-                   command = "configure",
-                   config_file="secured.json"
-    )
-
-    self.assert_configure_secured()
-    self.assertNoMoreResources()
-    
-  def test_start_secured(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                   classname = "HbaseMaster",
-                   command = "start",
-                   config_file="secured.json"
-    )
-    
-    self.assert_configure_secured()
-    self.assertResourceCalled('Execute', '/usr/lib/hbase/bin/hbase-daemon.sh 
--config /etc/hbase/conf start master',
-      not_if = 'ls /var/run/hbase/hbase-hbase-master.pid >/dev/null 2>&1 && ps 
-p `cat /var/run/hbase/hbase-hbase-master.pid` >/dev/null 2>&1',
-      user = 'hbase',
-    )
-    self.assertNoMoreResources()
-    
-  def test_stop_secured(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                   classname = "HbaseMaster",
-                   command = "stop",
-                   config_file="secured.json"
-    )
-
-    self.assertResourceCalled('Execute', '/usr/lib/hbase/bin/hbase-daemon.sh 
--config /etc/hbase/conf stop master && rm -f 
/var/run/hbase/hbase-hbase-master.pid',
-      not_if = None,
-      user = 'hbase',
-    )
-    self.assertNoMoreResources()
-
-  def test_decom_secure(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
-                       classname = "HbaseMaster",
-                       command = "decommission",
-                       config_file="secured.json"
-    )
-
-    self.assertResourceCalled('File', '/usr/lib/hbase/bin/draining_servers.rb',
-                              content = StaticFile('draining_servers.rb'),
-                              mode = 0755,
-                              )
-    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hbase.headless.keytab hbase; /usr/lib/hbase/bin/hbase 
--config /etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb 
add host1',
-                              logoutput = True,
-                              user = 'hbase',
-                              )
-    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hbase.headless.keytab hbase; /usr/lib/hbase/bin/hbase 
--config /etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/region_mover.rb 
unload host1',
-                              logoutput = True,
-                              user = 'hbase',
-                              )
-    self.assertNoMoreResources()
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('Directory', '/etc/hbase/conf',
-      owner = 'hbase',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hbase-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hbase-site']
-    )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hdfs-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-    )
-    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/hbase/conf/hbase-policy.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
-      owner = 'hbase',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hadoop-metrics.properties',
-      owner = 'hbase',
-      template_tag = 'GANGLIA-MASTER',
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/regionservers',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('Directory', '/var/run/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hbase/conf/log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hbase',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('HdfsDirectory', 
'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              owner = 'hbase',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/apps/hbase/staging',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              mode = 0711,
-                              owner = 'hbase',
-                              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'],
-                              )
-
-  def assert_configure_secured(self):
-    self.assertResourceCalled('Directory', '/etc/hbase/conf',
-      owner = 'hbase',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hbase-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hbase-site']
-    )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hdfs-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-    )
-    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/hbase/conf/hbase-policy.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
-      owner = 'hbase',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hadoop-metrics.properties',
-      owner = 'hbase',
-      template_tag = 'GANGLIA-MASTER',
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/regionservers',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hbase_master_jaas.conf',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('Directory', '/var/run/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hbase/conf/log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hbase',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('HdfsDirectory', 
'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
-                              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 = 'hbase',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/apps/hbase/staging',
-                              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 = 0711,
-                              owner = 'hbase',
-                              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'],
-                              )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py 
b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
deleted file mode 100644
index 331bfd4..0000000
--- 
a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py
+++ /dev/null
@@ -1,283 +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, patch
-from stacks.utils.RMFTestCase import *
-
-@patch("os.path.exists", new = MagicMock(return_value=True))
-class TestHbaseRegionServer(RMFTestCase):
-  
-  def test_configure_default(self):
-    
self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_regionserver.py",
-                   classname = "HbaseRegionServer",
-                   command = "configure",
-                   config_file="default.json"
-    )
-    
-    self.assert_configure_default()
-    self.assertNoMoreResources()
-    
-  def test_start_default(self):
-    
self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_regionserver.py",
-                   classname = "HbaseRegionServer",
-                   command = "start",
-                   config_file="default.json"
-    )
-    
-    self.assert_configure_default()
-    self.assertResourceCalled('Execute', '/usr/lib/hbase/bin/hbase-daemon.sh 
--config /etc/hbase/conf start regionserver',
-      not_if = 'ls /var/run/hbase/hbase-hbase-regionserver.pid >/dev/null 2>&1 
&& ps -p `cat /var/run/hbase/hbase-hbase-regionserver.pid` >/dev/null 2>&1',
-      user = 'hbase'
-    )
-    self.assertNoMoreResources()
-    
-  def test_stop_default(self):
-    
self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_regionserver.py",
-                   classname = "HbaseRegionServer",
-                   command = "stop",
-                   config_file="default.json"
-    )
-    
-    self.assertResourceCalled('Execute', '/usr/lib/hbase/bin/hbase-daemon.sh 
--config /etc/hbase/conf stop regionserver && rm -f 
/var/run/hbase/hbase-hbase-regionserver.pid',
-      not_if = None,
-      user = 'hbase',
-    )
-    self.assertNoMoreResources()
-    
-  def test_configure_secured(self):
-    
self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_regionserver.py",
-                   classname = "HbaseRegionServer",
-                   command = "configure",
-                   config_file="secured.json"
-    )
-    
-    self.assert_configure_secured()
-    self.assertNoMoreResources()
-    
-  def test_start_secured(self):
-    
self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_regionserver.py",
-                   classname = "HbaseRegionServer",
-                   command = "start",
-                   config_file="secured.json"
-    )
-    
-    self.assert_configure_secured()
-    self.assertResourceCalled('Execute', '/usr/lib/hbase/bin/hbase-daemon.sh 
--config /etc/hbase/conf start regionserver',
-      not_if = 'ls /var/run/hbase/hbase-hbase-regionserver.pid >/dev/null 2>&1 
&& ps -p `cat /var/run/hbase/hbase-hbase-regionserver.pid` >/dev/null 2>&1',
-      user = 'hbase',
-    )
-    self.assertNoMoreResources()
-    
-  def test_stop_secured(self):
-    
self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_regionserver.py",
-                   classname = "HbaseRegionServer",
-                   command = "stop",
-                   config_file="secured.json"
-    )
-
-    self.assertResourceCalled('Execute', '/usr/lib/hbase/bin/hbase-daemon.sh 
--config /etc/hbase/conf stop regionserver && rm -f 
/var/run/hbase/hbase-hbase-regionserver.pid',
-      not_if = None,
-      user = 'hbase',
-    )
-    self.assertNoMoreResources()
-
-  def assert_configure_default(self):
-    self.assertResourceCalled('Directory', '/etc/hbase/conf',
-      owner = 'hbase',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hbase-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hbase-site']
-    )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hdfs-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-    )
-    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/hbase/conf/hbase-policy.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
-      owner = 'hbase',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hadoop-metrics.properties',
-      owner = 'hbase',
-      template_tag = 'GANGLIA-RS',
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/regionservers',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('Directory', '/var/run/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hbase/conf/log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hbase',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('HdfsDirectory', 
'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              owner = 'hbase',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/apps/hbase/staging',
-                              security_enabled = False,
-                              keytab = UnknownConfigurationMock(),
-                              conf_dir = '/etc/hadoop/conf',
-                              hdfs_user = 'hdfs',
-                              kinit_path_local = "/usr/bin/kinit",
-                              mode = 0711,
-                              owner = 'hbase',
-                              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'],
-                              )
-
-  
-  def assert_configure_secured(self):
-    self.assertResourceCalled('Directory', '/etc/hbase/conf',
-      owner = 'hbase',
-      group = 'hadoop',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/hadoop/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('XmlConfig', 'hbase-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hbase-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hbase-site']
-    )
-    self.assertResourceCalled('XmlConfig', 'hdfs-site.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-      conf_dir = '/etc/hbase/conf',
-      configurations = self.getConfig()['configurations']['hdfs-site'],
-      configuration_attributes = 
self.getConfig()['configuration_attributes']['hdfs-site']
-    )
-    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/hbase/conf/hbase-policy.xml',
-      owner = 'hbase',
-      group = 'hadoop',
-    )
-    self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
-      owner = 'hbase',
-      content = 
InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hadoop-metrics.properties',
-      owner = 'hbase',
-      template_tag = 'GANGLIA-RS',
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/regionservers',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('TemplateConfig', 
'/etc/hbase/conf/hbase_regionserver_jaas.conf',
-      owner = 'hbase',
-      template_tag = None,
-    )
-    self.assertResourceCalled('Directory', '/var/run/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('Directory', '/var/log/hbase',
-      owner = 'hbase',
-      recursive = True,
-    )
-    self.assertResourceCalled('File',
-                              '/etc/hbase/conf/log4j.properties',
-                              mode=0644,
-                              group='hadoop',
-                              owner='hbase',
-                              content='log4jproperties\nline2'
-    )
-    self.assertResourceCalled('HdfsDirectory', 
'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
-                              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 = 'hbase',
-                              action = ['create_delayed'],
-                              )
-    self.assertResourceCalled('HdfsDirectory', '/apps/hbase/staging',
-                              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 = 0711,
-                              owner = 'hbase',
-                              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'],
-                              )

http://git-wip-us.apache.org/repos/asf/ambari/blob/23b7c110/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_service_check.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_service_check.py 
b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_service_check.py
deleted file mode 100644
index bf78b2e..0000000
--- 
a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_service_check.py
+++ /dev/null
@@ -1,92 +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 datetime
-import  resource_management.libraries.functions
-
[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/HBASE/package/scripts/service_check.py",
-                        classname="HbaseServiceCheck",
-                        command="service_check",
-                        config_file="default.json"
-    )
-    self.assertResourceCalled('File', '/tmp/hbaseSmokeVerify.sh',
-      content = StaticFile('hbaseSmokeVerify.sh'),
-      mode = 0755,
-    )
-    self.assertResourceCalled('File', '/tmp/hbase-smoke.sh',
-      content = Template('hbase-smoke.sh.j2'),
-      mode = 0755,
-    )
-    self.assertResourceCalled('Execute', ' hbase --config /etc/hbase/conf 
shell /tmp/hbase-smoke.sh',
-      logoutput = True,
-      tries = 3,
-      user = 'ambari-qa',
-      try_sleep = 5,
-    )
-    self.assertResourceCalled('Execute', ' /tmp/hbaseSmokeVerify.sh 
/etc/hbase/conf ',
-      logoutput = True,
-      tries = 3,
-      user = 'ambari-qa',
-      try_sleep = 5,
-    )
-    self.assertNoMoreResources()
-    
-    
-  def test_service_check_secured(self):
-    self.executeScript("1.3.2/services/HBASE/package/scripts/service_check.py",
-                        classname="HbaseServiceCheck",
-                        command="service_check",
-                        config_file="secured.json"
-    )
-    self.assertResourceCalled('File', '/tmp/hbaseSmokeVerify.sh',
-      content = StaticFile('hbaseSmokeVerify.sh'),
-      mode = 0755,
-    )
-    self.assertResourceCalled('File', '/tmp/hbase-smoke.sh',
-      content = Template('hbase-smoke.sh.j2'),
-      mode = 0755,
-    )
-    self.assertResourceCalled('File', '/tmp/hbase_grant_permissions.sh',
-      content = Template('hbase_grant_permissions.j2'),
-      owner = 'hbase',
-      group = 'hadoop',
-      mode = 0644,
-    )
-    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hbase.headless.keytab hbase; hbase shell 
/tmp/hbase_grant_permissions.sh',
-      user = 'hbase',
-    )
-    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/smokeuser.headless.keytab ambari-qa; hbase --config 
/etc/hbase/conf shell /tmp/hbase-smoke.sh',
-      logoutput = True,
-      tries = 3,
-      user = 'ambari-qa',
-      try_sleep = 5,
-    )
-    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/smokeuser.headless.keytab ambari-qa; 
/tmp/hbaseSmokeVerify.sh /etc/hbase/conf ',
-      logoutput = True,
-      tries = 3,
-      user = 'ambari-qa',
-      try_sleep = 5,
-    )
-    self.assertNoMoreResources()
\ No newline at end of file

Reply via email to