diff options
Diffstat (limited to 'tempest/api/volume/test_volume_transfers.py')
| -rw-r--r-- | tempest/api/volume/test_volume_transfers.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tempest/api/volume/test_volume_transfers.py b/tempest/api/volume/test_volume_transfers.py index 4a6ba03ad..fe217c19e 100644 --- a/tempest/api/volume/test_volume_transfers.py +++ b/tempest/api/volume/test_volume_transfers.py @@ -26,19 +26,20 @@ CONF = config.CONF class VolumesV2TransfersTest(base.BaseVolumeTest): @classmethod - def setUpClass(cls): - super(VolumesV2TransfersTest, cls).setUpClass() + def resource_setup(cls): + super(VolumesV2TransfersTest, cls).resource_setup() # Add another tenant to test volume-transfer - if CONF.compute.allow_tenant_isolation: - cls.os_alt = clients.Manager(cls.isolated_creds.get_alt_creds(), - interface=cls._interface) - # Add admin tenant to cleanup resources - cls.os_adm = clients.Manager(cls.isolated_creds.get_admin_creds(), - interface=cls._interface) - else: - cls.os_alt = clients.AltManager() - cls.os_adm = clients.ComputeAdminManager(interface=cls._interface) + cls.os_alt = clients.Manager(cls.isolated_creds.get_alt_creds(), + interface=cls._interface) + # Add admin tenant to cleanup resources + try: + creds = cls.isolated_creds.get_admin_creds() + cls.os_adm = clients.Manager( + credentials=creds, interface=cls._interface) + except NotImplementedError: + msg = "Missing Volume Admin API credentials in configuration." + raise cls.skipException(msg) cls.client = cls.volumes_client cls.alt_client = cls.os_alt.volumes_client |