Return private vars
diff --git a/tcp_tests/managers/opencontrail_manager.py b/tcp_tests/managers/opencontrail_manager.py
index 108794d..1bb7f43 100644
--- a/tcp_tests/managers/opencontrail_manager.py
+++ b/tcp_tests/managers/opencontrail_manager.py
@@ -18,15 +18,16 @@
class OpenContrailManager(ExecuteCommandsMixin):
"""docstring for OpenstackManager"""
- _config = None
- _underlay = None
+ __config = None
+ __underlay = None
_openstack_actions = None
def __init__(self, config, underlay, openstack_deployed):
- self._config = config
- self._underlay = underlay
+ self.__config = config
+ self.__underlay = underlay
self._openstack_actions = openstack_deployed
- super(OpenContrailManager, self).__init__()
+ super(OpenContrailManager, self).__init__(
+ config=config, underlay=underlay)
def prepare_tests(self, commands):
self.execute_commands(commands=commands,
@@ -34,18 +35,19 @@
def run_tests(self, tags='', features=''):
cmd = "salt 'ctl01*' grains.get fqdn|tail -n1"
- result = self._underlay.check_call(
- cmd, host=self._config.salt.salt_master_host)
+ 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'
+ 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(
+ self.__underlay.check_call(
cmd,
node_name=ctl01_name)