openstack
/
sahara-plugin-vanilla
Code Issues Proposed changes

Moved URI getters from plugin SPI to edp_engine 

Change-Id: I6dec6f62a8b2c8e1772af862bc86816bfa5d7f4d
Partial-Bug: #1357512
This commit is contained in:
Andrew Lazarev 2014-08-19 13:51:01 -07:00
parent 2ebf3fbbe1
commit e68a24c3a6
9 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sahara/plugins/vanilla/abstractversionhandler.py
View File

@ -53,10 +53,6 @@ class AbstractVersionHandler():
def validate_scaling(self, cluster, existing, additional):
return
@abc.abstractmethod
def get_resource_manager_uri(self, cluster):
return
@abc.abstractmethod
def get_oozie_server(self, cluster):
return

6
sahara/plugins/vanilla/edp_engine.py
View File

@ -19,3 +19,9 @@ from sahara.service.edp.oozie import engine as edp_engine
class EdpOozieEngine(edp_engine.OozieJobEngine):
def get_hdfs_user(self):
return 'hadoop'
def get_name_node_uri(self, cluster):
return cluster['info']['HDFS']['NameNode']
def get_oozie_server_uri(self, cluster):
return cluster['info']['JobFlow']['Oozie'] + "/oozie/"

3
sahara/plugins/vanilla/hadoop2/edp_engine.py
View File

@ -21,3 +21,6 @@ class EdpOozieEngine(edp_engine.EdpOozieEngine):
def create_hdfs_dir(self, remote, dir_name):
hdfs_helper.create_dir_hadoop2(remote, dir_name, self.get_hdfs_user())
def get_resource_manager_uri(self, cluster):
return cluster['info']['YARN']['ResourceManager']

10
sahara/plugins/vanilla/plugin.py
View File

@ -33,10 +33,6 @@ class VanillaProvider(p.ProvisioningPluginBase):
def _get_version_handler(self, hadoop_version):
return self.version_factory.get_version_handler(hadoop_version)
def get_resource_manager_uri(self, cluster):
return self._get_version_handler(
cluster.hadoop_version).get_resource_manager_uri(cluster)
def get_node_processes(self, hadoop_version):
return self._get_version_handler(hadoop_version).get_node_processes()
@ -83,12 +79,6 @@ class VanillaProvider(p.ProvisioningPluginBase):
if oo_count != 1:
raise ex.InvalidComponentCountException('oozie', '1', oo_count)
def get_name_node_uri(self, cluster):
return cluster['info']['HDFS']['NameNode']
def get_oozie_server_uri(self, cluster):
return cluster['info']['JobFlow']['Oozie'] + "/oozie/"
def get_edp_engine(self, cluster, job_type):
return self._get_version_handler(
cluster.hadoop_version).get_edp_engine(cluster, job_type)

3
sahara/plugins/vanilla/v1_2_1/edp_engine.py
View File

@ -21,3 +21,6 @@ class EdpOozieEngine(edp_engine.EdpOozieEngine):
def create_hdfs_dir(self, remote, dir_name):
hdfs_helper.create_dir_hadoop1(remote, dir_name, self.get_hdfs_user())
def get_resource_manager_uri(self, cluster):
return cluster['info']['MapReduce']['JobTracker']

3
sahara/plugins/vanilla/v1_2_1/versionhandler.py
View File

@ -55,9 +55,6 @@ class VersionHandler(avm.AbstractVersionHandler):
"Hive": ["hiveserver"]
}
def get_resource_manager_uri(self, cluster):
return cluster['info']['MapReduce']['JobTracker']
def get_oozie_server(self, cluster):
return vu.get_oozie(cluster)

3
sahara/plugins/vanilla/v2_3_0/versionhandler.py
View File

@ -140,9 +140,6 @@ class VersionHandler(avm.AbstractVersionHandler):
def get_oozie_server(self, cluster):
return vu.get_oozie(cluster)
def get_resource_manager_uri(self, cluster):
return cluster['info']['YARN']['ResourceManager']
def get_edp_engine(self, cluster, job_type):
if job_type in edp_engine.EdpOozieEngine.get_supported_job_types():
return edp_engine.EdpOozieEngine(cluster)

8
sahara/plugins/vanilla/v2_4_1/versionhandler.py
View File

@ -109,7 +109,8 @@ class VersionHandler(avm.AbstractVersionHandler):
if rm:
info['YARN'] = {
'Web UI': 'http://%s:%s' % (rm.management_ip, '8088')
'Web UI': 'http://%s:%s' % (rm.management_ip, '8088'),
'ResourceManager': 'http://%s:%s' % (rm.management_ip, '8032')
}
if nn:
@ -134,11 +135,6 @@ class VersionHandler(avm.AbstractVersionHandler):
def get_oozie_server(self, cluster):
return vu.get_oozie(cluster)
def get_resource_manager_uri(self, cluster):
rm = vu.get_resourcemanager(cluster)
return 'http://%(host)s:%(port)s' % {'host': rm.management_ip,
'port': '8032'}
def get_edp_engine(self, cluster, job_type):
if job_type in edp_engine.EdpOozieEngine.get_supported_job_types():
return edp_engine.EdpOozieEngine(cluster)

2
sahara/tests/unit/plugins/vanilla/hadoop2/test_plugin.py
View File

@ -44,4 +44,4 @@ class VanillaPluginTest(base.SaharaWithDbTestCase):
create_dir.reset_mock()
plugin.get_edp_engine(cluster, edp.JOB_TYPE_PIG).create_hdfs_dir(
mock.Mock(), '/tmp')
self.assertEqual(1, create_dir.call_count)
self.assertEqual(1, create_dir.call_count)