diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-01 11:11:33 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-03 20:13:26 +0200 |
| commit | 789986b6eefb4f36ffb87f514f58567050a61753 (patch) | |
| tree | 838ff4c54c4d0fe735102f5b8de6aca10befeca1 | |
| parent | 71f49963c8a8f505059dc3f5f449a31c07bba1bb (diff) | |
Create Member role if required
It seems there is no common role configuration between OPNFV
installers. Then it creates/removes the expected role if required.
Change-Id: I38a92e2522a401f46a59813b9e9443a11d6c7060
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit b3916af1754e02bb952b431a36c70b0c3aee9a0a)
| -rw-r--r-- | functest/core/tenantnetwork.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py index bbcbb70e3..58fa5d2f8 100644 --- a/functest/core/tenantnetwork.py +++ b/functest/core/tenantnetwork.py @@ -35,6 +35,7 @@ class NewProject(object): # pylint: disable=too-many-instance-attributes __logger = logging.getLogger(__name__) + default_member = "Member" def __init__(self, cloud, case_name, guid): self.cloud = None @@ -45,6 +46,7 @@ class NewProject(object): self.user = None self.password = None self.domain = None + self.role = None def create(self): """Create projects/users""" @@ -65,8 +67,14 @@ class NewProject(object): password=self.password, domain_id=self.domain.id) self.__logger.debug("user: %s", self.user) + try: + assert self.orig_cloud.get_role(self.default_member) + except Exception: # pylint: disable=broad-except + self.__logger.info("Creating default role %s", self.default_member) + self.role = self.orig_cloud.create_role(self.default_member) + self.__logger.debug("role: %s", self.role) self.orig_cloud.grant_role( - "Member", user=self.user.id, project=self.project.id, + self.default_member, user=self.user.id, project=self.project.id, domain=self.domain.id) osconfig = os_client_config.config.OpenStackConfig() osconfig.cloud_config[ @@ -86,6 +94,8 @@ class NewProject(object): assert self.project.id self.orig_cloud.delete_user(self.user.id) self.orig_cloud.delete_project(self.project.id) + if self.role: + self.orig_cloud.delete_role(self.role.id) except Exception: # pylint: disable=broad-except self.__logger.exception("Cannot clean all ressources") |