Fixing revert/confirm resize tests
Change-Id: Ic803b3f5efeab0796542488e5e212186a2de3618
diff --git a/tempest/services/nova/json/servers_client.py b/tempest/services/nova/json/servers_client.py
index 9baa280..2199172 100644
--- a/tempest/services/nova/json/servers_client.py
+++ b/tempest/services/nova/json/servers_client.py
@@ -226,7 +226,7 @@
def confirm_resize(self, server_id):
"""Confirms the flavor change for a server"""
post_body = {
- 'confirmResize': null
+ 'confirmResize': None,
}
post_body = json.dumps(post_body)
@@ -237,7 +237,7 @@
def revert_resize(self, server_id):
"""Reverts a server back to its original flavor"""
post_body = {
- 'revertResize': null
+ 'revertResize': None,
}
post_body = json.dumps(post_body)
diff --git a/tempest/tests/test_server_actions.py b/tempest/tests/test_server_actions.py
index 0d58fb0..73f470f 100644
--- a/tempest/tests/test_server_actions.py
+++ b/tempest/tests/test_server_actions.py
@@ -24,34 +24,36 @@
def setUp(self):
self.name = rand_name('server')
- resp, self.server = self.client.create_server(self.name,
- self.image_ref,
- self.flavor_ref)
- self.client.wait_for_server_status(self.server['id'], 'ACTIVE')
+ resp, server = self.client.create_server(self.name,
+ self.image_ref,
+ self.flavor_ref)
+ self.server_id = server['id']
+
+ self.client.wait_for_server_status(self.server_id, 'ACTIVE')
def tearDown(self):
- self.client.delete_server(self.server['id'])
+ self.client.delete_server(self.server_id)
@attr(type='smoke')
def test_change_server_password(self):
"""The server's password should be set to the provided password"""
- resp, body = self.client.change_password(self.server['id'], 'newpass')
+ resp, body = self.client.change_password(self.server_id, 'newpass')
self.assertEqual(202, resp.status)
- self.client.wait_for_server_status(self.server['id'], 'ACTIVE')
+ self.client.wait_for_server_status(self.server_id, 'ACTIVE')
@attr(type='smoke')
def test_reboot_server_hard(self):
""" The server should be power cycled """
- resp, body = self.client.reboot(self.server['id'], 'HARD')
+ resp, body = self.client.reboot(self.server_id, 'HARD')
self.assertEqual(202, resp.status)
- self.client.wait_for_server_status(self.server['id'], 'ACTIVE')
+ self.client.wait_for_server_status(self.server_id, 'ACTIVE')
@attr(type='smoke')
def test_reboot_server_soft(self):
"""The server should be signaled to reboot gracefully"""
- resp, body = self.client.reboot(self.server['id'], 'SOFT')
+ resp, body = self.client.reboot(self.server_id, 'SOFT')
self.assertEqual(202, resp.status)
- self.client.wait_for_server_status(self.server['id'], 'ACTIVE')
+ self.client.wait_for_server_status(self.server_id, 'ACTIVE')
@attr(type='smoke')
def test_rebuild_server(self):
@@ -62,14 +64,14 @@
personality = [{'path': '/etc/rebuild.txt',
'contents': base64.b64encode(file_contents)}]
- resp, rebuilt_server = self.client.rebuild(self.server['id'],
+ resp, rebuilt_server = self.client.rebuild(self.server_id,
self.image_ref_alt,
name=new_name, meta=meta,
personality=personality,
adminPass='rebuild')
#Verify the properties in the initial response are correct
- self.assertEqual(self.server['id'], rebuilt_server['id'])
+ self.assertEqual(self.server_id, rebuilt_server['id'])
self.assertEqual(self.image_ref_alt, rebuilt_server['image']['id'])
self.assertEqual(self.flavor_ref, rebuilt_server['flavor']['id'])
@@ -87,14 +89,14 @@
the provided flavor
"""
- resp, server = self.client.resize(self.id, self.flavor_ref_alt)
+ resp, server = self.client.resize(self.server_id, self.flavor_ref_alt)
self.assertEqual(202, resp.status)
- self.client.wait_for_server_status(self.id, 'VERIFY_RESIZE')
+ self.client.wait_for_server_status(self.server_id, 'VERIFY_RESIZE')
- self.client.confirm_resize(self.id)
- self.client.wait_for_server_status(self.id, 'ACTIVE')
+ self.client.confirm_resize(self.server_id)
+ self.client.wait_for_server_status(self.server_id, 'ACTIVE')
- resp, server = self.client.get_server(self.id)
+ resp, server = self.client.get_server(self.server_id)
self.assertEqual(self.flavor_ref_alt, server['flavor']['id'])
@attr(type='smoke')
@@ -105,12 +107,12 @@
values after a resize is reverted
"""
- resp, server = self.client.resize(self.id, self.flavor_ref_alt)
+ resp, server = self.client.resize(self.server_id, self.flavor_ref_alt)
self.assertEqual(202, resp.status)
- self.client.wait_for_server_status(id, 'VERIFY_RESIZE')
+ self.client.wait_for_server_status(self.server_id, 'VERIFY_RESIZE')
- self.client.revert_resize(self.id)
- self.client.wait_for_server_status(id, 'ACTIVE')
+ self.client.revert_resize(self.server_id)
+ self.client.wait_for_server_status(self.server_id, 'ACTIVE')
- resp, server = self.client.get_server(id)
+ resp, server = self.client.get_server(self.server_id)
self.assertEqual(self.flavor_ref, server['flavor']['id'])