diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-16 09:51:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-16 09:51:05 +0000 |
| commit | 93279b0f4fc4aaaba7a34c7cd3dd618266635759 (patch) | |
| tree | 0c8510526c50ff44c41f4e1ecd30db8b850b4267 /tempest/api/compute/base.py | |
| parent | 98b9322f2da2755f792732f0251e5ba973a014c1 (diff) | |
| parent | 315011163c94ebb2cb4886e1a192eaf039ab3782 (diff) | |
| download | tempest-93279b0f4fc4aaaba7a34c7cd3dd618266635759.tar.gz | |
Merge "Fix availability zone client in compute admin test"
Diffstat (limited to 'tempest/api/compute/base.py')
| -rw-r--r-- | tempest/api/compute/base.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py index caf4174eb..70a960405 100644 --- a/tempest/api/compute/base.py +++ b/tempest/api/compute/base.py @@ -392,8 +392,11 @@ class BaseComputeAdminTest(BaseComputeTest): msg = ("Missing Compute Admin API credentials " "in configuration.") raise cls.skipException(msg) + if cls._api_version == 2: + cls.availability_zone_admin_client = ( + cls.os_adm.availability_zone_client) - if cls._api_version == 3: + else: cls.servers_admin_client = cls.os_adm.servers_v3_client cls.services_admin_client = cls.os_adm.services_v3_client cls.availability_zone_admin_client = \ |