Merge "Make tight the way an instance is considered as UP"

[sdnvpn.git] / sdnvpn / lib / config.py

diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py
index 4fd40ed..c3f6b22 100644 (file)
--- a/sdnvpn/lib/config.py
+++ b/sdnvpn/lib/config.py
@@ -8,13 +8,13 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 import yaml
-import os
+import logging
+import pkg_resources
 
 from functest.utils.constants import CONST
-import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 
-logger = ft_logger.Logger("sndvpn_test_config").getLogger()
+logger = logging.getLogger('sdnvpn_test_config')
 
 
 class CommonConfig(object):
@@ -22,22 +22,20 @@ class CommonConfig(object):
     Common configuration parameters across testcases
     """
     def __init__(self):
-        self.repo_path = CONST.dir_repo_sdnvpn
-        self.config_file = os.path.join(self.repo_path,
-                                        'sdnvpn/test/functest/config.yaml')
-        self.keyfile_path = os.path.join(self.repo_path,
-                                         'sdnvpn/artifacts/id_rsa')
+        self.config_file = pkg_resources.resource_filename(
+            'sdnvpn', 'test/functest/config.yaml')
+        self.keyfile_path = pkg_resources.resource_filename(
+            'sdnvpn', 'artifacts/id_rsa')
         self.test_db = CONST.results_test_db_url
-        self.quagga_setup_script_path = os.path.join(
-            self.repo_path,
-            "sdnvpn/artifacts/quagga_setup.sh")
+        self.quagga_setup_script_path = pkg_resources.resource_filename(
+            'sdnvpn', 'artifacts/quagga_setup.sh')
         self.line_length = 90  # length for the summary table
         self.vm_boot_timeout = 180
         self.default_flavor = ft_utils.get_parameter_from_yaml(
             "defaults.flavor", self.config_file)
         self.image_filename = CONST.openstack_image_file_name
         self.image_format = CONST.openstack_image_disk_format
-        self.image_path = '{0}/{1}'.format(CONST.dir_functest_data,
+        self.image_path = '{0}/{1}'.format(CONST.dir_functest_images,
                                            self.image_filename)
         # This is the ubuntu image used by sfc
         # Basically vanilla ubuntu + some scripts in there
@@ -45,8 +43,12 @@ class CommonConfig(object):
         # TODO does functest have an ubuntu image somewhere?
         self.ubuntu_image_name = "sdnvpn-ubuntu"
         self.ubuntu_image_path = '{0}/{1}'.format(
-            CONST.dir_functest_data,
+            CONST.dir_functest_images,
             "ubuntu-16.04-server-cloudimg-amd64-disk1.img")
+        self.custom_flavor_name = 'm1.custom'
+        self.custom_flavor_ram = 1024
+        self.custom_flavor_disk = 10
+        self.custom_flavor_vcpus = 1
 
 
 class TestcaseConfig(object):