Drop support of deprecated 2.4.1 Vanilla plugin

Sahara deprecated vanilla 2.4.1 plugin and dropped building images
for that plugin in the Kilo release, so we can remove that from the
sahara codebase.

Implements blueprint: drop-vanilla-2-4-1
Change-Id: I89cbeee3722f3a6a91f759c6d5d71b0d7a8403da

MANIFEST.in

@@ -33,7 +33,6 @@ include sahara/plugins/vanilla/hadoop2/resources/*.template
 include sahara/plugins/vanilla/v1_2_1/resources/*.sh
 include sahara/plugins/vanilla/v1_2_1/resources/*.sql
 include sahara/plugins/vanilla/v1_2_1/resources/*.xml
-include sahara/plugins/vanilla/v2_4_1/resources/*.xml
 include sahara/plugins/vanilla/v2_6_0/resources/*.xml
 include sahara/plugins/hdp/versions/version_1_3_2/resources/*.template
 include sahara/plugins/hdp/versions/version_1_3_2/resources/*.json

sahara/plugins/vanilla/v2_4_1/config_helper.py

@@ -1,98 +0,0 @@
-# Copyright (c) 2014 Mirantis Inc.
-#
-# 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.
-
-from oslo_config import cfg
-from oslo_log import log as logging
-
-from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper
-from sahara.utils import xmlutils as x
-
-CONF = cfg.CONF
-CONF.import_opt("enable_data_locality", "sahara.topology.topology_helper")
-
-LOG = logging.getLogger(__name__)
-
-CORE_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_1/resources/core-default.xml')
-
-HDFS_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_1/resources/hdfs-default.xml')
-
-MAPRED_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_1/resources/mapred-default.xml')
-
-YARN_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_1/resources/yarn-default.xml')
-
-OOZIE_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_1/resources/oozie-default.xml')
-
-HIVE_DEFAULT = x.load_hadoop_xml_defaults(
-    'plugins/vanilla/v2_4_1/resources/hive-default.xml')
-
-XML_CONFS = {
-    "Hadoop": [CORE_DEFAULT],
-    "HDFS": [HDFS_DEFAULT],
-    "YARN": [YARN_DEFAULT],
-    "MapReduce": [MAPRED_DEFAULT],
-    "JobFlow": [OOZIE_DEFAULT],
-    "Hive": [HIVE_DEFAULT]
-}
-
-ENV_CONFS = {
-    "YARN": {
-        'ResourceManager Heap Size': 1024,
-        'NodeManager Heap Size': 1024
-    },
-    "HDFS": {
-        'NameNode Heap Size': 1024,
-        'SecondaryNameNode Heap Size': 1024,
-        'DataNode Heap Size': 1024
-    },
-    "MapReduce": {
-        'JobHistoryServer Heap Size': 1024
-    },
-    "JobFlow": {
-        'Oozie Heap Size': 1024
-    }
-}
-
-
-# Initialise plugin Hadoop configurations
-PLUGIN_XML_CONFIGS = c_helper.init_xml_configs(XML_CONFS)
-PLUGIN_ENV_CONFIGS = c_helper.init_env_configs(ENV_CONFS)
-
-
-def _init_all_configs():
-    configs = []
-    configs.extend(PLUGIN_XML_CONFIGS)
-    configs.extend(PLUGIN_ENV_CONFIGS)
-    configs.extend(c_helper.PLUGIN_GENERAL_CONFIGS)
-    return configs
-
-
-PLUGIN_CONFIGS = _init_all_configs()
-
-
-def get_plugin_configs():
-    return PLUGIN_CONFIGS
-
-
-def get_xml_configs():
-    return PLUGIN_XML_CONFIGS
-
-
-def get_env_configs():
-    return ENV_CONFS

sahara/plugins/vanilla/v2_4_1/resources/README.rst

@@ -1,29 +0,0 @@
-Apache Hadoop Configurations for Sahara
-========================================
-
-This directory contains default XML configuration files:
-
-* core-default.xml
-* hdfs-default.xml
-* mapred-default.xml
-* yarn-default.xml
-* oozie-default.xml
-* hive-default.xml
-
-These files are applied for Sahara's plugin of Apache Hadoop version 2.4.1 and
-Hive version 0.11.0.
-
-
-Files were taken from here:
-
-* `core-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.1/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml>`_
-* `hdfs-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.1/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml>`_
-* `yarn-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml>`_
-* `mapred-default.xml <https://github.com/apache/hadoop-common/blob/release-2.4.1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml>`_
-* `oozie-default.xml <https://github.com/apache/oozie/blob/release-4.0.1/core/src/main/resources/oozie-default.xml>`_
-* `hive-default.xml <https://github.com/apache/hive/blob/release-0.11.0/conf/hive-default.xml.template>`_
-
-XML configs are used to expose default Hadoop configurations to the users
-through Sahara's REST API. It allows users to override some config values which
-will be pushed to the provisioned VMs running Hadoop services as part of
-appropriate xml config.

sahara/plugins/vanilla/v2_4_1/versionhandler.py

@@ -1,154 +0,0 @@
-# Copyright (c) 2014 Mirantis Inc.
-#
-# 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.
-
-from oslo_config import cfg
-from oslo_log import log as logging
-
-from sahara import conductor
-from sahara import context
-from sahara import exceptions as ex
-from sahara.i18n import _
-from sahara.plugins import utils
-from sahara.plugins.vanilla import abstractversionhandler as avm
-from sahara.plugins.vanilla.hadoop2 import config as c
-from sahara.plugins.vanilla.hadoop2 import edp_engine
-from sahara.plugins.vanilla.hadoop2 import run_scripts as run
-from sahara.plugins.vanilla.hadoop2 import scaling as sc
-from sahara.plugins.vanilla.hadoop2 import validation as vl
-from sahara.plugins.vanilla import utils as vu
-from sahara.plugins.vanilla.v2_4_1 import config_helper as c_helper
-from sahara.utils import proxy
-
-
-conductor = conductor.API
-LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
-
-
-class VersionHandler(avm.AbstractVersionHandler):
-    def __init__(self):
-        self.pctx = {
-            'env_confs': c_helper.get_env_configs(),
-            'all_confs': c_helper.get_plugin_configs()
-        }
-
-    def get_plugin_configs(self):
-        return self.pctx['all_confs']
-
-    def get_node_processes(self):
-        return {
-            "Hadoop": [],
-            "MapReduce": ["historyserver"],
-            "HDFS": ["namenode", "datanode", "secondarynamenode"],
-            "YARN": ["resourcemanager", "nodemanager"],
-            "JobFlow": ["oozie"],
-            "Hive": ["hiveserver"]
-        }
-
-    def validate(self, cluster):
-        raise ex.DeprecatedException(
-            _("The vanilla 2.4.1 plugin is now deprecated and will be removed"
-              " in 2015.2 release. The vanilla 2.6.0 plugin remains and "
-              " continues to be supported."))
-
-    def update_infra(self, cluster):
-        pass
-
-    def configure_cluster(self, cluster):
-        c.configure_cluster(self.pctx, cluster)
-
-    def start_cluster(self, cluster):
-        nn = vu.get_namenode(cluster)
-        run.format_namenode(nn)
-        run.start_hadoop_process(nn, 'namenode')
-
-        for snn in vu.get_secondarynamenodes(cluster):
-            run.start_hadoop_process(snn, 'secondarynamenode')
-
-        rm = vu.get_resourcemanager(cluster)
-        if rm:
-            run.start_yarn_process(rm, 'resourcemanager')
-
-        run.start_dn_nm_processes(utils.get_instances(cluster))
-
-        run.await_datanodes(cluster)
-
-        hs = vu.get_historyserver(cluster)
-        if hs:
-            run.start_historyserver(hs)
-
-        oo = vu.get_oozie(cluster)
-        if oo:
-            run.start_oozie_process(self.pctx, oo)
-
-        hiveserver = vu.get_hiveserver(cluster)
-        if hiveserver:
-            run.start_hiveserver_process(self.pctx, hiveserver)
-
-        self._set_cluster_info(cluster)
-
-    def decommission_nodes(self, cluster, instances):
-        sc.decommission_nodes(self.pctx, cluster, instances)
-
-    def validate_scaling(self, cluster, existing, additional):
-        vl.validate_additional_ng_scaling(cluster, additional)
-        vl.validate_existing_ng_scaling(self.pctx, cluster, existing)
-
-    def scale_cluster(self, cluster, instances):
-        sc.scale_cluster(self.pctx, cluster, instances)
-
-    def _set_cluster_info(self, cluster):
-        nn = vu.get_namenode(cluster)
-        rm = vu.get_resourcemanager(cluster)
-        hs = vu.get_historyserver(cluster)
-        oo = vu.get_oozie(cluster)
-
-        info = {}
-
-        if rm:
-            info['YARN'] = {
-                'Web UI': 'http://%s:%s' % (rm.management_ip, '8088'),
-                'ResourceManager': 'http://%s:%s' % (rm.management_ip, '8032')
-            }
-
-        if nn:
-            info['HDFS'] = {
-                'Web UI': 'http://%s:%s' % (nn.management_ip, '50070'),
-                'NameNode': 'hdfs://%s:%s' % (nn.hostname(), '9000')
-            }
-
-        if oo:
-            info['JobFlow'] = {
-                'Oozie': 'http://%s:%s' % (oo.management_ip, '11000')
-            }
-
-        if hs:
-            info['MapReduce JobHistory Server'] = {
-                'Web UI': 'http://%s:%s' % (hs.management_ip, '19888')
-            }
-
-        ctx = context.ctx()
-        conductor.cluster_update(ctx, cluster, {'info': info})
-
-    def get_edp_engine(self, cluster, job_type):
-        if job_type in edp_engine.EdpOozieEngine.get_supported_job_types():
-            return edp_engine.EdpOozieEngine(cluster)
-        return None
-
-    def get_open_ports(self, node_group):
-        return c.get_open_ports(node_group)
-
-    def on_terminate_cluster(self, cluster):
-        proxy.delete_proxy_user_for_cluster(cluster)

sahara/tests/scenario_unit/vanilla2_6_0.yaml

@@ -56,7 +56,7 @@ edp_jobs_flow:
         - type: Java
           additional_libs:
               - type: database
-                source: etc/edp-examples/hadoop2/edp-java/hadoop-mapreduce-examples-2.4.1.jar
+                source: etc/edp-examples/hadoop2/edp-java/hadoop-mapreduce-examples-2.6.0.jar
           configs:
               edp.java.main_class: org.apache.hadoop.examples.QuasiMonteCarlo
           args:

sahara/tests/scenario_unit/vanilla2_6_0.yaml.mako

@@ -57,7 +57,7 @@ edp_jobs_flow:
         - type: Java
           additional_libs:
               - type: database
-                source: etc/edp-examples/hadoop2/edp-java/hadoop-mapreduce-examples-2.4.1.jar
+                source: etc/edp-examples/hadoop2/edp-java/hadoop-mapreduce-examples-2.6.0.jar
           configs:
               edp.java.main_class: org.apache.hadoop.examples.QuasiMonteCarlo
           args:

sahara/tests/unit/plugins/vanilla/hadoop2/test_plugin.py

@@ -32,7 +32,7 @@ class VanillaPluginTest(base.SaharaWithDbTestCase):
 
     @mock.patch('sahara.service.edp.hdfs_helper.create_dir_hadoop2')
     def test_edp_calls_hadoop2_create_dir(self, create_dir):
-        for version in ['2.4.1']:
+        for version in ['2.6.0']:
             cluster_dict = {
                 'name': 'cluster' + version.replace('.', '_'),
                 'plugin_name': 'vanilla',