Remove useless vyos_vrouter output dir

[functest.git] / functest / opnfv_tests / vnf / router / vrouter_base.py

diff --git a/functest/opnfv_tests/vnf/router/vrouter_base.py b/functest/opnfv_tests/vnf/router/vrouter_base.py
index a534f1f..8cfab34 100644 (file)
--- a/functest/opnfv_tests/vnf/router/vrouter_base.py
+++ b/functest/opnfv_tests/vnf/router/vrouter_base.py
@@ -7,46 +7,34 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+# pylint: disable=missing-docstring
+
 """vrouter testing base class module"""
 
 import datetime
 import json
 import logging
 import os
-import pkg_resources
 import time
 
-import functest.core.vnf as vnf
-from functest.utils.constants import CONST
+import pkg_resources
+
 from functest.opnfv_tests.vnf.router.test_controller import function_test_exec
-from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf
 
 __author__ = "Shuya Nakama <shuya.nakama@okinawaopenlabs.org>"
 
-REBOOT_WAIT = 30
 
-
-class VrouterOnBoardingBase(vnf.VnfOnBoarding):
+class VrouterOnBoardingBase(object):
     """vrouter testing base class"""
 
-    def __init__(self, **kwargs):
+    def __init__(self, util, util_info):
         self.logger = logging.getLogger(__name__)
-        super(VrouterOnBoardingBase, self).__init__(**kwargs)
         self.case_dir = pkg_resources.resource_filename(
             'functest', 'opnfv_tests/vnf/router')
-        self.data_dir = CONST.__getattribute__('dir_router_data')
-        self.result_dir = os.path.join(CONST.__getattribute__('dir_results'),
-                                       self.case_name)
-        self.util = Utilvnf()
-        self.util_info = {}
-
+        self.util = util
+        self.util_info = util_info
         self.vnf_list = []
 
-        if not os.path.exists(self.data_dir):
-            os.makedirs(self.data_dir)
-        if not os.path.exists(self.result_dir):
-            os.makedirs(self.result_dir)
-
     def test_vnf(self):
         """vrouter test execution"""
         result = False
@@ -62,12 +50,11 @@ class VrouterOnBoardingBase(vnf.VnfOnBoarding):
                     test_list = function_test["test_list"]
                     target_vnf_name = function_test["target_vnf_name"]
                     for test_info in test_list:
-                        self.logger.info(test_info["protocol"] + " " +
-                                         test_info["test_kind"] +
-                                         " test.")
+                        self.logger.info(
+                            "%s %s test.", test_info["protocol"],
+                            test_info["test_kind"])
                         (result, result_data) = self.function_test_vrouter(
-                                                    target_vnf_name,
-                                                    test_info)
+                            target_vnf_name, test_info)
                         test_result_data_list.append(result_data)
                         if not result:
                             break
@@ -87,10 +74,6 @@ class VrouterOnBoardingBase(vnf.VnfOnBoarding):
         vnf_info_list = self.get_vnf_info_list(target_vnf_name)
         self.vnf_list = vnf_info_list
 
-        self.logger.debug("request vnf's reboot.")
-        self.util.request_vnf_reboot(vnf_info_list)
-        time.sleep(REBOOT_WAIT)
-
         target_vnf = self.util.get_target_vnf(vnf_info_list)
 
         reference_vnf_list = self.util.get_reference_vnf_list(vnf_info_list)
@@ -115,5 +98,7 @@ class VrouterOnBoardingBase(vnf.VnfOnBoarding):
         return result, test_result_data
 
     def get_vnf_info_list(self, target_vnf_name):
-        vnf_info_list = []
-        return vnf_info_list
+        return self.util.get_vnf_info_list(
+            self.util_info["cfy_manager_ip"],
+            self.util_info["deployment_name"],
+            target_vnf_name)