commit 6189b0a69505a3a97fc559113694b3b5a6816257
author Telles Nobrega <tellesmvn@lsd.ufcg.edu.br> Tue Nov 18 23:22:17 2014 -0300
committer Yaroslav Lobankov <ylobankov@mirantis.com> Mon Sep 28 13:19:09 2015 +0300
tree ac05bca47bc56744df47cbb8ce61699b88a5bbc9
parent eb00616ecafdcdc63f122c3298737d1ae5cd136b

Replacing data_processing with data-processing

Changing data_processing with data-processing where needed to match the
new defined endpoint of Sahara.

Co-Authored-By: Sergey Reshetnyak <sreshetniak@mirantis.com>
Co-Authored-By: Yaroslav Lobankov <ylobankov@mirantis.com>

Closes-Bug: #1356053

Change-Id: Iba45c15ed57d43a11e6fac74d75d6b2db46f6a2f

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 3d3ddff..7b844e7 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -898,29 +898,32 @@
 ]
 
 
-data_processing_group = cfg.OptGroup(name="data_processing",
+data_processing_group = cfg.OptGroup(name="data-processing",
                                      title="Data Processing options")
 
 DataProcessingGroup = [
     cfg.StrOpt('catalog_type',
-               default='data_processing',
+               default='data-processing',
+               deprecated_group="data_processing",
                help="Catalog type of the data processing service."),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
                choices=['public', 'admin', 'internal',
                         'publicURL', 'adminURL', 'internalURL'],
+               deprecated_group="data_processing",
                help="The endpoint type to use for the data processing "
                     "service."),
 ]
 
 
 data_processing_feature_group = cfg.OptGroup(
-    name="data_processing-feature-enabled",
+    name="data-processing-feature-enabled",
     title="Enabled Data Processing features")
 
 DataProcessingFeaturesGroup = [
     cfg.ListOpt('plugins',
                 default=["vanilla", "hdp"],
+                deprecated_group="data_processing-feature-enabled",
                 help="List of enabled data processing plugins")
 ]
 
@@ -1298,9 +1301,9 @@
         self.telemetry = _CONF.telemetry
         self.telemetry_feature_enabled = _CONF['telemetry-feature-enabled']
         self.dashboard = _CONF.dashboard
-        self.data_processing = _CONF.data_processing
+        self.data_processing = _CONF['data-processing']
         self.data_processing_feature_enabled = _CONF[
-            'data_processing-feature-enabled']
+            'data-processing-feature-enabled']
         self.boto = _CONF.boto
         self.stress = _CONF.stress
         self.scenario = _CONF.scenario