openstack
/
tempest
Code Issues Proposed changes

test_shelve_instance: cleanup class scope variable usage 

This removes the class variables for keypair and security group
so we don't rely on tight coupling between method calls.

Change-Id: I8cdec35cbf3ca168c3d9979a771caa7221d4b511
Related-Bug: #1482299
This commit is contained in:
Matt Riedemann 2015-09-30 14:53:25 -07:00 committed by Jordan Pittier
parent fd5657dedd
commit 73764bf6ec
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tempest/scenario/test_shelve_instance.py
View File

@ -55,12 +55,12 @@ class TestShelveInstance(manager.ScenarioTest):
'ACTIVE') 'ACTIVE')
def _create_server_then_shelve_and_unshelve(self, boot_from_volume=False): def _create_server_then_shelve_and_unshelve(self, boot_from_volume=False):
self.keypair = self.create_keypair() keypair = self.create_keypair()
self.security_group = self._create_security_group() security_group = self._create_security_group()
security_groups = [{'name': self.security_group['name']}] security_groups = [{'name': security_group['name']}]
create_kwargs = { create_kwargs = {
'key_name': self.keypair['name'], 'key_name': keypair['name'],
'security_groups': security_groups 'security_groups': security_groups
} }
@ -86,18 +86,22 @@ class TestShelveInstance(manager.ScenarioTest):
floating_ip['id']) floating_ip['id'])
self.floating_ips_client.associate_floating_ip_to_server( self.floating_ips_client.associate_floating_ip_to_server(
floating_ip['ip'], server['id']) floating_ip['ip'], server['id'])
timestamp = self.create_timestamp(floating_ip['ip']) timestamp = self.create_timestamp(
floating_ip['ip'], private_key=keypair['private_key'])
else: else:
timestamp = self.create_timestamp(server) timestamp = self.create_timestamp(
server, private_key=keypair['private_key'])
# Prevent bug #1257594 from coming back # Prevent bug #1257594 from coming back
# Unshelve used to boot the instance with the original image, not # Unshelve used to boot the instance with the original image, not
# with the instance snapshot # with the instance snapshot
self._shelve_then_unshelve_server(server) self._shelve_then_unshelve_server(server)
if CONF.compute.use_floatingip_for_ssh: if CONF.compute.use_floatingip_for_ssh:
timestamp2 = self.get_timestamp(floating_ip['ip']) timestamp2 = self.get_timestamp(floating_ip['ip'],
private_key=keypair['private_key'])
else: else:
timestamp2 = self.get_timestamp(server) timestamp2 = self.get_timestamp(server,
private_key=keypair['private_key'])
self.assertEqual(timestamp, timestamp2) self.assertEqual(timestamp, timestamp2)
@test.idempotent_id('1164e700-0af0-4a4c-8792-35909a88743c') @test.idempotent_id('1164e700-0af0-4a4c-8792-35909a88743c')