diff --git a/tempest/api/compute/admin/test_flavors_access.py b/tempest/api/compute/admin/test_flavors_access.py index 7a3e8db9da..0a11d52f6d 100644 --- a/tempest/api/compute/admin/test_flavors_access.py +++ b/tempest/api/compute/admin/test_flavors_access.py @@ -43,8 +43,6 @@ class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest): # Non admin tenant ID cls.tenant_id = cls.flavors_client.tenant_id - # Compute admin tenant ID - cls.adm_tenant_id = cls.client.tenant_id cls.flavor_name_prefix = 'test_flavor_access_' cls.ram = 512 cls.vcpus = 1 diff --git a/tempest/api/identity/admin/v3/test_trusts.py b/tempest/api/identity/admin/v3/test_trusts.py index b8700a615d..fac8826a5b 100644 --- a/tempest/api/identity/admin/v3/test_trusts.py +++ b/tempest/api/identity/admin/v3/test_trusts.py @@ -34,7 +34,6 @@ class BaseTrustsV3Test(base.BaseIdentityV3AdminTest): if not CONF.identity_feature_enabled.trust: raise self.skipException("Trusts aren't enabled") - self.trustee_username = CONF.identity.alt_username self.trust_id = None def tearDown(self): diff --git a/tempest/api/image/v1/test_images.py b/tempest/api/image/v1/test_images.py index 7739d16029..d4dbfcd08f 100644 --- a/tempest/api/image/v1/test_images.py +++ b/tempest/api/image/v1/test_images.py @@ -119,9 +119,6 @@ class ListImagesTest(base.BaseV1ImageTest): img7 = cls._create_standard_image('33', 'bare', 'raw', 142) img8 = cls._create_standard_image('33', 'bare', 'raw', 142) cls.created_set = set(cls.created_images) - # 4x-4x remote image - cls.remote_set = set((img1, img2, img3, img4)) - cls.standard_set = set((img5, img6, img7, img8)) # 5x bare, 3x ami cls.bare_set = set((img1, img3, img4, img7, img8)) cls.ami_set = set((img2, img5, img6)) diff --git a/tempest/api/network/admin/test_dhcp_agent_scheduler.py b/tempest/api/network/admin/test_dhcp_agent_scheduler.py index 4a86acaa28..86b49732ed 100644 --- a/tempest/api/network/admin/test_dhcp_agent_scheduler.py +++ b/tempest/api/network/admin/test_dhcp_agent_scheduler.py @@ -32,7 +32,6 @@ class DHCPAgentSchedulersTestJSON(base.BaseAdminNetworkTest): # dhcp agent: this is done by creating a regular port cls.network = cls.create_network() cls.subnet = cls.create_subnet(cls.network) - cls.cidr = cls.subnet['cidr'] cls.port = cls.create_port(cls.network) @test.idempotent_id('5032b1fe-eb42-4a64-8f3b-6e189d8b5c7d') diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py index fda8fc3f7d..fa6fa33d5a 100644 --- a/tempest/api/network/base.py +++ b/tempest/api/network/base.py @@ -77,7 +77,6 @@ class BaseNetworkTest(tempest.test.BaseTestCase): @classmethod def resource_setup(cls): super(BaseNetworkTest, cls).resource_setup() - cls.network_cfg = CONF.network cls.networks = [] cls.subnets = [] cls.ports = [] diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py index 842a56d492..5685be8a28 100644 --- a/tempest/api/network/test_networks.py +++ b/tempest/api/network/test_networks.py @@ -66,7 +66,6 @@ class NetworksTestJSON(base.BaseNetworkTest): cls.name = cls.network['name'] cls.subnet = cls._create_subnet_with_last_subnet_block(cls.network, cls._ip_version) - cls.cidr = cls.subnet['cidr'] cls._subnet_data = {6: {'gateway': str(cls._get_gateway_from_tempest_conf(6)), 'allocation_pools': diff --git a/tempest/api/volume/test_volumes_actions.py b/tempest/api/volume/test_volumes_actions.py index 58c5ba9e3e..79615b3065 100644 --- a/tempest/api/volume/test_volumes_actions.py +++ b/tempest/api/volume/test_volumes_actions.py @@ -45,10 +45,6 @@ class VolumesV2ActionsTest(base.BaseVolumeTest): cls.volume = cls.create_volume() cls.client.wait_for_volume_status(cls.volume['id'], 'available') - def _delete_image_with_wait(self, image_id): - self.image_client.delete_image(image_id) - self.image_client.wait_for_resource_deletion(image_id) - @classmethod def resource_cleanup(cls): # Delete the test instance diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py index 18fd09d122..1db1ac21d6 100644 --- a/tempest/scenario/test_security_groups_basic_ops.py +++ b/tempest/scenario/test_security_groups_basic_ops.py @@ -161,9 +161,6 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest): cls.floating_ip_access = not CONF.network.public_router_id - def cleanup_wrapper(self, resource): - self.cleanup_resource(resource, self.__class__.__name__) - def setUp(self): super(TestSecurityGroupsBasicOps, self).setUp() self._deploy_tenant(self.primary_tenant) diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py index 779fb37229..4912033d57 100644 --- a/tempest/scenario/test_volume_boot_pattern.py +++ b/tempest/scenario/test_volume_boot_pattern.py @@ -97,13 +97,6 @@ class TestVolumeBootPattern(manager.ScenarioTest): waiters.wait_for_server_status(self.servers_client, i['id'], 'SHUTOFF') - def _detach_volumes(self, volumes): - # NOTE(gfidente): two loops so we do not wait for the status twice - for v in volumes: - self.volumes_client.detach_volume(v['id']) - for v in volumes: - self.volumes_client.wait_for_volume_status(v['id'], 'available') - def _ssh_to_server(self, server, keypair): if CONF.compute.use_floatingip_for_ssh: floating_ip = (self.floating_ips_client.create_floating_ip()