Merge "Wait for servers to be SSHABLE"
Zuul authored 3 years ago
Gerrit Code Review committed 3 years ago
| 137 | 137 | 'name', |
| 138 | 138 | data_utils.rand_name(self.__class__.__name__ + '-instance')) |
| 139 | 139 | |
| 140 | if wait_until == 'SSHABLE' and not kwargs.get('validation_resources'): | |
| 141 | kwargs['validation_resources'] = ( | |
| 142 | self.get_test_validation_resources(self.os_primary)) | |
| 143 | kwargs['validatable'] = True | |
| 144 | ||
| 140 | 145 | tenant_network = self.get_tenant_network() |
| 141 | 146 | body, _ = compute.create_test_server( |
| 142 | 147 | self.os_primary, |
| 29 | 29 | super(VolumesBackupsTest, cls).skip_checks() |
| 30 | 30 | if not CONF.volume_feature_enabled.backup: |
| 31 | 31 | raise cls.skipException("Cinder backup feature disabled") |
| 32 | ||
| 33 | @classmethod | |
| 34 | def setup_credentials(cls): | |
| 35 | # Setting network=True, subnet=True creates a default network | |
| 36 | cls.set_network_resources( | |
| 37 | network=True, | |
| 38 | subnet=True, | |
| 39 | router=True, | |
| 40 | dhcp=True) | |
| 41 | super(VolumesBackupsTest, cls).setup_credentials() | |
| 32 | 42 | |
| 33 | 43 | @decorators.idempotent_id('885410c6-cd1d-452c-a409-7c32b7e0be15') |
| 34 | 44 | def test_volume_snapshot_backup(self): |
| 106 | 116 | server = self.create_server( |
| 107 | 117 | name=server_name, |
| 108 | 118 | block_device_mapping=bd_map, |
| 109 | wait_until='ACTIVE') | |
| 119 | wait_until='SSHABLE') | |
| 110 | 120 | |
| 111 | 121 | # Delete VM |
| 112 | 122 | self.os_primary.servers_client.delete_server(server['id']) |
| 22 | 22 | |
| 23 | 23 | def setUp(self): |
| 24 | 24 | super(SnapshotDataIntegrityTests, self).setUp() |
| 25 | self.keypair = self.create_keypair() | |
| 25 | self.validation_resources = self.get_test_validation_resources( | |
| 26 | self.os_primary) | |
| 27 | # NOTE(danms): If validation is enabled, we will have a keypair to use, | |
| 28 | # otherwise we need to create our own. | |
| 29 | if 'keypair' in self.validation_resources: | |
| 30 | self.keypair = self.validation_resources['keypair'] | |
| 31 | else: | |
| 32 | self.keypair = self.create_keypair() | |
| 26 | 33 | self.security_group = self.create_security_group() |
| 27 | 34 | |
| 28 | 35 | @decorators.idempotent_id('ff10644e-5a70-4a9f-9801-8204bb81fb61') |
| 47 | 54 | # Create an instance |
| 48 | 55 | server = self.create_server( |
| 49 | 56 | key_name=self.keypair['name'], |
| 57 | validatable=True, | |
| 58 | validation_resources=self.validation_resources, | |
| 59 | wait_until='SSHABLE', | |
| 50 | 60 | security_groups=[{'name': self.security_group['name']}]) |
| 51 | 61 | |
| 52 | 62 | # Create an empty volume |
| 36 | 36 | @classmethod |
| 37 | 37 | def resource_cleanup(cls): |
| 38 | 38 | super(TestEncryptedCinderVolumes, cls).resource_cleanup() |
| 39 | ||
| 40 | def launch_instance(self): | |
| 41 | keypair = self.create_keypair() | |
| 42 | ||
| 43 | return self.create_server(key_name=keypair['name']) | |
| 44 | 39 | |
| 45 | 40 | def attach_detach_volume(self, server, volume): |
| 46 | 41 | attached_volume = self.nova_volume_attach(server, volume) |
| 107 | 102 | self.volumes_client, volume_s['id'], 'available') |
| 108 | 103 | volume_source = self.volumes_client.show_volume( |
| 109 | 104 | volume_s['id'])['volume'] |
| 110 | server = self.launch_instance() | |
| 105 | validation_resources = self.get_test_validation_resources( | |
| 106 | self.os_primary) | |
| 107 | server = self.create_server(wait_until='SSHABLE', | |
| 108 | validatable=True, | |
| 109 | validation_resources=validation_resources) | |
| 111 | 110 | self.attach_detach_volume(server, volume_source) |
| 112 | 111 | |
| 113 | 112 | @decorators.idempotent_id('5bb622ab-5060-48a8-8840-d589a548b7e4') |
| 30 | 30 | |
| 31 | 31 | def setUp(self): |
| 32 | 32 | super(VolumeMultiattachTests, self).setUp() |
| 33 | self.keypair = self.create_keypair() | |
| 33 | self.validation_resources = self.get_test_validation_resources( | |
| 34 | self.os_primary) | |
| 35 | # NOTE(danms): If validation is enabled, we will have a keypair to use, | |
| 36 | # otherwise we need to create our own. | |
| 37 | if 'keypair' in self.validation_resources: | |
| 38 | self.keypair = self.validation_resources['keypair'] | |
| 39 | else: | |
| 40 | self.keypair = self.create_keypair() | |
| 34 | 41 | self.security_group = self.create_security_group() |
| 35 | 42 | |
| 36 | 43 | @classmethod |
| 51 | 58 | # Create an instance |
| 52 | 59 | server_1 = self.create_server( |
| 53 | 60 | key_name=self.keypair['name'], |
| 61 | wait_until='SSHABLE', | |
| 62 | validatable=True, | |
| 63 | validation_resources=self.validation_resources, | |
| 54 | 64 | security_groups=[{'name': self.security_group['name']}]) |
| 55 | 65 | |
| 56 | 66 | # Create multiattach type |
| 91 | 101 | # Create another instance |
| 92 | 102 | server_2 = self.create_server( |
| 93 | 103 | key_name=self.keypair['name'], |
| 104 | validatable=True, | |
| 105 | validation_resources=self.validation_resources, | |
| 106 | wait_until='SSHABLE', | |
| 94 | 107 | security_groups=[{'name': self.security_group['name']}]) |
| 95 | 108 | |
| 96 | 109 | instance_2_ip = self.get_server_ip(server_2) |
| 116 | 129 | # Create an instance |
| 117 | 130 | server = self.create_server( |
| 118 | 131 | key_name=self.keypair['name'], |
| 132 | validatable=True, | |
| 133 | validation_resources=self.validation_resources, | |
| 134 | wait_until='SSHABLE', | |
| 119 | 135 | security_groups=[{'name': self.security_group['name']}]) |
| 120 | 136 | |
| 121 | 137 | # Create multiattach type |