summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-08-19 12:43:11 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-19 12:44:41 +0200
commita87bbcb1fe325be52b70428baf08ec6b8198a946 (patch)
treec8688c684bf4c86dd8ca69c4fb1cc950f4585f65
parent8eac5dbbadc42122dea6c82edf14fdb4481c5e63 (diff)
Typos (ressources)
Change-Id: Ifcf1d4bd48b64bc9175c3b0d594f897f4f3f5e7d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 873e5f5c868027d34f36d494719b4dad2bdb1e7d)
-rw-r--r--functest/core/singlevm.py14
-rw-r--r--functest/core/tenantnetwork.py14
2 files changed, 14 insertions, 14 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index 500a44b59..78f8ab9d0 100644
--- a/functest/core/singlevm.py
+++ b/functest/core/singlevm.py
@@ -9,7 +9,7 @@
"""Ease deploying a single VM reachable via ssh
-It offers a simple way to create all tenant network ressources + a VM for
+It offers a simple way to create all tenant network resources + a VM for
advanced testcases (e.g. deploying an orchestrator).
"""
@@ -257,14 +257,14 @@ class VmReady1(tenantnetwork.TenantNetwork1):
if self.flavor:
self.orig_cloud.delete_flavor(self.flavor.id)
except Exception: # pylint: disable=broad-except
- self.__logger.exception("Cannot clean all ressources")
+ self.__logger.exception("Cannot clean all resources")
class VmReady2(VmReady1):
"""Deploy a single VM reachable via ssh (scenario2)
It creates new user/project before creating and configuring all tenant
- network ressources, flavors, images, etc. required by advanced testcases.
+ network resources, flavors, images, etc. required by advanced testcases.
It ensures that all testcases inheriting from SingleVm2 could work
without specific configurations (or at least read the same config data).
@@ -293,7 +293,7 @@ class VmReady2(VmReady1):
assert self.project
self.project.clean()
except Exception: # pylint: disable=broad-except
- self.__logger.exception("Cannot clean all ressources")
+ self.__logger.exception("Cannot clean all resources")
class SingleVm1(VmReady1):
@@ -449,14 +449,14 @@ class SingleVm1(VmReady1):
self.cloud.delete_keypair(self.keypair.name)
super(SingleVm1, self).clean()
except Exception: # pylint: disable=broad-except
- self.__logger.exception("Cannot clean all ressources")
+ self.__logger.exception("Cannot clean all resources")
class SingleVm2(SingleVm1):
"""Deploy a single VM reachable via ssh (scenario2)
It creates new user/project before creating and configuring all tenant
- network ressources and vms required by advanced testcases.
+ network resources and vms required by advanced testcases.
It ensures that all testcases inheriting from SingleVm2 could work
without specific configurations (or at least read the same config data).
@@ -485,4 +485,4 @@ class SingleVm2(SingleVm1):
assert self.project
self.project.clean()
except Exception: # pylint: disable=broad-except
- self.__logger.exception("Cannot clean all ressources")
+ self.__logger.exception("Cannot clean all resources")
diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py
index 8d2bb0efd..4ca5fdb54 100644
--- a/functest/core/tenantnetwork.py
+++ b/functest/core/tenantnetwork.py
@@ -9,11 +9,11 @@
"""Ease deploying tenant networks
-It offers a simple way to create all tenant network ressources required by a
+It offers a simple way to create all tenant network resources required by a
testcase (including all Functest ones):
- TenantNetwork1 selects the user and the project set as env vars
- - TenantNetwork2 creates a user and project to isolate the same ressources
+ - TenantNetwork2 creates a user and project to isolate the same resources
This classes could be reused by more complexed scenarios (Single VM)
"""
@@ -107,14 +107,14 @@ class NewProject(object):
if self.role:
self.orig_cloud.delete_role(self.role.id)
except Exception: # pylint: disable=broad-except
- self.__logger.exception("Cannot clean all ressources")
+ self.__logger.exception("Cannot clean all resources")
class TenantNetwork1(testcase.TestCase):
# pylint: disable=too-many-instance-attributes
"""Create a tenant network (scenario1)
- It creates and configures all tenant network ressources required by
+ It creates and configures all tenant network resources required by
advanced testcases (subnet, network and router).
It ensures that all testcases inheriting from TenantNetwork1 could work
@@ -247,14 +247,14 @@ class TenantNetwork1(testcase.TestCase):
if self.network:
self.cloud.delete_network(self.network.id)
except Exception: # pylint: disable=broad-except
- self.__logger.exception("cannot clean all ressources")
+ self.__logger.exception("cannot clean all resources")
class TenantNetwork2(TenantNetwork1):
"""Create a tenant network (scenario2)
It creates new user/project before creating and configuring all tenant
- network ressources required by a testcase (subnet, network and router).
+ network resources required by a testcase (subnet, network and router).
It ensures that all testcases inheriting from TenantNetwork2 could work
without network specific configurations (or at least read the same config
@@ -284,4 +284,4 @@ class TenantNetwork2(TenantNetwork1):
assert self.project
self.project.clean()
except Exception: # pylint: disable=broad-except
- self.__logger.exception("Cannot clean all ressources")
+ self.__logger.exception("Cannot clean all resources")