diff --git a/tcp_tests/managers/common_services_manager.py b/tcp_tests/managers/common_services_manager.py
index 7735f9a..a91eb46 100644
--- a/tcp_tests/managers/common_services_manager.py
+++ b/tcp_tests/managers/common_services_manager.py
@@ -26,4 +26,4 @@
     def install(self, commands):
         self.__underlay.execute_commands(commands,
                                          label='Install common services')
-        self.__config.common_services.installed = True
+        self.__config.common_services.common_services_installed = True
diff --git a/tcp_tests/managers/opencontrail_manager.py b/tcp_tests/managers/opencontrail_manager.py
new file mode 100644
index 0000000..3c6621c
--- /dev/null
+++ b/tcp_tests/managers/opencontrail_manager.py
@@ -0,0 +1,49 @@
+#    Copyright 2016 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.
+
+class OpenContrailManager(object):
+    """docstring for OpenstackManager"""
+
+    __config = None
+    __underlay = None
+    __openstack_actions = None
+
+    def __init__(self, config, underlay, openstack_deployed):
+        self.__config = config
+        self.__underlay = underlay
+        self.__openstack_actions = openstack_deployed
+        super(OpenContrailManager, self).__init__()
+
+    def prepare_tests(commands):
+        self.__underlay.execute_commands(commands=commands,
+                                         label="Prepare Juniper contrail-test")
+
+    def run_tests(tags='', features=''):
+        cmd = "salt 'ctl01*' grains.get fqdn|tail -n1"
+        result = self.__underlay.check_call(
+            cmd, host=self.__config.salt.salt_master_host)
+
+        ctl01_name = result['stdout'].strip()
+
+
+        cmd = '. /etc/contrail/openstackrc; cd /opt/contrail-test; ./run_tests.sh'
+        if tags != '':
+            cmd += ' --tags ' + tags
+
+        if features != '':
+            cmd += ' --features ' + features
+
+        self.__underlay.check_call(
+            cmd,
+            node_name=ctl01_name)
diff --git a/tcp_tests/managers/openstack_manager.py b/tcp_tests/managers/openstack_manager.py
index 785f100..b8725bd 100644
--- a/tcp_tests/managers/openstack_manager.py
+++ b/tcp_tests/managers/openstack_manager.py
@@ -26,4 +26,4 @@
     def install(self, commands):
         self.__underlay.execute_commands(commands=commands,
                                          label="Install OpenStack services")
-        self.__config.openstack.installed = True
+        self.__config.openstack.openstack_installed = True