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:34:56 +0200 |
commit | 66440f5d971ee83f4eec7a174d10159aa25c5767 (patch) | |
tree | 15d39e92a4c2df08effa76842a02cb633bf99ca3 /functest/opnfv_tests/openstack/rally | |
parent | ef9f38c1061a08fd70bbba4b4cda68e99d945cbf (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>
(cherry picked from commit 9dcc30874194382a25c66baf359b863c6e013caf)
Diffstat (limited to 'functest/opnfv_tests/openstack/rally')
-rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 13 |
1 files changed, 1 insertions, 12 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() |