Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2193C11A3C for ; Mon, 15 Sep 2014 19:12:35 +0000 (UTC) Received: (qmail 38345 invoked by uid 500); 15 Sep 2014 19:12:35 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 38250 invoked by uid 500); 15 Sep 2014 19:12:35 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 38208 invoked by uid 99); 15 Sep 2014 19:12:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Sep 2014 19:12:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A447FA14103; Mon, 15 Sep 2014 19:12:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jaimin@apache.org To: commits@ambari.apache.org Date: Mon, 15 Sep 2014 19:12:36 -0000 Message-Id: <9c57f841bab440e8a1de8c3e3e3eb74d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] AMBARI-7296. HCatalog and WebHCat services should not be managed as separate service (should be part of Hive service) (jaimin) http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_webhcat_server.py new file mode 100644 index 0000000..75496c2 --- /dev/null +++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_webhcat_server.py @@ -0,0 +1,258 @@ +#!/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 * + +class TestWebHCatServer(RMFTestCase): + + def test_configure_default(self): + self.executeScript("1.3.2/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "configure", + config_file="default.json" + ) + self.assert_configure_default() + self.assertNoMoreResources() + + def test_start_default(self): + self.executeScript("1.3.2/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "start", + config_file="default.json" + ) + + self.assert_configure_default() + self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start', + not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1', + user = 'hcat' + ) + self.assertNoMoreResources() + + def test_stop_default(self): + self.executeScript("1.3.2/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "stop", + config_file="default.json" + ) + + self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', + user = 'hcat', + ) + self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') + self.assertNoMoreResources() + + def test_configure_secured(self): + self.executeScript("1.3.2/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "configure", + config_file="secured.json" + ) + + self.assert_configure_secured() + self.assertNoMoreResources() + + def test_start_secured(self): + self.executeScript("1.3.2/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "start", + config_file="secured.json" + ) + + self.assert_configure_secured() + self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start', + not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1', + user = 'hcat' + ) + self.assertNoMoreResources() + + def test_stop_secured(self): + self.executeScript("1.3.2/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "stop", + config_file="secured.json" + ) + + self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', + user = 'hcat', + ) + self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') + self.assertNoMoreResources() + + def assert_configure_default(self): + self.assertResourceCalled('HdfsDirectory', '/user/hcat', + security_enabled = False, + keytab = UnknownConfigurationMock(), + conf_dir = '/etc/hadoop/conf', + hdfs_user = 'hdfs', + kinit_path_local = "/usr/bin/kinit", + mode = 0755, + owner = 'hcat', + action = ['create_delayed'], + ) + self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', + security_enabled = False, + keytab = UnknownConfigurationMock(), + conf_dir = '/etc/hadoop/conf', + hdfs_user = 'hdfs', + kinit_path_local = "/usr/bin/kinit", + mode = 0755, + owner = 'hcat', + 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/webhcat', + owner = 'hcat', + group = 'hadoop', + recursive = True, + mode = 0755, + ) + self.assertResourceCalled('Directory', '/var/log/webhcat', + owner = 'hcat', + group = 'hadoop', + recursive = True, + mode = 0755, + ) + self.assertResourceCalled('Directory', '/etc/hcatalog/conf', + owner = 'hcat', + group = 'hadoop', + ) + self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', + owner = 'hcat', + group = 'hadoop', + conf_dir = '/etc/hcatalog/conf', + configurations = self.getConfig()['configurations']['webhcat-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] + ) + self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-env.sh', + content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), + owner = 'hcat', + group = 'hadoop', + ) + self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop/contrib/streaming/hadoop-streaming*.jar', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='', + hdfs_user='hdfs' + ) + self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='', + hdfs_user='hdfs' + ) + self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='', + hdfs_user='hdfs' + ) + + def assert_configure_secured(self): + self.assertResourceCalled('HdfsDirectory', '/user/hcat', + 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 = 0755, + owner = 'hcat', + action = ['create_delayed'], + ) + self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', + 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 = 0755, + owner = 'hcat', + 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/webhcat', + owner = 'hcat', + group = 'hadoop', + recursive = True, + mode = 0755, + ) + self.assertResourceCalled('Directory', '/var/log/webhcat', + owner = 'hcat', + group = 'hadoop', + recursive = True, + mode = 0755, + ) + self.assertResourceCalled('Directory', '/etc/hcatalog/conf', + owner = 'hcat', + group = 'hadoop', + ) + self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', + owner = 'hcat', + group = 'hadoop', + conf_dir = '/etc/hcatalog/conf', + configurations = self.getConfig()['configurations']['webhcat-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] + ) + self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-env.sh', + content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), + owner = 'hcat', + group = 'hadoop', + ) + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + path = ['/bin'], + user = 'hcat', + ) + self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop/contrib/streaming/hadoop-streaming*.jar', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hdfs_user='hdfs' + ) + self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hdfs_user='hdfs' + ) + self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hdfs_user='hdfs' + ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py b/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py deleted file mode 100644 index c0d8ccc..0000000 --- a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py +++ /dev/null @@ -1,258 +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 * - -class TestWebHCatServer(RMFTestCase): - - def test_configure_default(self): - self.executeScript("1.3.2/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "configure", - config_file="default.json" - ) - self.assert_configure_default() - self.assertNoMoreResources() - - def test_start_default(self): - self.executeScript("1.3.2/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "start", - config_file="default.json" - ) - - self.assert_configure_default() - self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start', - not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1', - user = 'hcat' - ) - self.assertNoMoreResources() - - def test_stop_default(self): - self.executeScript("1.3.2/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "stop", - config_file="default.json" - ) - - self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', - user = 'hcat', - ) - self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') - self.assertNoMoreResources() - - def test_configure_secured(self): - self.executeScript("1.3.2/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "configure", - config_file="secured.json" - ) - - self.assert_configure_secured() - self.assertNoMoreResources() - - def test_start_secured(self): - self.executeScript("1.3.2/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "start", - config_file="secured.json" - ) - - self.assert_configure_secured() - self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start', - not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1', - user = 'hcat' - ) - self.assertNoMoreResources() - - def test_stop_secured(self): - self.executeScript("1.3.2/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "stop", - config_file="secured.json" - ) - - self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', - user = 'hcat', - ) - self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') - self.assertNoMoreResources() - - def assert_configure_default(self): - self.assertResourceCalled('HdfsDirectory', '/user/hcat', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 0755, - owner = 'hcat', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 0755, - owner = 'hcat', - 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/webhcat', - owner = 'hcat', - group = 'hadoop', - recursive = True, - mode = 0755, - ) - self.assertResourceCalled('Directory', '/var/log/webhcat', - owner = 'hcat', - group = 'hadoop', - recursive = True, - mode = 0755, - ) - self.assertResourceCalled('Directory', '/etc/hcatalog/conf', - owner = 'hcat', - group = 'hadoop', - ) - self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', - owner = 'hcat', - group = 'hadoop', - conf_dir = '/etc/hcatalog/conf', - configurations = self.getConfig()['configurations']['webhcat-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] - ) - self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-env.sh', - content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), - owner = 'hcat', - group = 'hadoop', - ) - self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop/contrib/streaming/hadoop-streaming*.jar', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hdfs_user='hdfs' - ) - - def assert_configure_secured(self): - self.assertResourceCalled('HdfsDirectory', '/user/hcat', - 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 = 0755, - owner = 'hcat', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', - 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 = 0755, - owner = 'hcat', - 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/webhcat', - owner = 'hcat', - group = 'hadoop', - recursive = True, - mode = 0755, - ) - self.assertResourceCalled('Directory', '/var/log/webhcat', - owner = 'hcat', - group = 'hadoop', - recursive = True, - mode = 0755, - ) - self.assertResourceCalled('Directory', '/etc/hcatalog/conf', - owner = 'hcat', - group = 'hadoop', - ) - self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', - owner = 'hcat', - group = 'hadoop', - conf_dir = '/etc/hcatalog/conf', - configurations = self.getConfig()['configurations']['webhcat-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] - ) - self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-env.sh', - content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), - owner = 'hcat', - group = 'hadoop', - ) - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - path = ['/bin'], - user = 'hcat', - ) - self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop/contrib/streaming/hadoop-streaming*.jar', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hdfs_user='hdfs' - ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_service_check.py deleted file mode 100644 index c37319b..0000000 --- a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_service_check.py +++ /dev/null @@ -1,61 +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/WEBHCAT/package/scripts/service_check.py", - classname="WebHCatServiceCheck", - command="service_check", - config_file="default.json" - ) - self.assertResourceCalled('File', '/tmp/templetonSmoke.sh', - content = StaticFile('templetonSmoke.sh'), - mode = 0755, - ) - self.assertResourceCalled('Execute', 'sh /tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa no_keytab false /usr/bin/kinit', - logoutput = True, - path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], - tries = 3, - try_sleep = 5, - ) - self.assertNoMoreResources() - - def test_service_check_secured(self): - - self.executeScript("1.3.2/services/WEBHCAT/package/scripts/service_check.py", - classname="WebHCatServiceCheck", - command="service_check", - config_file="secured.json" - ) - self.assertResourceCalled('File', '/tmp/templetonSmoke.sh', - content = StaticFile('templetonSmoke.sh'), - mode = 0755, - ) - self.assertResourceCalled('Execute', 'sh /tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa /etc/security/keytabs/smokeuser.headless.keytab true /usr/bin/kinit', - logoutput = True, - path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], - tries = 3, - try_sleep = 5, - ) - self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py index 4ae9ad2..79ac487 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py @@ -63,6 +63,16 @@ class TestServiceCheck(RMFTestCase): environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, try_sleep = 5, ) + self.assertResourceCalled('File', '/tmp/templetonSmoke.sh', + content = StaticFile('templetonSmoke.sh'), + mode = 0755, + ) + self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa no_keytab false /usr/bin/kinit', + logoutput = True, + path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], + tries = 3, + try_sleep = 5, + ) self.assertNoMoreResources() @patch("sys.exit") @@ -103,4 +113,15 @@ class TestServiceCheck(RMFTestCase): environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, try_sleep = 5, ) + self.assertResourceCalled('File', '/tmp/templetonSmoke.sh', + content = StaticFile('templetonSmoke.sh'), + mode = 0755, + ) + self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa /etc/security/keytabs/smokeuser.headless.keytab true /usr/bin/kinit', + logoutput = True, + path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], + tries = 3, + try_sleep = 5, + ) + self.assertNoMoreResources() self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py new file mode 100644 index 0000000..71839cb --- /dev/null +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py @@ -0,0 +1,270 @@ +#!/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 * + +class TestWebHCatServer(RMFTestCase): + + def test_configure_default(self): + self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "configure", + config_file="default.json" + ) + self.assert_configure_default() + self.assertNoMoreResources() + + def test_start_default(self): + self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "start", + config_file="default.json" + ) + + self.assert_configure_default() + self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start', + not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1', + user = 'hcat' + ) + self.assertNoMoreResources() + + def test_stop_default(self): + self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "stop", + config_file="default.json" + ) + + self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', + user = 'hcat', + ) + self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') + self.assertNoMoreResources() + + def test_configure_secured(self): + self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "configure", + config_file="secured.json" + ) + + self.assert_configure_secured() + self.assertNoMoreResources() + + def test_start_secured(self): + self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "start", + config_file="secured.json" + ) + + self.assert_configure_secured() + self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start', + not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1', + user = 'hcat' + ) + self.assertNoMoreResources() + + def test_stop_secured(self): + self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + classname = "WebHCatServer", + command = "stop", + config_file="secured.json" + ) + + self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', + user = 'hcat', + ) + self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') + self.assertNoMoreResources() + + def assert_configure_default(self): + self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', + security_enabled = False, + keytab = UnknownConfigurationMock(), + conf_dir = '/etc/hadoop/conf', + hdfs_user = 'hdfs', + kinit_path_local = "/usr/bin/kinit", + mode = 0755, + owner = 'hcat', + bin_dir = '/usr/bin', + action = ['create_delayed'], + ) + self.assertResourceCalled('HdfsDirectory', '/user/hcat', + security_enabled = False, + keytab = UnknownConfigurationMock(), + conf_dir = '/etc/hadoop/conf', + hdfs_user = 'hdfs', + kinit_path_local = "/usr/bin/kinit", + mode = 0755, + owner = 'hcat', + bin_dir = '/usr/bin', + 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", + bin_dir = '/usr/bin', + action = ['create'], + ) + self.assertResourceCalled('Directory', '/var/run/webhcat', + owner = 'hcat', + group = 'hadoop', + recursive = True, + mode = 0755, + ) + self.assertResourceCalled('Directory', '/var/log/webhcat', + owner = 'hcat', + group = 'hadoop', + recursive = True, + mode = 0755, + ) + self.assertResourceCalled('Directory', '/etc/hcatalog/conf', + owner = 'hcat', + group = 'hadoop', + ) + self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', + owner = 'hcat', + group = 'hadoop', + conf_dir = '/etc/hcatalog/conf', + configurations = self.getConfig()['configurations']['webhcat-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] + ) + self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-env.sh', + content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), + owner = 'hcat', + group = 'hadoop', + ) + self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='', + hadoop_conf_dir='/etc/hadoop/conf', + hdfs_user='hdfs' + ) + self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='', + hadoop_conf_dir='/etc/hadoop/conf', + hdfs_user='hdfs' + ) + self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='', + hadoop_conf_dir='/etc/hadoop/conf', + hdfs_user='hdfs' + ) + + def assert_configure_secured(self): + self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', + 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 = 0755, + owner = 'hcat', + bin_dir = '/usr/bin', + action = ['create_delayed'], + ) + self.assertResourceCalled('HdfsDirectory', '/user/hcat', + 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 = 0755, + owner = 'hcat', + bin_dir = '/usr/bin', + 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', + bin_dir = '/usr/bin', + action = ['create'], + ) + self.assertResourceCalled('Directory', '/var/run/webhcat', + owner = 'hcat', + group = 'hadoop', + recursive = True, + mode = 0755, + ) + self.assertResourceCalled('Directory', '/var/log/webhcat', + owner = 'hcat', + group = 'hadoop', + recursive = True, + mode = 0755, + ) + self.assertResourceCalled('Directory', '/etc/hcatalog/conf', + owner = 'hcat', + group = 'hadoop', + ) + self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', + owner = 'hcat', + group = 'hadoop', + conf_dir = '/etc/hcatalog/conf', + configurations = self.getConfig()['configurations']['webhcat-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] + ) + self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-env.sh', + content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), + owner = 'hcat', + group = 'hadoop', + ) + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + path = ['/bin'], + user = 'hcat', + ) + self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hadoop_conf_dir='/etc/hadoop/conf', + hdfs_user='hdfs' + ) + self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hadoop_conf_dir='/etc/hadoop/conf', + hdfs_user='hdfs' + ) + self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', + owner='hcat', + mode=0755, + dest_dir='/apps/webhcat', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hadoop_conf_dir='/etc/hadoop/conf', + hdfs_user='hdfs' + ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py deleted file mode 100644 index bde2e86..0000000 --- a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py +++ /dev/null @@ -1,273 +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 * - -from resource_management.libraries import functions -import json - -class TestWebHCatServer(RMFTestCase): - - def test_configure_default(self): - self.executeScript("2.0.6/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "configure", - config_file="default.json" - ) - self.assert_configure_default() - self.assertNoMoreResources() - - def test_start_default(self): - self.executeScript("2.0.6/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "start", - config_file="default.json" - ) - - self.assert_configure_default() - self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start', - not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1', - user = 'hcat' - ) - self.assertNoMoreResources() - - def test_stop_default(self): - self.executeScript("2.0.6/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "stop", - config_file="default.json" - ) - - self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', - user = 'hcat', - ) - self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') - self.assertNoMoreResources() - - def test_configure_secured(self): - self.executeScript("2.0.6/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "configure", - config_file="secured.json" - ) - - self.assert_configure_secured() - self.assertNoMoreResources() - - def test_start_secured(self): - self.executeScript("2.0.6/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "start", - config_file="secured.json" - ) - - self.assert_configure_secured() - self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start', - not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1', - user = 'hcat' - ) - self.assertNoMoreResources() - - def test_stop_secured(self): - self.executeScript("2.0.6/services/WEBHCAT/package/scripts/webhcat_server.py", - classname = "WebHCatServer", - command = "stop", - config_file="secured.json" - ) - - self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', - user = 'hcat', - ) - self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') - self.assertNoMoreResources() - - def assert_configure_default(self): - self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 0755, - owner = 'hcat', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/user/hcat', - security_enabled = False, - keytab = UnknownConfigurationMock(), - conf_dir = '/etc/hadoop/conf', - hdfs_user = 'hdfs', - kinit_path_local = "/usr/bin/kinit", - mode = 0755, - owner = 'hcat', - bin_dir = '/usr/bin', - 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", - bin_dir = '/usr/bin', - action = ['create'], - ) - self.assertResourceCalled('Directory', '/var/run/webhcat', - owner = 'hcat', - group = 'hadoop', - recursive = True, - mode = 0755, - ) - self.assertResourceCalled('Directory', '/var/log/webhcat', - owner = 'hcat', - group = 'hadoop', - recursive = True, - mode = 0755, - ) - self.assertResourceCalled('Directory', '/etc/hcatalog/conf', - owner = 'hcat', - group = 'hadoop', - ) - self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', - owner = 'hcat', - group = 'hadoop', - conf_dir = '/etc/hcatalog/conf', - configurations = self.getConfig()['configurations']['webhcat-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] - ) - self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-env.sh', - content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), - owner = 'hcat', - group = 'hadoop', - ) - self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hadoop_conf_dir='/etc/hadoop/conf', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hadoop_conf_dir='/etc/hadoop/conf', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='', - hadoop_conf_dir='/etc/hadoop/conf', - hdfs_user='hdfs' - ) - - def assert_configure_secured(self): - self.assertResourceCalled('HdfsDirectory', '/apps/webhcat', - 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 = 0755, - owner = 'hcat', - bin_dir = '/usr/bin', - action = ['create_delayed'], - ) - self.assertResourceCalled('HdfsDirectory', '/user/hcat', - 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 = 0755, - owner = 'hcat', - bin_dir = '/usr/bin', - 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', - bin_dir = '/usr/bin', - action = ['create'], - ) - self.assertResourceCalled('Directory', '/var/run/webhcat', - owner = 'hcat', - group = 'hadoop', - recursive = True, - mode = 0755, - ) - self.assertResourceCalled('Directory', '/var/log/webhcat', - owner = 'hcat', - group = 'hadoop', - recursive = True, - mode = 0755, - ) - self.assertResourceCalled('Directory', '/etc/hcatalog/conf', - owner = 'hcat', - group = 'hadoop', - ) - self.assertResourceCalled('XmlConfig', 'webhcat-site.xml', - owner = 'hcat', - group = 'hadoop', - conf_dir = '/etc/hcatalog/conf', - configurations = self.getConfig()['configurations']['webhcat-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'] - ) - self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-env.sh', - content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']), - owner = 'hcat', - group = 'hadoop', - ) - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - path = ['/bin'], - user = 'hcat', - ) - self.assertResourceCalled('CopyFromLocal', '/usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hadoop_conf_dir='/etc/hadoop/conf', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hadoop_conf_dir='/etc/hadoop/conf', - hdfs_user='hdfs' - ) - self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', - owner='hcat', - mode=0755, - dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', - hadoop_conf_dir='/etc/hadoop/conf', - hdfs_user='hdfs' - ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_service_check.py deleted file mode 100644 index 314d3f6..0000000 --- a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_service_check.py +++ /dev/null @@ -1,61 +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("2.0.6/services/WEBHCAT/package/scripts/service_check.py", - classname="WebHCatServiceCheck", - command="service_check", - config_file="default.json" - ) - self.assertResourceCalled('File', '/tmp/templetonSmoke.sh', - content = StaticFile('templetonSmoke.sh'), - mode = 0755, - ) - self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa no_keytab false /usr/bin/kinit', - logoutput = True, - path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], - tries = 3, - try_sleep = 5, - ) - self.assertNoMoreResources() - - def test_service_check_secured(self): - - self.executeScript("2.0.6/services/WEBHCAT/package/scripts/service_check.py", - classname="WebHCatServiceCheck", - command="service_check", - config_file="secured.json" - ) - self.assertResourceCalled('File', '/tmp/templetonSmoke.sh', - content = StaticFile('templetonSmoke.sh'), - mode = 0755, - ) - self.assertResourceCalled('Execute', '/tmp/templetonSmoke.sh c6402.ambari.apache.org ambari-qa /etc/security/keytabs/smokeuser.headless.keytab true /usr/bin/kinit', - logoutput = True, - path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], - tries = 3, - try_sleep = 5, - ) - self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml index 5215d34..5145ef2 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml @@ -81,6 +81,49 @@ + WEBHCAT_SERVER + WebHCat Server + MASTER + 1 + + + HDFS/HDFS_CLIENT + host + + true + + + + MAPREDUCE/MAPREDUCE_CLIENT + host + + true + + + + ZOOKEEPER/ZOOKEEPER_SERVER + cluster + + true + WEBHCAT/WEBHCAT_SERVER + + + + ZOOKEEPER/ZOOKEEPER_CLIENT + host + + true + + + + + + PYTHON + 600 + + + + MYSQL_SERVER MASTER 1 @@ -111,6 +154,37 @@ + + HCAT + HCat + CLIENT + + + PYTHON + + + + xml + hive-site.xml + hive-site + + + env + hive-env.sh + hive-env + + + env + hive-log4j.properties + hive-log4j + + + env + hive-exec-log4j.properties + hive-exec-log4j + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/configuration/webhcat-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/configuration/webhcat-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/configuration/webhcat-site.xml deleted file mode 100644 index 5a78c0c..0000000 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/configuration/webhcat-site.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - templeton.port - 50111 - The HTTP port for the main server. - - - - templeton.hadoop.conf.dir - /etc/hadoop/conf - The path to the Hadoop configuration. - - - - templeton.jar - /usr/lib/hcatalog/share/webhcat/svr/webhcat.jar - The path to the Templeton jar file. - - - - templeton.libjars - /usr/lib/zookeeper/zookeeper.jar - Jars to add the the classpath. - - - - - templeton.hadoop - /usr/bin/hadoop - The path to the Hadoop executable. - - - - templeton.pig.archive - hdfs:///apps/webhcat/pig.tar.gz - The path to the Pig archive. - - - - templeton.pig.path - pig.tar.gz/pig/bin/pig - The path to the Pig executable. - - - - templeton.hcat - /usr/bin/hcat - The path to the hcatalog executable. - - - - templeton.hive.archive - hdfs:///apps/webhcat/hive.tar.gz - The path to the Hive archive. - - - - templeton.hive.path - hive.tar.gz/hive/bin/hive - The path to the Hive executable. - - - - templeton.hive.properties - - Properties to set when running hive. - - - - - templeton.zookeeper.hosts - - ZooKeeper servers, as comma separated host:port pairs - - - - templeton.storage.class - org.apache.hcatalog.templeton.tool.ZooKeeperStorage - The class to use as storage - - - - templeton.override.enabled - false - - Enable the override path in templeton.override.jars - - - - - templeton.streaming.jar - hdfs:///apps/webhcat/hadoop-streaming.jar - The hdfs path to the Hadoop streaming jar file. - - - - templeton.exec.timeout - 60000 - Time out for templeton api - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml deleted file mode 100644 index f742d99..0000000 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - 2.0 - - - WEBHCAT - This is comment for WEBHCAT service - 0.11.0.2.0.5.0 - - - - WEBHCAT_SERVER - MASTER - 1 - - - HDFS/HDFS_CLIENT - host - - true - - - - MAPREDUCE2/MAPREDUCE2_CLIENT - host - - true - - - - ZOOKEEPER/ZOOKEEPER_SERVER - cluster - - true - WEBHCAT/WEBHCAT_SERVER - - - - ZOOKEEPER/ZOOKEEPER_CLIENT - host - - true - - - - YARN/YARN_CLIENT - host - - true - - - - - - PYTHON - 600 - - - - - - any - - - hcatalog - - - webhcat-tar-hive - - - webhcat-tar-pig - - - - - - - PYTHON - 300 - - - webhcat-site - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml deleted file mode 100644 index d73e67e..0000000 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 2.0 - - - WEBHCAT - WebHCat - This is comment for WEBHCAT service - 0.11.0.2.0.5.0 - - -