commit 4518ffcb1eb0e6e0585ff5fd40a1684bc8284ec8
author ivan-zhu <bozhu@linux.vnet.ibm.com> Thu Dec 05 15:24:43 2013 +0800
committer ivan-zhu <bozhu@linux.vnet.ibm.com> Sat Dec 28 10:46:26 2013 +0800
tree 3941e60a69a1499f0e2b5a0f067a5fc1c65ec821
parent 78611f4342c6e2516f43dbe091a1daf04d3def8f

port test_live_block_migration into nova v3 part2

this ports test_live_block_migration into nova v3 api.

Partially implements blueprint nova-v3-api-tests

Change-Id: I4952ad0836da674783409600f157799f63cdd1c6

tempest/api/compute/v3/test_live_block_migration.py

diff --git a/tempest/api/compute/v3/test_live_block_migration.py b/tempest/api/compute/v3/test_live_block_migration.py
index d2a3d28..3de50c8 100644
--- a/tempest/api/compute/v3/test_live_block_migration.py
+++ b/tempest/api/compute/v3/test_live_block_migration.py
@@ -26,18 +26,18 @@
 from tempest.test import attr
 
 
-class LiveBlockMigrationTestJSON(base.BaseV2ComputeAdminTest):
-    _host_key = 'OS-EXT-SRV-ATTR:host'
+class LiveBlockMigrationV3TestJSON(base.BaseV3ComputeAdminTest):
+    _host_key = 'os-extended-server-attributes:host'
     _interface = 'json'
 
     CONF = config.CONF
 
     @classmethod
     def setUpClass(cls):
-        super(LiveBlockMigrationTestJSON, cls).setUpClass()
+        super(LiveBlockMigrationV3TestJSON, cls).setUpClass()
 
-        cls.admin_hosts_client = cls.os_adm.hosts_client
-        cls.admin_servers_client = cls.os_adm.servers_client
+        cls.admin_hosts_client = cls.hosts_admin_client
+        cls.admin_servers_client = cls.servers_admin_client
 
         cls.created_server_ids = []
 
@@ -86,7 +86,7 @@
         else:
             _, server = self.create_test_server(wait_until="ACTIVE")
             server_id = server['id']
-            self.password = server['adminPass']
+            self.password = server['admin_password']
             self.password = 'password'
             self.created_server_ids.append(server_id)
             return server_id
@@ -163,10 +163,11 @@
         for server_id in cls.created_server_ids:
             cls.servers_client.delete_server(server_id)
 
-        super(LiveBlockMigrationTestJSON, cls).tearDownClass()
+        super(LiveBlockMigrationV3TestJSON, cls).tearDownClass()
 
 
-class LiveBlockMigrationTestXML(LiveBlockMigrationTestJSON):
+class LiveBlockMigrationV3TestXML(LiveBlockMigrationV3TestJSON):
     _host_key = (
-        '{http://docs.openstack.org/compute/ext/extended_status/api/v1.1}host')
+        '{http://docs.openstack.org/compute/ext/'
+        'extended_server_attributes/api/v3}host')
     _interface = 'xml'