openstack/tempest
Code Issues Proposed changes

Add "server" to action methods

Browse Source 
As the qa-spec of consistent-service-method-names, basically all
methods’ names should be "<verb>_<resource/object name>".
So this patch adds the word "server" to compute action methods.

Partially implements blueprint consistent-service-method-names

Change-Id: Ib91dc75055b9e2331d243cac686fe19c7516f6ba
This commit is contained in:
Ken'ichi Ohmichi
2015-08-10 07:53:27 +00:00
parent 33e20d0a73
commit 5271b0f96c
16 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/api/compute/admin/test_migrations.py
View File

@@ -42,7 +42,7 @@ class MigrationsAdminTest(base.BaseV2ComputeAdminTest):
server = self.create_test_server(wait_until="ACTIVE")
server_id = server['id']
self.servers_client.resize(server_id, self.flavor_ref_alt)
self.servers_client.resize_server(server_id, self.flavor_ref_alt)
waiters.wait_for_server_status(self.servers_client,
server_id, 'VERIFY_RESIZE')
self.servers_client.confirm_resize(server_id)

4
tempest/api/compute/admin/test_servers.py
View File

@@ -163,11 +163,11 @@ class ServersAdminTestJSON(base.BaseV2ComputeAdminTest):
# resetting vm state require admin privilege
self.client.reset_state(self.s1_id, state='error')
rebuilt_server = self.non_admin_client.rebuild(
rebuilt_server = self.non_admin_client.rebuild_server(
self.s1_id, self.image_ref_alt)
self.addCleanup(waiters.wait_for_server_status, self.non_admin_client,
self.s1_id, 'ACTIVE')
self.addCleanup(self.non_admin_client.rebuild, self.s1_id,
self.addCleanup(self.non_admin_client.rebuild_server, self.s1_id,
self.image_ref)
# Verify the properties in the initial response are correct

4
tempest/api/compute/admin/test_servers_negative.py
View File

@@ -78,7 +78,7 @@ class ServersAdminNegativeTestJSON(base.BaseV2ComputeAdminTest):
disk=disk, id=flavor_id)
self.addCleanup(self.flavors_client.delete_flavor, flavor_id)
self.assertRaises((lib_exc.Forbidden, lib_exc.OverLimit),
self.client.resize,
self.client.resize_server,
self.servers[0]['id'],
flavor_ref['id'])
@@ -100,7 +100,7 @@ class ServersAdminNegativeTestJSON(base.BaseV2ComputeAdminTest):
disk=disk, id=flavor_id)
self.addCleanup(self.flavors_client.delete_flavor, flavor_id)
self.assertRaises((lib_exc.Forbidden, lib_exc.OverLimit),
self.client.resize,
self.client.resize_server,
self.servers[0]['id'],
flavor_ref['id'])

2
tempest/api/compute/security_groups/test_security_groups.py
View File

@@ -109,7 +109,7 @@ class SecurityGroupsTestJSON(base.BaseSecurityGroupsTest):
sg['id'])
# Reboot and add the other security group
self.servers_client.reboot(server_id, 'HARD')
self.servers_client.reboot_server(server_id, 'HARD')
waiters.wait_for_server_status(self.servers_client, server_id,
'ACTIVE')
self.servers_client.add_security_group(server_id, sg2['name'])

2
tempest/api/compute/servers/test_delete_server.py
View File

@@ -103,7 +103,7 @@ class DeleteServersTestJSON(base.BaseV2ComputeTest):
def test_delete_server_while_in_verify_resize_state(self):
# Delete a server while it's VM state is VERIFY_RESIZE
server = self.create_test_server(wait_until='ACTIVE')
self.client.resize(server['id'], self.flavor_ref_alt)
self.client.resize_server(server['id'], self.flavor_ref_alt)
waiters.wait_for_server_status(self.client, server['id'],
'VERIFY_RESIZE')
self.client.delete_server(server['id'])

18
tempest/api/compute/servers/test_disk_config.py
View File

@@ -57,9 +57,9 @@ class ServerDiskConfigTestJSON(base.BaseV2ComputeTest):
# A server should be rebuilt using the manual disk config option
self._update_server_with_disk_config(disk_config='AUTO')
server = self.client.rebuild(self.server_id,
self.image_ref_alt,
disk_config='MANUAL')
server = self.client.rebuild_server(self.server_id,
self.image_ref_alt,
disk_config='MANUAL')
# Wait for the server to become active
waiters.wait_for_server_status(self.client, server['id'], 'ACTIVE')
@@ -73,9 +73,9 @@ class ServerDiskConfigTestJSON(base.BaseV2ComputeTest):
# A server should be rebuilt using the auto disk config option
self._update_server_with_disk_config(disk_config='MANUAL')
server = self.client.rebuild(self.server_id,
self.image_ref_alt,
disk_config='AUTO')
server = self.client.rebuild_server(self.server_id,
self.image_ref_alt,
disk_config='AUTO')
# Wait for the server to become active
waiters.wait_for_server_status(self.client, server['id'], 'ACTIVE')
@@ -101,7 +101,8 @@ class ServerDiskConfigTestJSON(base.BaseV2ComputeTest):
# Resize with auto option
flavor_id = self._get_alternative_flavor()
self.client.resize(self.server_id, flavor_id, disk_config='AUTO')
self.client.resize_server(self.server_id, flavor_id,
disk_config='AUTO')
waiters.wait_for_server_status(self.client, self.server_id,
'VERIFY_RESIZE')
self.client.confirm_resize(self.server_id)
@@ -119,7 +120,8 @@ class ServerDiskConfigTestJSON(base.BaseV2ComputeTest):
# Resize with manual option
flavor_id = self._get_alternative_flavor()
self.client.resize(self.server_id, flavor_id, disk_config='MANUAL')
self.client.resize_server(self.server_id, flavor_id,
disk_config='MANUAL')
waiters.wait_for_server_status(self.client, self.server_id,
'VERIFY_RESIZE')
self.client.confirm_resize(self.server_id)

2
tempest/api/compute/servers/test_instance_actions.py
View File

@@ -35,7 +35,7 @@ class InstanceActionsTestJSON(base.BaseV2ComputeTest):
@test.idempotent_id('77ca5cc5-9990-45e0-ab98-1de8fead201a')
def test_list_instance_actions(self):
# List actions of the provided server
self.client.reboot(self.server_id, 'HARD')
self.client.reboot_server(self.server_id, 'HARD')
waiters.wait_for_server_status(self.client, self.server_id, 'ACTIVE')
body = self.client.list_instance_actions(self.server_id)

24
tempest/api/compute/servers/test_server_actions.py
View File

@@ -105,7 +105,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
self.validation_resources['keypair']['private_key'])
boot_time = linux_client.get_boot_time()
self.client.reboot(self.server_id, reboot_type)
self.client.reboot_server(self.server_id, reboot_type)
waiters.wait_for_server_status(self.client, self.server_id, 'ACTIVE')
if CONF.validation.run_validation:
@@ -132,7 +132,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
self._test_reboot_server('SOFT')
def _rebuild_server_and_check(self, image_ref):
rebuilt_server = self.client.rebuild(self.server_id, image_ref)
rebuilt_server = self.client.rebuild_server(self.server_id, image_ref)
waiters.wait_for_server_status(self.client, self.server_id, 'ACTIVE')
msg = ('Server was not rebuilt to the original image. '
'The original image: {0}. The current image: {1}'
@@ -148,12 +148,12 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
personality = [{'path': 'rebuild.txt',
'contents': base64.b64encode(file_contents)}]
password = 'rebuildPassw0rd'
rebuilt_server = self.client.rebuild(self.server_id,
self.image_ref_alt,
name=new_name,
metadata=meta,
personality=personality,
adminPass=password)
rebuilt_server = self.client.rebuild_server(self.server_id,
self.image_ref_alt,
name=new_name,
metadata=meta,
personality=personality,
adminPass=password)
# If the server was rebuilt on a different image, restore it to the
# original image once the test ends
@@ -193,7 +193,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
if old_image == self.image_ref else self.image_ref)
self.client.stop(self.server_id)
waiters.wait_for_server_status(self.client, self.server_id, 'SHUTOFF')
rebuilt_server = self.client.rebuild(self.server_id, new_image)
rebuilt_server = self.client.rebuild_server(self.server_id, new_image)
# If the server was rebuilt on a different image, restore it to the
# original image once the test ends
if self.image_ref_alt != self.image_ref:
@@ -223,7 +223,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
waiters.wait_for_server_status(self.client, self.server_id,
'SHUTOFF')
self.client.resize(self.server_id, self.flavor_ref_alt)
self.client.resize_server(self.server_id, self.flavor_ref_alt)
waiters.wait_for_server_status(self.client, self.server_id,
'VERIFY_RESIZE')
@@ -262,7 +262,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
# The server's RAM and disk space should return to its original
# values after a resize is reverted
self.client.resize(self.server_id, self.flavor_ref_alt)
self.client.resize_server(self.server_id, self.flavor_ref_alt)
waiters.wait_for_server_status(self.client, self.server_id,
'VERIFY_RESIZE')
@@ -375,7 +375,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
# log file is truncated and we cannot get any console log through
# "console-log" API.
# The detail is https://bugs.launchpad.net/nova/+bug/1251920
self.client.reboot(self.server_id, 'HARD')
self.client.reboot_server(self.server_id, 'HARD')
waiters.wait_for_server_status(self.client, self.server_id, 'ACTIVE')
self.wait_for(self._get_output)

4
tempest/api/compute/servers/test_server_rescue_negative.py
View File

@@ -100,7 +100,7 @@ class ServerRescueNegativeTestJSON(base.BaseV2ComputeTest):
@test.attr(type=['negative'])
@test.idempotent_id('db22b618-f157-4566-a317-1b6d467a8094')
def test_rescued_vm_reboot(self):
self.assertRaises(lib_exc.Conflict, self.servers_client.reboot,
self.assertRaises(lib_exc.Conflict, self.servers_client.reboot_server,
self.rescue_id, 'HARD')
@test.attr(type=['negative'])
@@ -116,7 +116,7 @@ class ServerRescueNegativeTestJSON(base.BaseV2ComputeTest):
@test.idempotent_id('70cdb8a1-89f8-437d-9448-8844fd82bf46')
def test_rescued_vm_rebuild(self):
self.assertRaises(lib_exc.Conflict,
self.servers_client.rebuild,
self.servers_client.rebuild_server,
self.rescue_id,
self.image_ref_alt)

14
tempest/api/compute/servers/test_servers_negative.py
View File

@@ -122,7 +122,7 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
# Resize a non-existent server
nonexistent_server = data_utils.rand_uuid()
self.assertRaises(lib_exc.NotFound,
self.client.resize,
self.client.resize_server,
nonexistent_server, self.flavor_ref)
@test.idempotent_id('ced1a1d7-2ab6-45c9-b90f-b27d87b30efd')
@@ -132,7 +132,7 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
def test_resize_server_with_non_existent_flavor(self):
# Resize a server with non-existent flavor
nonexistent_flavor = data_utils.rand_uuid()
self.assertRaises(lib_exc.BadRequest, self.client.resize,
self.assertRaises(lib_exc.BadRequest, self.client.resize_server,
self.server_id, flavor_ref=nonexistent_flavor)
@test.idempotent_id('45436a7d-a388-4a35-a9d8-3adc5d0d940b')
@@ -141,7 +141,7 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
@test.attr(type=['negative'])
def test_resize_server_with_null_flavor(self):
# Resize a server with null flavor
self.assertRaises(lib_exc.BadRequest, self.client.resize,
self.assertRaises(lib_exc.BadRequest, self.client.resize_server,
self.server_id, flavor_ref="")
@test.attr(type=['negative'])
@@ -149,7 +149,7 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
def test_reboot_non_existent_server(self):
# Reboot a non existent server
nonexistent_server = data_utils.rand_uuid()
self.assertRaises(lib_exc.NotFound, self.client.reboot,
self.assertRaises(lib_exc.NotFound, self.client.reboot_server,
nonexistent_server, 'SOFT')
@test.idempotent_id('d1417e7f-a509-41b5-a102-d5eed8613369')
@@ -174,9 +174,9 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
self.client.wait_for_server_termination(server['id'])
self.assertRaises(lib_exc.NotFound,
self.client.rebuild,
self.client.rebuild_server,
server['id'], self.image_ref_alt)
self.assertRaises(lib_exc.NotFound, self.client.reboot,
self.assertRaises(lib_exc.NotFound, self.client.reboot_server,
server['id'], 'SOFT')
@test.attr(type=['negative'])
@@ -185,7 +185,7 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
# Rebuild a non existent server
nonexistent_server = data_utils.rand_uuid()
self.assertRaises(lib_exc.NotFound,
self.client.rebuild,
self.client.rebuild_server,
nonexistent_server,
self.image_ref_alt)

6
tempest/api/compute/test_authorization.py
View File

@@ -154,19 +154,19 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
@test.idempotent_id('14cb5ff5-f646-45ca-8f51-09081d6c0c24')
def test_reboot_server_for_alt_account_fails(self):
# A reboot request for another user's server should fail
self.assertRaises(lib_exc.NotFound, self.alt_client.reboot,
self.assertRaises(lib_exc.NotFound, self.alt_client.reboot_server,
self.server['id'], 'HARD')
@test.idempotent_id('8a0bce51-cd00-480b-88ba-dbc7d8408a37')
def test_rebuild_server_for_alt_account_fails(self):
# A rebuild request for another user's server should fail
self.assertRaises(lib_exc.NotFound, self.alt_client.rebuild,
self.assertRaises(lib_exc.NotFound, self.alt_client.rebuild_server,
self.server['id'], self.image_ref_alt)
@test.idempotent_id('e4da647e-f982-4e61-9dad-1d1abebfb933')
def test_resize_server_for_alt_account_fails(self):
# A resize request for another user's server should fail
self.assertRaises(lib_exc.NotFound, self.alt_client.resize,
self.assertRaises(lib_exc.NotFound, self.alt_client.resize_server,
self.server['id'], self.flavor_ref_alt)
@test.idempotent_id('a9fe8112-0ffa-4902-b061-f892bd5fe0d3')

7
tempest/scenario/manager.py
View File

@@ -444,9 +444,10 @@ class ScenarioTest(tempest.test.BaseTestCase):
LOG.debug("Rebuilding server (id: %s, image: %s, preserve eph: %s)",
server_id, image, preserve_ephemeral)
self.servers_client.rebuild(server_id=server_id, image_ref=image,
preserve_ephemeral=preserve_ephemeral,
**rebuild_kwargs)
self.servers_client.rebuild_server(
server_id=server_id, image_ref=image,
preserve_ephemeral=preserve_ephemeral,
**rebuild_kwargs)
if wait:
waiters.wait_for_server_status(self.servers_client,
server_id, 'ACTIVE')

2
tempest/scenario/test_minimum_basic.py
View File

@@ -79,7 +79,7 @@ class TestMinimumBasicScenario(manager.ScenarioTest):
self.assertEqual(self.volume, volume)
def nova_reboot(self):
self.servers_client.reboot(self.server['id'], 'SOFT')
self.servers_client.reboot_server(self.server['id'], 'SOFT')
self._wait_for_server_status('ACTIVE')
def check_partitions(self):

10
tempest/scenario/test_network_advanced_server_ops.py
View File

@@ -111,7 +111,8 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
@test.services('compute', 'network')
def test_server_connectivity_reboot(self):
self._setup_network_and_servers()
self.servers_client.reboot(self.server['id'], reboot_type='SOFT')
self.servers_client.reboot_server(self.server['id'],
reboot_type='SOFT')
self._wait_server_status_and_check_network_connectivity()
@test.idempotent_id('88a529c2-1daa-4c85-9aec-d541ba3eb699')
@@ -119,8 +120,8 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
def test_server_connectivity_rebuild(self):
self._setup_network_and_servers()
image_ref_alt = CONF.compute.image_ref_alt
self.servers_client.rebuild(self.server['id'],
image_ref=image_ref_alt)
self.servers_client.rebuild_server(self.server['id'],
image_ref=image_ref_alt)
self._wait_server_status_and_check_network_connectivity()
@test.idempotent_id('2b2642db-6568-4b35-b812-eceed3fa20ce')
@@ -159,7 +160,8 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
msg = "Skipping test - flavor_ref and flavor_ref_alt are identical"
raise self.skipException(msg)
self._setup_network_and_servers()
self.servers_client.resize(self.server['id'], flavor_ref=resize_flavor)
self.servers_client.resize_server(self.server['id'],
flavor_ref=resize_flavor)
waiters.wait_for_server_status(self.servers_client, self.server['id'],
'VERIFY_RESIZE')
self.servers_client.confirm_resize(self.server['id'])

2
tempest/scenario/test_server_advanced_ops.py
View File

@@ -58,7 +58,7 @@ class TestServerAdvancedOps(manager.ScenarioTest):
resize_flavor = CONF.compute.flavor_ref_alt
LOG.debug("Resizing instance %s from flavor %s to flavor %s",
instance['id'], instance['flavor']['id'], resize_flavor)
self.servers_client.resize(instance_id, resize_flavor)
self.servers_client.resize_server(instance_id, resize_flavor)
waiters.wait_for_server_status(self.servers_client, instance_id,
'VERIFY_RESIZE')

6
tempest/services/compute/json/servers_client.py
View File

@@ -251,11 +251,11 @@ class ServersClient(service_client.ServiceClient):
resp, body)
return service_client.ResponseBody(resp, body)
def reboot(self, server_id, reboot_type):
def reboot_server(self, server_id, reboot_type):
"""Reboots a server."""
return self.action(server_id, 'reboot', None, type=reboot_type)
def rebuild(self, server_id, image_ref, **kwargs):
def rebuild_server(self, server_id, image_ref, **kwargs):
"""Rebuilds a server with a new image."""
kwargs['imageRef'] = image_ref
if 'disk_config' in kwargs:
@@ -268,7 +268,7 @@ class ServersClient(service_client.ServiceClient):
return self.action(server_id, 'rebuild', 'server',
rebuild_schema, **kwargs)
def resize(self, server_id, flavor_ref, **kwargs):
def resize_server(self, server_id, flavor_ref, **kwargs):
"""Changes the flavor of a server."""
kwargs['flavorRef'] = flavor_ref
if 'disk_config' in kwargs: