Merge "Update and enable Cloudify-based testcases"

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

diff --git a/functest/opnfv_tests/vnf/router/utilvnf.py b/functest/opnfv_tests/vnf/router/utilvnf.py
index 4bb277a..a54f6cb 100644 (file)
--- a/functest/opnfv_tests/vnf/router/utilvnf.py
+++ b/functest/opnfv_tests/vnf/router/utilvnf.py
@@ -14,12 +14,9 @@
 import json
 import logging
 import os
-import pkg_resources
 import requests
 import yaml
 
-from git import Repo
-
 from functest.utils import config
 
 RESULT_SPRIT_INDEX = {
@@ -53,14 +50,12 @@ class Utilvnf(object):  # pylint: disable=too-many-instance-attributes
 
     def __init__(self):
         self.vnf_data_dir = getattr(config.CONF, 'dir_router_data')
-        self.opnfv_vnf_data_dir = "opnfv-vnf-data/"
         self.command_template_dir = "command_template/"
         self.test_scenario_yaml = "test_scenario.yaml"
         test_env_config_yaml_file = "test_env_config.yaml"
         self.test_cmd_map_yaml_file = "test_cmd_map.yaml"
         self.test_env_config_yaml = os.path.join(
             self.vnf_data_dir,
-            self.opnfv_vnf_data_dir,
             test_env_config_yaml_file)
 
         self.blueprint_dir = "opnfv-vnf-vyos-blueprint/"
@@ -69,28 +64,6 @@ class Utilvnf(object):  # pylint: disable=too-many-instance-attributes
         if not os.path.exists(self.vnf_data_dir):
             os.makedirs(self.vnf_data_dir)
 
-        case_dir = pkg_resources.resource_filename(
-            'functest', 'opnfv_tests/vnf/router')
-
-        config_file_name = getattr(
-            config.CONF, 'vnf_{}_config'.format("vyos_vrouter"))
-
-        config_file = os.path.join(case_dir, config_file_name)
-
-        with open(config_file) as file_fd:
-            vrouter_config_yaml = yaml.safe_load(file_fd)
-        file_fd.close()
-
-        test_data = vrouter_config_yaml.get("test_data")
-
-        self.logger.debug("Downloading the test data.")
-        vrouter_data_path = self.vnf_data_dir + self.opnfv_vnf_data_dir
-
-        if not os.path.exists(vrouter_data_path):
-            Repo.clone_from(test_data['url'],
-                            vrouter_data_path,
-                            branch=test_data['branch'])
-
         with open(self.test_env_config_yaml) as file_fd:
             test_env_config_yaml = yaml.safe_load(file_fd)
         file_fd.close()