diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-04-23 16:49:55 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-04-24 20:25:14 +0200 |
commit | 9dcc30874194382a25c66baf359b863c6e013caf (patch) | |
tree | 421fa4ee80964f775fc1d0c0008e0afaf1ebe8ea /functest/opnfv_tests/openstack | |
parent | b9048a25355e1d6c29c84ca10a3d859841468f50 (diff) |
Refactor modules to avoid duplicated code
It also increases number of lines to warm about duplicated codes.
Change-Id: I3914da8a90cbfe8fd024e9944c3adc8a617330d3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack')
-rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 13 | ||||
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 13 |
2 files changed, 2 insertions, 24 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 1f56e168c..3e1a2e78c 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -644,18 +644,7 @@ class RallyBase(singlevm.VmReady2): try: assert super(RallyBase, self).run( **kwargs) == testcase.TestCase.EX_OK - environ = dict( - os.environ, - OS_USERNAME=self.project.user.name, - OS_PROJECT_NAME=self.project.project.name, - OS_PROJECT_ID=self.project.project.id, - OS_PASSWORD=self.project.password) - try: - del environ['OS_TENANT_NAME'] - del environ['OS_TENANT_ID'] - except Exception: # pylint: disable=broad-except - pass - self.create_rally_deployment(environ=environ) + self.create_rally_deployment(environ=self.project.get_environ()) self.prepare_run(**kwargs) self.run_tests(**kwargs) self._generate_report() diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 894b6e2b3..0874e6d61 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -577,19 +577,8 @@ class TempestCommon(singlevm.VmReady2): """ if not os.path.exists(self.res_dir): os.makedirs(self.res_dir) - environ = dict( - os.environ, - OS_USERNAME=self.project.user.name, - OS_PROJECT_NAME=self.project.project.name, - OS_PROJECT_ID=self.project.project.id, - OS_PASSWORD=self.project.password) - try: - del environ['OS_TENANT_NAME'] - del environ['OS_TENANT_ID'] - except Exception: # pylint: disable=broad-except - pass self.deployment_id = rally.RallyBase.create_rally_deployment( - environ=environ) + environ=self.project.get_environ()) if not self.deployment_id: raise Exception("Deployment create failed") self.verifier_id = self.create_verifier() |