diff --git a/releasenotes/notes/remove-mapr-500-3df3041be99a864c.yaml b/releasenotes/notes/remove-mapr-500-3df3041be99a864c.yaml new file mode 100644 index 0000000000..6df1b78f3e --- /dev/null +++ b/releasenotes/notes/remove-mapr-500-3df3041be99a864c.yaml @@ -0,0 +1,3 @@ +--- +deprecations: + - Removed support for the MapR 5.0.0 plugin. diff --git a/sahara/plugins/mapr/plugin.py b/sahara/plugins/mapr/plugin.py index 0cb862df40..7642ef0e40 100644 --- a/sahara/plugins/mapr/plugin.py +++ b/sahara/plugins/mapr/plugin.py @@ -39,10 +39,7 @@ class MapRPlugin(p.ProvisioningPluginBase): 'plugin_labels': {'enabled': {'status': True}}, 'version_labels': { '5.2.0.mrv2': {'enabled': {'status': True}}, - '5.1.0.mrv2': {'enabled': {'status': True}, - 'deprecated': {'status': True}}, - '5.0.0.mrv2': {'enabled': {'status': False}, - 'deprecated': {'status': True}} + '5.1.0.mrv2': {'enabled': {'status': False}}, } } diff --git a/sahara/plugins/mapr/versions/v5_0_0_mrv2/__init__.py b/sahara/plugins/mapr/versions/v5_0_0_mrv2/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/sahara/plugins/mapr/versions/v5_0_0_mrv2/context.py b/sahara/plugins/mapr/versions/v5_0_0_mrv2/context.py deleted file mode 100644 index b3193088aa..0000000000 --- a/sahara/plugins/mapr/versions/v5_0_0_mrv2/context.py +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2015, MapR Technologies -# -# Licensed 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. - - -import sahara.plugins.mapr.base.base_cluster_context as bc -import sahara.plugins.mapr.services.yarn.yarn as yarn - - -class Context(bc.BaseClusterContext): - def __init__(self, cluster, version_handler, added=None, removed=None): - super(Context, self).__init__(cluster, version_handler, added, removed) - self._hadoop_version = yarn.YARNv270().version - self._hadoop_lib = None - self._hadoop_conf = None - self._cluster_mode = yarn.YARNv270.cluster_mode - self._node_aware = True - self._resource_manager_uri = "maprfs:///" - self._mapr_version = "5.0.0" - self._ubuntu_ecosystem_repo = ( - "http://package.mapr.com/releases/ecosystem-5.x/ubuntu binary/") - self._centos_ecosystem_repo = ( - "http://package.mapr.com/releases/ecosystem-5.x/redhat") - - @property - def hadoop_lib(self): - if not self._hadoop_lib: - self._hadoop_lib = "%s/share/hadoop/common" % self.hadoop_home - return self._hadoop_lib - - @property - def hadoop_conf(self): - if not self._hadoop_conf: - self._hadoop_conf = "%s/etc/hadoop" % self.hadoop_home - return self._hadoop_conf - - @property - def resource_manager_uri(self): - return self._resource_manager_uri - - @property - def configure_sh(self): - if not self._configure_sh: - configure_sh_template = "%(base)s -HS %(history_server)s" - args = { - "base": super(Context, self).configure_sh, - "history_server": self.get_historyserver_ip(), - } - self._configure_sh = configure_sh_template % args - return self._configure_sh diff --git a/sahara/plugins/mapr/versions/v5_0_0_mrv2/version_handler.py b/sahara/plugins/mapr/versions/v5_0_0_mrv2/version_handler.py deleted file mode 100644 index 2e9d4afbf6..0000000000 --- a/sahara/plugins/mapr/versions/v5_0_0_mrv2/version_handler.py +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (c) 2015, MapR Technologies -# -# Licensed 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. - - -import sahara.plugins.mapr.base.base_version_handler as bvh -from sahara.plugins.mapr.services.drill import drill -from sahara.plugins.mapr.services.flume import flume -from sahara.plugins.mapr.services.hbase import hbase -from sahara.plugins.mapr.services.hive import hive -from sahara.plugins.mapr.services.httpfs import httpfs -from sahara.plugins.mapr.services.hue import hue -from sahara.plugins.mapr.services.impala import impala -from sahara.plugins.mapr.services.mahout import mahout -from sahara.plugins.mapr.services.management import management as mng -from sahara.plugins.mapr.services.maprfs import maprfs -from sahara.plugins.mapr.services.oozie import oozie -from sahara.plugins.mapr.services.pig import pig -from sahara.plugins.mapr.services.spark import spark -from sahara.plugins.mapr.services.sqoop import sqoop2 -from sahara.plugins.mapr.services.swift import swift -from sahara.plugins.mapr.services.yarn import yarn -import sahara.plugins.mapr.versions.v5_0_0_mrv2.context as c - - -version = "5.0.0.mrv2" - - -class VersionHandler(bvh.BaseVersionHandler): - def __init__(self): - super(VersionHandler, self).__init__() - self._version = version - self._required_services = [ - yarn.YARNv270(), - maprfs.MapRFS(), - mng.Management(), - oozie.Oozie(), - ] - self._services = [ - hive.HiveV013(), - hive.HiveV10(), - hive.HiveV12(), - impala.ImpalaV141(), - pig.PigV014(), - pig.PigV015(), - flume.FlumeV15(), - flume.FlumeV16(), - spark.SparkOnYarn(), - sqoop2.Sqoop2(), - mahout.MahoutV010(), - oozie.OozieV410(), - oozie.OozieV420(), - hue.HueV370(), - hue.HueV381(), - hue.HueV390(), - hbase.HBaseV0989(), - hbase.HBaseV09812(), - drill.DrillV11(), - drill.DrillV14(), - yarn.YARNv270(), - maprfs.MapRFS(), - mng.Management(), - httpfs.HttpFS(), - swift.Swift(), - ] - - def get_context(self, cluster, added=None, removed=None): - return c.Context(cluster, self, added, removed) diff --git a/sahara/tests/unit/plugins/mapr/test_base_handler.py b/sahara/tests/unit/plugins/mapr/test_base_handler.py index d5cc092473..f412edb8b9 100644 --- a/sahara/tests/unit/plugins/mapr/test_base_handler.py +++ b/sahara/tests/unit/plugins/mapr/test_base_handler.py @@ -20,7 +20,7 @@ from sahara.plugins.mapr.services.management import management from sahara.plugins.mapr.services.maprfs import maprfs from sahara.plugins.mapr.services.oozie import oozie from sahara.plugins.mapr.services.yarn import yarn -import sahara.plugins.mapr.versions.v5_0_0_mrv2.version_handler as handler +import sahara.plugins.mapr.versions.v5_2_0_mrv2.version_handler as handler from sahara.plugins import provisioning as p from sahara.tests.unit import base as b from sahara.tests.unit import testutils as tu @@ -56,7 +56,7 @@ class TestHandler(b.SaharaTestCase): name='test_cluster', tenant='large', plugin='mapr', - version='5.0.0.mrv2', + version='5.2.0.mrv2', node_groups=[master_ng], cluster_configs=cluster_configs, ) @@ -94,7 +94,6 @@ class TestHandler(b.SaharaTestCase): for conf in version_configs: self.assertIsInstance(conf, p.Config) self.assertNotEqual(0, len(conf.config_values)) - self.assertNotEqual(1, len(conf.config_values)) self.assertEqual('dropdown', conf.config_type) def test_get_configs_dict(self): diff --git a/sahara/tests/unit/plugins/mapr/test_cluster_context.py b/sahara/tests/unit/plugins/mapr/test_cluster_context.py index 7ed29e7895..f0128a9e5e 100644 --- a/sahara/tests/unit/plugins/mapr/test_cluster_context.py +++ b/sahara/tests/unit/plugins/mapr/test_cluster_context.py @@ -21,8 +21,8 @@ from sahara.plugins.mapr.services.maprfs import maprfs from sahara.plugins.mapr.services.oozie import oozie from sahara.plugins.mapr.services.swift import swift from sahara.plugins.mapr.services.yarn import yarn -import sahara.plugins.mapr.versions.v5_0_0_mrv2.context as cc -import sahara.plugins.mapr.versions.v5_0_0_mrv2.version_handler as handler +import sahara.plugins.mapr.versions.v5_2_0_mrv2.context as cc +import sahara.plugins.mapr.versions.v5_2_0_mrv2.version_handler as handler from sahara.plugins import provisioning as p from sahara.tests.unit import base as b from sahara.tests.unit import testutils as tu @@ -56,14 +56,14 @@ class TestClusterContext(b.SaharaTestCase): 'Service Version': '1.1', }, 'Oozie': { - 'Oozie Version': '4.1.0', + 'Oozie Version': '4.2.0', } } cluster = tu.create_cluster( name='test_cluster', tenant='large', plugin='mapr', - version='5.0.0.mrv2', + version='5.2.0.mrv2', node_groups=[master_ng], cluster_configs=cluster_configs, ) @@ -281,4 +281,4 @@ class TestClusterContext(b.SaharaTestCase): self.assertTrue(cluster_context.is_present(oozie.Oozie())) self.assertFalse(cluster_context.is_present(oozie.OozieV401())) - self.assertTrue(cluster_context.is_present(oozie.OozieV410())) + self.assertTrue(cluster_context.is_present(oozie.OozieV420()))