From 13c9c893ccf67b914fd984a1fded6428dfd90711 Mon Sep 17 00:00:00 2001 From: zhufl Date: Fri, 10 Feb 2017 12:04:07 +0800 Subject: [PATCH] Make wait_until default as 'ACTIVE' in manager.create_server All callings to manager.create_server pass wait_until='ACTIVE', so this is to make wail_until default as 'ACTIVE', not None. Change-Id: I630cf047ed419fbf0cc073b5984fa29b456da451 --- tempest/scenario/manager.py | 2 +- tempest/scenario/test_encrypted_cinder_volumes.py | 4 +--- tempest/scenario/test_minimum_basic.py | 4 +--- tempest/scenario/test_network_advanced_server_ops.py | 3 +-- tempest/scenario/test_network_basic_ops.py | 3 +-- tempest/scenario/test_network_v6.py | 3 +-- tempest/scenario/test_security_groups_basic_ops.py | 1 - tempest/scenario/test_server_advanced_ops.py | 4 ++-- tempest/scenario/test_server_basic_ops.py | 3 +-- tempest/scenario/test_server_multinode.py | 3 +-- tempest/scenario/test_shelve_instance.py | 1 - tempest/scenario/test_snapshot_pattern.py | 6 ++---- tempest/scenario/test_stamp_pattern.py | 3 +-- tempest/scenario/test_volume_boot_pattern.py | 8 ++------ tempest/scenario/test_volume_migrate_attached.py | 2 +- 15 files changed, 16 insertions(+), 34 deletions(-) diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index 5422e1609d..6014c8cfc0 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -117,7 +117,7 @@ class ScenarioTest(tempest.test.BaseTestCase): return body['keypair'] def create_server(self, name=None, image_id=None, flavor=None, - validatable=False, wait_until=None, + validatable=False, wait_until='ACTIVE', clients=None, **kwargs): """Wrapper utility that returns a test server. diff --git a/tempest/scenario/test_encrypted_cinder_volumes.py b/tempest/scenario/test_encrypted_cinder_volumes.py index 77bd10f018..da29485768 100644 --- a/tempest/scenario/test_encrypted_cinder_volumes.py +++ b/tempest/scenario/test_encrypted_cinder_volumes.py @@ -46,9 +46,7 @@ class TestEncryptedCinderVolumes(manager.EncryptionScenarioTest): image = self.glance_image_create() keypair = self.create_keypair() - return self.create_server(image_id=image, - key_name=keypair['name'], - wait_until='ACTIVE') + return self.create_server(image_id=image, key_name=keypair['name']) def create_encrypted_volume(self, encryption_provider, volume_type): volume_type = self.create_volume_type(name=volume_type) diff --git a/tempest/scenario/test_minimum_basic.py b/tempest/scenario/test_minimum_basic.py index 4b1c362ec2..738ed616fc 100644 --- a/tempest/scenario/test_minimum_basic.py +++ b/tempest/scenario/test_minimum_basic.py @@ -104,9 +104,7 @@ class TestMinimumBasicScenario(manager.ScenarioTest): image = self.glance_image_create() keypair = self.create_keypair() - server = self.create_server(image_id=image, - key_name=keypair['name'], - wait_until='ACTIVE') + server = self.create_server(image_id=image, key_name=keypair['name']) servers = self.servers_client.list_servers()['servers'] self.assertIn(server['id'], [x['id'] for x in servers]) diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py index 7843531941..f8e7742127 100644 --- a/tempest/scenario/test_network_advanced_server_ops.py +++ b/tempest/scenario/test_network_advanced_server_ops.py @@ -65,8 +65,7 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest): server = self.create_server( networks=[{'uuid': network['id']}], key_name=keypair['name'], - security_groups=security_groups, - wait_until='ACTIVE') + security_groups=security_groups) return server def _setup_network(self, server, keypair): diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index 69b5250a91..e6a5f515c6 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -160,8 +160,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest): server = self.create_server( networks=[network], key_name=keypair['name'], - security_groups=security_groups, - wait_until='ACTIVE') + security_groups=security_groups) self.servers.append(server) return server diff --git a/tempest/scenario/test_network_v6.py b/tempest/scenario/test_network_v6.py index f2359345fe..2d6ea75ff4 100644 --- a/tempest/scenario/test_network_v6.py +++ b/tempest/scenario/test_network_v6.py @@ -126,8 +126,7 @@ class TestGettingAddress(manager.NetworkScenarioTest): srv = self.create_server( key_name=self.keypair['name'], security_groups=[{'name': self.sec_grp['name']}], - networks=[{'uuid': n['id']} for n in networks], - wait_until='ACTIVE') + networks=[{'uuid': n['id']} for n in networks]) fip = self.create_floating_ip(thing=srv) ips = self.define_server_ips(srv=srv) ssh = self.get_remote_client( diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py index 07f9d0f4d2..fda407c7b0 100644 --- a/tempest/scenario/test_security_groups_basic_ops.py +++ b/tempest/scenario/test_security_groups_basic_ops.py @@ -263,7 +263,6 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest): networks=[{'uuid': tenant.network["id"]}], key_name=tenant.keypair['name'], security_groups=security_groups_names, - wait_until='ACTIVE', clients=tenant.manager, **kwargs) if 'security_groups' in server: diff --git a/tempest/scenario/test_server_advanced_ops.py b/tempest/scenario/test_server_advanced_ops.py index 6cc5cd3afb..4d9e59c2ac 100644 --- a/tempest/scenario/test_server_advanced_ops.py +++ b/tempest/scenario/test_server_advanced_ops.py @@ -54,7 +54,7 @@ class TestServerAdvancedOps(manager.ScenarioTest): @test.services('compute', 'volume') def test_resize_volume_backed_server_confirm(self): # We create an instance for use in this test - instance = self.create_server(wait_until='ACTIVE', volume_backed=True) + instance = self.create_server(volume_backed=True) instance_id = instance['id'] resize_flavor = CONF.compute.flavor_ref_alt LOG.debug("Resizing instance %s from flavor %s to flavor %s", @@ -75,7 +75,7 @@ class TestServerAdvancedOps(manager.ScenarioTest): @test.services('compute') def test_server_sequence_suspend_resume(self): # We create an instance for use in this test - instance = self.create_server(wait_until='ACTIVE') + instance = self.create_server() instance_id = instance['id'] LOG.debug("Suspending instance %s. Current status: %s", instance_id, instance['status']) diff --git a/tempest/scenario/test_server_basic_ops.py b/tempest/scenario/test_server_basic_ops.py index 1af68ffea8..8a3b70defd 100644 --- a/tempest/scenario/test_server_basic_ops.py +++ b/tempest/scenario/test_server_basic_ops.py @@ -138,8 +138,7 @@ class TestServerBasicOps(manager.ScenarioTest): key_name=keypair['name'], security_groups=[{'name': security_group['name']}], config_drive=CONF.compute_feature_enabled.config_drive, - metadata=self.md, - wait_until='ACTIVE') + metadata=self.md) self.verify_ssh(keypair) self.verify_metadata() self.verify_metadata_on_config_drive() diff --git a/tempest/scenario/test_server_multinode.py b/tempest/scenario/test_server_multinode.py index df83063a4c..9cc89a404c 100644 --- a/tempest/scenario/test_server_multinode.py +++ b/tempest/scenario/test_server_multinode.py @@ -75,8 +75,7 @@ class TestServerMultinode(manager.ScenarioTest): # by getting to active state here, this means this has # landed on the host in question. inst = self.create_server( - availability_zone='%(zone)s:%(host_name)s' % host, - wait_until='ACTIVE') + availability_zone='%(zone)s:%(host_name)s' % host) server = self.servers_client.show_server(inst['id'])['server'] servers.append(server) diff --git a/tempest/scenario/test_shelve_instance.py b/tempest/scenario/test_shelve_instance.py index 2264a98700..e950766b9b 100644 --- a/tempest/scenario/test_shelve_instance.py +++ b/tempest/scenario/test_shelve_instance.py @@ -58,7 +58,6 @@ class TestShelveInstance(manager.ScenarioTest): image_id=CONF.compute.image_ref, key_name=keypair['name'], security_groups=security_groups, - wait_until='ACTIVE', volume_backed=boot_from_volume) instance_ip = self.get_server_ip(server) diff --git a/tempest/scenario/test_snapshot_pattern.py b/tempest/scenario/test_snapshot_pattern.py index 374cdba2a8..8197d52a40 100644 --- a/tempest/scenario/test_snapshot_pattern.py +++ b/tempest/scenario/test_snapshot_pattern.py @@ -49,8 +49,7 @@ class TestSnapshotPattern(manager.ScenarioTest): server = self.create_server( image_id=CONF.compute.image_ref, key_name=keypair['name'], - security_groups=[{'name': security_group['name']}], - wait_until='ACTIVE') + security_groups=[{'name': security_group['name']}]) instance_ip = self.get_server_ip(server) timestamp = self.create_timestamp(instance_ip, @@ -63,8 +62,7 @@ class TestSnapshotPattern(manager.ScenarioTest): server_from_snapshot = self.create_server( image_id=snapshot_image['id'], key_name=keypair['name'], - security_groups=[{'name': security_group['name']}], - wait_until='ACTIVE') + security_groups=[{'name': security_group['name']}]) # check the existence of the timestamp file in the second instance server_from_snapshot_ip = self.get_server_ip(server_from_snapshot) diff --git a/tempest/scenario/test_stamp_pattern.py b/tempest/scenario/test_stamp_pattern.py index a302b1c53c..0c256649fe 100644 --- a/tempest/scenario/test_stamp_pattern.py +++ b/tempest/scenario/test_stamp_pattern.py @@ -109,8 +109,7 @@ class TestStampPattern(manager.ScenarioTest): server = self.create_server( image_id=CONF.compute.image_ref, key_name=keypair['name'], - security_groups=security_group, - wait_until='ACTIVE') + security_groups=security_group) # create and add floating IP to server1 ip_for_server = self.get_server_ip(server) diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py index e34efcab83..184fc0e777 100644 --- a/tempest/scenario/test_volume_boot_pattern.py +++ b/tempest/scenario/test_volume_boot_pattern.py @@ -69,10 +69,7 @@ class TestVolumeBootPattern(manager.ScenarioTest): source_type, delete_on_termination=delete_on_termination)) - return self.create_server( - image_id='', - wait_until='ACTIVE', - **create_kwargs) + return self.create_server(image_id='', **create_kwargs) def _create_snapshot_from_volume(self, vol_id): snap_name = data_utils.rand_name( @@ -229,8 +226,7 @@ class TestVolumeBootPattern(manager.ScenarioTest): self._delete_server(instance) # boot instance from EBS image - instance = self.create_server( - image_id=image['id']) + instance = self.create_server(image_id=image['id']) # just ensure that instance booted # delete instance diff --git a/tempest/scenario/test_volume_migrate_attached.py b/tempest/scenario/test_volume_migrate_attached.py index 161e6f2a40..891e22db12 100644 --- a/tempest/scenario/test_volume_migrate_attached.py +++ b/tempest/scenario/test_volume_migrate_attached.py @@ -62,7 +62,7 @@ class TestVolumeMigrateRetypeAttached(manager.ScenarioTest): block_device_mapping = [{'device_name': 'vda', 'volume_id': vol_id, 'delete_on_termination': False}] - return self.create_server(image_id='', wait_until='ACTIVE', + return self.create_server(image_id='', key_name=key_name, security_groups=security_groups, block_device_mapping=block_device_mapping)