Update Cirros to 0.6.1

[functest.git] / functest / core / tenantnetwork.py

diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py
index b4818d7..3670dbe 100644 (file)
--- a/functest/core/tenantnetwork.py
+++ b/functest/core/tenantnetwork.py
@@ -61,13 +61,12 @@ class NewProject():
             name_or_id=self.orig_cloud.auth.get(
                 "project_domain_name", "Default"))
         self.project = self.orig_cloud.create_project(
-            name='{}-project_{}'.format(self.case_name[:18], self.guid),
-            description="Created by OPNFV Functest: {}".format(
-                self.case_name),
+            name=f'{self.case_name[:18]}-project_{self.guid}',
+            description=f"Created by OPNFV Functest: {self.case_name}",
             domain_id=self.domain.id)
         self.__logger.debug("project: %s", self.project)
         self.user = self.orig_cloud.create_user(
-            name='{}-user_{}'.format(self.case_name, self.guid),
+            name=f'{self.case_name}-user_{self.guid}',
             password=self.password,
             domain_id=self.domain.id)
         self.__logger.debug("user: %s", self.user)
@@ -77,7 +76,7 @@ class NewProject():
             elif self.orig_cloud.get_role(self.default_member.lower()):
                 self.role_name = self.default_member.lower()
             else:
-                raise Exception("Cannot detect {}".format(self.default_member))
+                raise Exception(f"Cannot detect {self.default_member}")
         except Exception:  # pylint: disable=broad-except
             self.__logger.info("Creating default role %s", self.default_member)
             role = self.orig_cloud.create_role(self.default_member)
@@ -146,29 +145,28 @@ class TenantNetwork1(testcase.TestCase):
     __logger = logging.getLogger(__name__)
     cidr = '192.168.120.0/24'
     shared_network = False
-    allow_no_fip = False
 
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'tenantnetwork1'
-        super(TenantNetwork1, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dir_results = os.path.join(getattr(config.CONF, 'dir_results'))
         self.res_dir = os.path.join(self.dir_results, self.case_name)
         self.output_log_name = 'functest.log'
         self.output_debug_log_name = 'functest.debug.log'
+        self.ext_net = None
         try:
             cloud_config = os_client_config.get_config()
             self.cloud = self.orig_cloud = shade.OpenStackCloud(
                 cloud_config=cloud_config)
         except Exception:  # pylint: disable=broad-except
             self.cloud = self.orig_cloud = None
-            self.ext_net = None
             self.__logger.exception("Cannot connect to Cloud")
-        try:
-            self.ext_net = self.get_external_network(self.cloud)
-        except Exception:  # pylint: disable=broad-except
-            self.ext_net = None
-            self.__logger.exception("Cannot get the external network")
+        if env.get('NO_TENANT_NETWORK').lower() != 'true':
+            try:
+                self.ext_net = self.get_external_network(self.cloud)
+            except Exception:  # pylint: disable=broad-except
+                self.__logger.exception("Cannot get the external network")
         self.guid = str(uuid.uuid4())
         self.network = None
         self.subnet = None
@@ -220,18 +218,18 @@ class TenantNetwork1(testcase.TestCase):
         Raises: expection on error
         """
         assert self.cloud
-        if not self.allow_no_fip:
+        if env.get('NO_TENANT_NETWORK').lower() != 'true':
             assert self.ext_net
         provider = {}
-        if hasattr(config.CONF, '{}_network_type'.format(self.case_name)):
+        if hasattr(config.CONF, f'{self.case_name}_network_type'):
             provider["network_type"] = getattr(
-                config.CONF, '{}_network_type'.format(self.case_name))
-        if hasattr(config.CONF, '{}_physical_network'.format(self.case_name)):
+                config.CONF, f'{self.case_name}_network_type')
+        if hasattr(config.CONF, f'{self.case_name}_physical_network'):
             provider["physical_network"] = getattr(
-                config.CONF, '{}_physical_network'.format(self.case_name))
-        if hasattr(config.CONF, '{}_segmentation_id'.format(self.case_name)):
+                config.CONF, f'{self.case_name}_physical_network')
+        if hasattr(config.CONF, f'{self.case_name}_segmentation_id'):
             provider["segmentation_id"] = getattr(
-                config.CONF, '{}_segmentation_id'.format(self.case_name))
+                config.CONF, f'{self.case_name}_segmentation_id')
         domain = self.orig_cloud.get_domain(
             name_or_id=self.orig_cloud.auth.get(
                 "project_domain_name", "Default"))
@@ -239,23 +237,23 @@ class TenantNetwork1(testcase.TestCase):
             self.cloud.auth['project_name'],
             domain_id=domain.id)
         self.network = self.orig_cloud.create_network(
-            '{}-net_{}'.format(self.case_name, self.guid),
+            f'{self.case_name}-net_{self.guid}',
             provider=provider, project_id=project.id,
             shared=self.shared_network)
         self.__logger.debug("network: %s", self.network)
 
         self.subnet = self.cloud.create_subnet(
             self.network.id,
-            subnet_name='{}-subnet_{}'.format(self.case_name, self.guid),
+            subnet_name=f'{self.case_name}-subnet_{self.guid}',
             cidr=getattr(
-                config.CONF, '{}_private_subnet_cidr'.format(self.case_name),
+                config.CONF, f'{self.case_name}_private_subnet_cidr',
                 self.cidr),
             enable_dhcp=True,
             dns_nameservers=[env.get('NAMESERVER')])
         self.__logger.debug("subnet: %s", self.subnet)
 
         self.router = self.cloud.create_router(
-            name='{}-router_{}'.format(self.case_name, self.guid),
+            name=f'{self.case_name}-router_{self.guid}',
             ext_gateway_net_id=self.ext_net.id if self.ext_net else None)
         self.__logger.debug("router: %s", self.router)
         self.cloud.add_router_interface(self.router, subnet_id=self.subnet.id)
@@ -265,7 +263,8 @@ class TenantNetwork1(testcase.TestCase):
         try:
             assert self.cloud
             self.start_time = time.time()
-            self.create_network_resources()
+            if env.get('NO_TENANT_NETWORK').lower() != 'true':
+                self.create_network_resources()
             self.result = 100
             status = testcase.TestCase.EX_OK
         except Exception:  # pylint: disable=broad-except
@@ -306,7 +305,7 @@ class TenantNetwork2(TenantNetwork1):
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'tenantnetwork2'
-        super(TenantNetwork2, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         try:
             assert self.cloud
             self.project = NewProject(
@@ -320,7 +319,7 @@ class TenantNetwork2(TenantNetwork1):
 
     def clean(self):
         try:
-            super(TenantNetwork2, self).clean()
+            super().clean()
             assert self.project
             self.project.clean()
         except Exception:  # pylint: disable=broad-except