commit 315011163c94ebb2cb4886e1a192eaf039ab3782
author Ghanshyam <ghanshyam.mann@nectechnologies.in> Mon Jun 23 13:56:42 2014 +0900
committer Ghanshyam <ghanshyam.mann@nectechnologies.in> Tue Jun 24 19:35:13 2014 +0900
tree 319594c686c320fecd4a881b47ca413b6e8562d9
parent 34e98ad7cc8624c2f27d5374360d34917d99466b

Fix availability zone client in compute admin test

In /tempest/api/compute/admin/test_availability_zone.py file,
V3 test class use the V2 Availability Zone client.

This patch correct the client for V2 and V3 by instantiating the
correct one in base class.

Change-Id: I97903b1ea7faa02c5880c091a166e386295de0da

tempest/api/compute/admin/test_availability_zone.py

diff --git a/tempest/api/compute/admin/test_availability_zone.py b/tempest/api/compute/admin/test_availability_zone.py
index 9555367..3a6de36 100644
--- a/tempest/api/compute/admin/test_availability_zone.py
+++ b/tempest/api/compute/admin/test_availability_zone.py
@@ -26,7 +26,7 @@
     @classmethod
     def setUpClass(cls):
         super(AZAdminV3Test, cls).setUpClass()
-        cls.client = cls.os_adm.availability_zone_client
+        cls.client = cls.availability_zone_admin_client
 
     @test.attr(type='gate')
     def test_get_availability_zone_list(self):

tempest/api/compute/base.py

diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index 7c70aec..fdbe123 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -390,8 +390,11 @@
                 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 = \