diff --git a/tempest/clients.py b/tempest/clients.py
index e22b1ec..eeffe2a 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -108,6 +108,7 @@
     TenantUsagesClientXML
 from tempest.services.compute.xml.volumes_extensions_client import \
     VolumesExtensionsClientXML
+from tempest.services.data_processing.v1_1.client import DataProcessingClient
 from tempest.services.identity.json.identity_client import IdentityClientJSON
 from tempest.services.identity.json.identity_client import TokenClientJSON
 from tempest.services.identity.v3.json.credentials_client import \
@@ -338,6 +339,7 @@
         self.custom_object_client = ObjectClientCustomizedHeader(*client_args)
         self.custom_account_client = \
             AccountClientCustomizedHeader(*client_args)
+        self.data_processing_client = DataProcessingClient(*client_args)
 
 
 class AltManager(Manager):
diff --git a/tempest/services/data_processing/__init__.py b/tempest/services/data_processing/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tempest/services/data_processing/__init__.py
diff --git a/tempest/services/data_processing/v1_1/__init__.py b/tempest/services/data_processing/v1_1/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tempest/services/data_processing/v1_1/__init__.py
diff --git a/tempest/services/data_processing/v1_1/client.py b/tempest/services/data_processing/v1_1/client.py
new file mode 100644
index 0000000..bd147e8
--- /dev/null
+++ b/tempest/services/data_processing/v1_1/client.py
@@ -0,0 +1,77 @@
+# Copyright (c) 2013 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.
+
+import json
+
+from tempest.common import rest_client
+
+
+class DataProcessingClient(rest_client.RestClient):
+    def __init__(self, config, username, password, auth_url, tenant_name=None):
+        super(DataProcessingClient, self).__init__(config, username, password,
+                                                   auth_url, tenant_name)
+        self.service = self.config.data_processing.catalog_type
+
+    @classmethod
+    def _request_and_parse(cls, req_fun, uri, res_name, *args, **kwargs):
+        """Make a request using specified req_fun and parse response.
+
+        It returns pair: resp and parsed resource(s) body.
+        """
+
+        resp, body = req_fun(uri, headers={
+            'Content-Type': 'application/json'
+        }, *args, **kwargs)
+        body = json.loads(body)
+        return resp, body[res_name]
+
+    def list_node_group_templates(self):
+        """List all node group templates for a user."""
+
+        uri = 'node-group-templates'
+        return self._request_and_parse(self.get, uri, 'node_group_templates')
+
+    def get_node_group_template(self, tmpl_id):
+        """Returns the details of a single node group template."""
+
+        uri = "node-group-templates/%s" % tmpl_id
+        return self._request_and_parse(self.get, uri, 'node_group_template')
+
+    def create_node_group_template(self, name, plugin_name, hadoop_version,
+                                   node_processes, flavor_id,
+                                   node_configs=None, **kwargs):
+        """Creates node group template with specified params.
+
+        It supports passing additional params using kwargs and returns created
+        object.
+        """
+        uri = "node-group-templates"
+        body = kwargs.copy()
+        body.update({
+            'name': name,
+            'plugin_name': plugin_name,
+            'hadoop_version': hadoop_version,
+            'node_processes': node_processes,
+            'flavor_id': flavor_id,
+            'node_configs': node_configs or dict(),
+        })
+        return self._request_and_parse(self.post, uri, 'node_group_template',
+                                       body=json.dumps(body))
+
+    def delete_node_group_template(self, tmpl_id):
+        """Deletes the specified node group template by id."""
+
+        uri = "node-group-templates/%s" % tmpl_id
+        return self.delete(uri)
