openstack
/
glance-tempest-plugin
Code Issues Proposed changes

Refactor RbacBasetest to inherit from tempest 

This makes the RbacBaseTests class inherit from the tempest base class
so that the image tests can inherit from it in a straight line without
all the mixing in.

Change-Id: I61de3313765635be8eab2ae869c0e241e1ad6ed0
This commit is contained in:
Dan Smith 2021-09-14 08:32:41 -07:00
parent afb867b2ac
commit 174c3fac1d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glance_tempest_plugin/tests/rbac/v2/base.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from tempest.api.image import base
from tempest import clients
from tempest import config
from tempest.lib import auth
@ -18,7 +19,7 @@ from tempest.lib.common.utils import data_utils
CONF = config.CONF
class ImageV2RbacBaseTests(object):
class RbacBaseTests(base.BaseV2ImageTest):
identity_version = 'v3'

13
glance_tempest_plugin/tests/rbac/v2/test_images.py
View File

@ -14,7 +14,6 @@ import abc
import six
from tempest.api.image import base
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import exceptions
@ -24,8 +23,7 @@ from glance_tempest_plugin.tests.rbac.v2 import base as rbac_base
CONF = config.CONF
class ImageV2RbacImageTest(rbac_base.ImageV2RbacBaseTests,
metaclass=abc.ABCMeta):
class ImageV2RbacImageTest(rbac_base.RbacBaseTests):
@classmethod
def setup_clients(cls):
@ -51,6 +49,8 @@ class ImageV2RbacImageTest(rbac_base.ImageV2RbacBaseTests,
image['ramdisk_uuid'] = '00000000-1111-2222-3333-444455556666'
return image
class ImageV2RbacTemplate(metaclass=abc.ABCMeta):
@abc.abstractmethod
def test_create_image(self):
"""Test add_image policy.
@ -165,7 +165,8 @@ class ImageV2RbacImageTest(rbac_base.ImageV2RbacBaseTests,
pass
class ProjectAdminTests(ImageV2RbacImageTest, base.BaseV2ImageTest):
class ProjectAdminTests(ImageV2RbacImageTest,
ImageV2RbacTemplate):
credentials = ['project_admin', 'system_admin']
@ -883,7 +884,7 @@ class ProjectAdminTests(ImageV2RbacImageTest, base.BaseV2ImageTest):
image_id=image['id'])
class ProjectMemberTests(ProjectAdminTests, base.BaseV2ImageTest):
class ProjectMemberTests(ImageV2RbacImageTest, ImageV2RbacTemplate):
credentials = ['project_member', 'project_admin', 'system_admin']
@ -1572,7 +1573,7 @@ class ProjectMemberTests(ProjectAdminTests, base.BaseV2ImageTest):
image_id=image['id'])
class ProjectReaderTests(ProjectMemberTests, base.BaseV2ImageTest):
class ProjectReaderTests(ProjectMemberTests):
credentials = ['project_reader', 'project_admin', 'system_admin']