From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 25 Feb 2019 18:39:08 +0000 (+0100)
Subject: Remove useless vyos_vrouter output dir
X-Git-Tag: opnfv-8.1.0~47
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7b5b39e10089c47f4fb85bc745e138138c42d300;p=functest.git
Remove useless vyos_vrouter output dir
It doesn't store any file.
Change-Id: I94801508a11edb8f0bbff7e4319c4d50411ec715
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 9262d3c0ee23aa5b79dbf790162134acccb5c42b)
---
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index ff26f55f1..aaaeba0f7 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -215,8 +215,7 @@ class CloudifyVrouter(cloudify.Cloudify):
def test_vnf(self):
start_time = time.time()
- testing = vrouter_base.VrouterOnBoardingBase(
- self.case_name, self.util, self.util_info)
+ testing = vrouter_base.VrouterOnBoardingBase(self.util, self.util_info)
result, test_result_data = testing.test_vnf()
duration = time.time() - start_time
if result:
diff --git a/functest/opnfv_tests/vnf/router/vrouter_base.py b/functest/opnfv_tests/vnf/router/vrouter_base.py
index e8a933ff5..8cfab341e 100644
--- a/functest/opnfv_tests/vnf/router/vrouter_base.py
+++ b/functest/opnfv_tests/vnf/router/vrouter_base.py
@@ -19,7 +19,6 @@ import time
import pkg_resources
-from functest.utils import config
from functest.opnfv_tests.vnf.router.test_controller import function_test_exec
__author__ = "Shuya Nakama <shuya.nakama@okinawaopenlabs.org>"
@@ -28,19 +27,14 @@ __author__ = "Shuya Nakama <shuya.nakama@okinawaopenlabs.org>"
class VrouterOnBoardingBase(object):
"""vrouter testing base class"""
- def __init__(self, case_name, util, util_info):
+ def __init__(self, util, util_info):
self.logger = logging.getLogger(__name__)
self.case_dir = pkg_resources.resource_filename(
'functest', 'opnfv_tests/vnf/router')
- self.result_dir = os.path.join(
- getattr(config.CONF, 'dir_results'), case_name)
self.util = util
self.util_info = util_info
self.vnf_list = []
- if not os.path.exists(self.result_dir):
- os.makedirs(self.result_dir)
-
def test_vnf(self):
"""vrouter test execution"""
result = False