From f60d2c645cfcb209041234fe33a40ccc59eb4196 Mon Sep 17 00:00:00 2001 From: Vitaly Gridnev Date: Wed, 1 Feb 2017 13:39:52 +0400 Subject: [PATCH] [sahara] provide default version of hadoop version this version is the only currently available version in vanilla plugin. Change-Id: I58cd0aa6165e58b694a43d7f3314030433f160e5 Closes-bug: 1634523 --- fuel_health/tests/sanity/test_sanity_sahara.py | 2 +- fuel_health/tests/tests_platform/test_ceilometer.py | 2 +- fuel_health/tests/tests_platform/test_sahara.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fuel_health/tests/sanity/test_sanity_sahara.py b/fuel_health/tests/sanity/test_sanity_sahara.py index 4e3f003d..97441c18 100644 --- a/fuel_health/tests/sanity/test_sanity_sahara.py +++ b/fuel_health/tests/sanity/test_sanity_sahara.py @@ -61,7 +61,7 @@ class VanillaTwoTemplatesTest(SaharaTemplatesTest): } self._plugin_name = 'vanilla' self._hadoop_version = mapping_versions_of_plugin.get( - self.config.fuel.fuel_version) + self.config.fuel.fuel_version, "2.7.1") self._node_processes = ['resourcemanager', 'namenode', 'secondarynamenode', 'oozie', 'historyserver', 'nodemanager', 'datanode'] diff --git a/fuel_health/tests/tests_platform/test_ceilometer.py b/fuel_health/tests/tests_platform/test_ceilometer.py index 3459cd60..6535800e 100644 --- a/fuel_health/tests/tests_platform/test_ceilometer.py +++ b/fuel_health/tests/tests_platform/test_ceilometer.py @@ -529,7 +529,7 @@ class CeilometerApiPlatformTests(ceilometermanager.CeilometerBaseTest): "10.0": "2.7.1" } hadoop_version = mapping_versions_of_plugin.get( - self.config.fuel.fuel_version) + self.config.fuel.fuel_version, "2.7.1") fail_msg = 'Failed to find correctly registered Sahara image.' msg = 'finding correctly registered Sahara image' diff --git a/fuel_health/tests/tests_platform/test_sahara.py b/fuel_health/tests/tests_platform/test_sahara.py index 9f8f54ec..9ae5fa17 100644 --- a/fuel_health/tests/tests_platform/test_sahara.py +++ b/fuel_health/tests/tests_platform/test_sahara.py @@ -101,7 +101,7 @@ class VanillaTwoClusterTest(SaharaClusterTest): } self._plugin_name = 'vanilla' self._hadoop_version = mapping_versions_of_plugin.get( - self.config.fuel.fuel_version) + self.config.fuel.fuel_version, "2.7.1") self._worker_processes = ['nodemanager', 'datanode'] self._master_processes = ['resourcemanager', 'namenode', 'oozie', 'historyserver', 'secondarynamenode']