You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/09/15 21:12:36 UTC
[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 @@
</component>
<component>
+ <name>WEBHCAT_SERVER</name>
+ <displayName>WebHCat Server</displayName>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
+ <scope>cluster</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ <co-locate>WEBHCAT/WEBHCAT_SERVER</co-locate>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>ZOOKEEPER/ZOOKEEPER_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/webhcat_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </component>
+
+ <component>
<name>MYSQL_SERVER</name>
<category>MASTER</category>
<cardinality>1</cardinality>
@@ -111,6 +154,37 @@
</configFile>
</configFiles>
</component>
+ <component>
+ <name>HCAT</name>
+ <displayName>HCat</displayName>
+ <category>CLIENT</category>
+ <commandScript>
+ <script>scripts/hcat_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
+ <configFiles>
+ <configFile>
+ <type>xml</type>
+ <fileName>hive-site.xml</fileName>
+ <dictionaryName>hive-site</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hive-env.sh</fileName>
+ <dictionaryName>hive-env</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hive-log4j.properties</fileName>
+ <dictionaryName>hive-log4j</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hive-exec-log4j.properties</fileName>
+ <dictionaryName>hive-exec-log4j</dictionaryName>
+ </configFile>
+ </configFiles>
+ </component>
</components>
<osSpecifics>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-
-<!-- The default settings for Templeton. -->
-<!-- Edit templeton-site.xml to change settings for your local -->
-<!-- install. -->
-
-<configuration supports_final="true">
-
- <property>
- <name>templeton.port</name>
- <value>50111</value>
- <description>The HTTP port for the main server.</description>
- </property>
-
- <property>
- <name>templeton.hadoop.conf.dir</name>
- <value>/etc/hadoop/conf</value>
- <description>The path to the Hadoop configuration.</description>
- </property>
-
- <property>
- <name>templeton.jar</name>
- <value>/usr/lib/hcatalog/share/webhcat/svr/webhcat.jar</value>
- <description>The path to the Templeton jar file.</description>
- </property>
-
- <property>
- <name>templeton.libjars</name>
- <value>/usr/lib/zookeeper/zookeeper.jar</value>
- <description>Jars to add the the classpath.</description>
- </property>
-
-
- <property>
- <name>templeton.hadoop</name>
- <value>/usr/bin/hadoop</value>
- <description>The path to the Hadoop executable.</description>
- </property>
-
- <property>
- <name>templeton.pig.archive</name>
- <value>hdfs:///apps/webhcat/pig.tar.gz</value>
- <description>The path to the Pig archive.</description>
- </property>
-
- <property>
- <name>templeton.pig.path</name>
- <value>pig.tar.gz/pig/bin/pig</value>
- <description>The path to the Pig executable.</description>
- </property>
-
- <property>
- <name>templeton.hcat</name>
- <value>/usr/bin/hcat</value>
- <description>The path to the hcatalog executable.</description>
- </property>
-
- <property>
- <name>templeton.hive.archive</name>
- <value>hdfs:///apps/webhcat/hive.tar.gz</value>
- <description>The path to the Hive archive.</description>
- </property>
-
- <property>
- <name>templeton.hive.path</name>
- <value>hive.tar.gz/hive/bin/hive</value>
- <description>The path to the Hive executable.</description>
- </property>
-
- <property>
- <name>templeton.hive.properties</name>
- <value></value>
- <description>Properties to set when running hive.</description>
- </property>
-
-
- <property>
- <name>templeton.zookeeper.hosts</name>
- <value></value>
- <description>ZooKeeper servers, as comma separated host:port pairs</description>
- </property>
-
- <property>
- <name>templeton.storage.class</name>
- <value>org.apache.hcatalog.templeton.tool.ZooKeeperStorage</value>
- <description>The class to use as storage</description>
- </property>
-
- <property>
- <name>templeton.override.enabled</name>
- <value>false</value>
- <description>
- Enable the override path in templeton.override.jars
- </description>
- </property>
-
- <property>
- <name>templeton.streaming.jar</name>
- <value>hdfs:///apps/webhcat/hadoop-streaming.jar</value>
- <description>The hdfs path to the Hadoop streaming jar file.</description>
- </property>
-
- <property>
- <name>templeton.exec.timeout</name>
- <value>60000</value>
- <description>Time out for templeton api</description>
- </property>
-
-</configuration>
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 @@
-<?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>WEBHCAT</name>
- <comment>This is comment for WEBHCAT service</comment>
- <version>0.11.0.2.0.5.0</version>
-
- <components>
- <component>
- <name>WEBHCAT_SERVER</name>
- <category>MASTER</category>
- <cardinality>1</cardinality>
- <dependencies>
- <dependency>
- <name>HDFS/HDFS_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- <dependency>
- <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- <dependency>
- <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
- <scope>cluster</scope>
- <auto-deploy>
- <enabled>true</enabled>
- <co-locate>WEBHCAT/WEBHCAT_SERVER</co-locate>
- </auto-deploy>
- </dependency>
- <dependency>
- <name>ZOOKEEPER/ZOOKEEPER_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- <dependency>
- <name>YARN/YARN_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- </dependencies>
- <commandScript>
- <script>scripts/webhcat_server.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>600</timeout>
- </commandScript>
- </component>
- </components>
- <osSpecifics>
- <osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>hcatalog</name>
- </package>
- <package>
- <name>webhcat-tar-hive</name>
- </package>
- <package>
- <name>webhcat-tar-pig</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
- <commandScript>
- <script>scripts/service_check.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>300</timeout>
- </commandScript>
- <configuration-dependencies>
- <config-type>webhcat-site</config-type>
- </configuration-dependencies>
- </service>
- </services>
-</metainfo>
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 @@
-<?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>WEBHCAT</name>
- <displayName>WebHCat</displayName>
- <comment>This is comment for WEBHCAT service</comment>
- <version>0.11.0.2.0.5.0</version>
- </service>
- </services>
-</metainfo>