openstack
/
tempest
Code Issues Proposed changes

Clean up pep8 E127 violations 

Fixed E127 errors.
All ignores are to be removed in the next sequence of patches.

Change-Id: Ia2c1331ba2ffe71e5853b0fae846f02845eb9cb8
This commit is contained in:
Zhongyue Luo 2012-09-25 17:24:17 +08:00
parent 79d8d361a5
commit e0884a3021
33 changed files with 161 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stress/driver.py
View File

@ -180,13 +180,13 @@ def bash_openstack(manager,
cases = _create_cases(choice_spec)
state = ClusterState(max_vms=max_vms)
create_initial_keypairs(manager, state,
int(kwargs.get('initial_keypairs', 0)))
int(kwargs.get('initial_keypairs', 0)))
create_initial_vms(manager, state,
int(kwargs.get('initial_vms', 0)))
create_initial_floating_ips(manager, state,
int(kwargs.get('initial_floating_ips', 0)))
create_initial_volumes(manager, state,
int(kwargs.get('initial_volumes', 0)))
int(kwargs.get('initial_volumes', 0)))
test_end_time = time.time() + duration.seconds
retry_list = []

2
stress/test_server_actions.py
View File

@ -129,7 +129,7 @@ class VerifyRebootVM(pending_action.PendingServerAction):
return False
target = self._target
self._logger.info('machine %s %s -> ACTIVE [%.1f secs elapsed]' %
(target['id'], reboot_state, self.elapsed()))
(target['id'], reboot_state, self.elapsed()))
self._state.set_instance_state(target['id'],
(target, 'ACTIVE'))

4
stress/test_servers.py
View File

@ -123,7 +123,7 @@ class VerifyCreateVM(pending_action.PendingServerAction):
self._state.get_instances()[self._target['id']][1] ==
'TERMINATING'):
self._logger.info('machine %s is deleted or TERMINATING' %
self._target['id'])
self._target['id'])
return True
admin_pass = self._target['adminPass']
@ -273,7 +273,7 @@ class TestUpdateVMName(test_case.StressTestCase):
new_name = update_target['name'] + '_updated'
(response, body) = \
manager.servers_client.update_server(update_target['id'],
name=new_name)
name=new_name)
if (response.status != 200):
self._logger.error("response: %s " % response)
self._logger.error("body: %s " % body)

4
tempest/common/rest_client.py
View File

@ -149,8 +149,8 @@ class RestClient(object):
if service == 'network':
# Keystone does not return the correct endpoint for
# quantum. Handle this separately.
mgmt_url = mgmt_url + self.config.network.api_version + \
"/tenants/" + tenant_id
mgmt_url = (mgmt_url + self.config.network.api_version +
"/tenants/" + tenant_id)
return token, mgmt_url

8
tempest/openstack.py
View File

@ -158,10 +158,10 @@ class Manager(object):
self.images_client = IMAGES_CLIENTS[interface](*client_args)
self.keypairs_client = KEYPAIRS_CLIENTS[interface](*client_args)
self.flavors_client = FLAVORS_CLIENTS[interface](*client_args)
self.extensions_client = \
EXTENSIONS_CLIENTS[interface](*client_args)
self.volumes_extensions_client = \
VOLUMES_EXTENSIONS_CLIENTS[interface](*client_args)
ext_cli = EXTENSIONS_CLIENTS[interface](*client_args)
self.extensions_client = ext_cli
vol_ext_cli = VOLUMES_EXTENSIONS_CLIENTS[interface](*client_args)
self.volumes_extensions_client = vol_ext_cli
self.floating_ips_client = FLOAT_CLIENTS[interface](*client_args)
self.volumes_client = VOLUMES_CLIENTS[interface](*client_args)
self.admin_client = ADMIN_CLIENT[interface](*client_args)

19
tempest/services/identity/json/admin_client.py
View File

@ -8,7 +8,7 @@ class AdminClientJSON(RestClient):
def __init__(self, config, username, password, auth_url, tenant_name=None):
super(AdminClientJSON, self).__init__(config, username, password,
auth_url, tenant_name)
auth_url, tenant_name)
self.service = self.config.identity.catalog_type
self.endpoint_url = 'adminURL'
@ -29,8 +29,7 @@ class AdminClientJSON(RestClient):
'name': name,
}
post_body = json.dumps({'role': post_body})
resp, body = self.post('OS-KSADM/roles', post_body,
self.headers)
resp, body = self.post('OS-KSADM/roles', post_body, self.headers)
body = json.loads(body)
return resp, body['role']
@ -47,8 +46,7 @@ class AdminClientJSON(RestClient):
'enabled': kwargs.get('enabled', 'true'),
}
post_body = json.dumps({'tenant': post_body})
resp, body = self.post('tenants', post_body,
self.headers)
resp, body = self.post('tenants', post_body, self.headers)
body = json.loads(body)
return resp, body['tenant']
@ -67,9 +65,9 @@ class AdminClientJSON(RestClient):
def assign_user_role(self, tenant_id, user_id, role_id):
"""Add roles to a user on a tenant"""
post_body = json.dumps({})
resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s'
% (tenant_id, user_id, role_id), post_body,
self.headers)
resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s' %
(tenant_id, user_id, role_id), post_body,
self.headers)
body = json.loads(body)
return resp, body['role']
@ -122,7 +120,7 @@ class AdminClientJSON(RestClient):
}
post_body = json.dumps({'tenant': post_body})
resp, body = self.post('tenants/%s' % tenant_id, post_body,
self.headers)
self.headers)
body = json.loads(body)
return resp, body['tenant']
@ -186,8 +184,7 @@ class AdminClientJSON(RestClient):
'type': type,
'description': kwargs.get('description')}
post_body = json.dumps({'OS-KSADM:service': post_body})
resp, body = self.post('/OS-KSADM/services', post_body,
self.headers)
resp, body = self.post('/OS-KSADM/services', post_body, self.headers)
body = json.loads(body)
return resp, body['OS-KSADM:service']

33
tempest/services/identity/xml/admin_client.py
View File

@ -34,7 +34,7 @@ class AdminClientXML(RestClientXML):
def __init__(self, config, username, password, auth_url, tenant_name=None):
super(AdminClientXML, self).__init__(config, username, password,
auth_url, tenant_name)
auth_url, tenant_name)
self.service = self.config.identity.catalog_type
self.endpoint_url = 'adminURL'
@ -61,11 +61,9 @@ class AdminClientXML(RestClientXML):
def create_role(self, name):
"""Create a role"""
create_role = Element("role",
xmlns=XMLNS,
name=name)
create_role = Element("role", xmlns=XMLNS, name=name)
resp, body = self.post('OS-KSADM/roles', str(Document(create_role)),
self.headers)
self.headers)
body = self._parse_body(etree.fromstring(body))
return resp, body
@ -83,7 +81,7 @@ class AdminClientXML(RestClientXML):
description=kwargs.get('description', ''),
enabled=str(en).lower())
resp, body = self.post('tenants', str(Document(create_tenant)),
self.headers)
self.headers)
body = self._parse_body(etree.fromstring(body))
return resp, body
@ -102,9 +100,8 @@ class AdminClientXML(RestClientXML):
def assign_user_role(self, tenant_id, user_id, role_id):
"""Add roles to a user on a tenant"""
resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s'
% (tenant_id, user_id, role_id),
'', self.headers)
resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s' %
(tenant_id, user_id, role_id), '', self.headers)
body = self._parse_body(etree.fromstring(body))
return resp, body
@ -158,11 +155,11 @@ class AdminClientXML(RestClientXML):
def create_user(self, name, password, tenant_id, email):
"""Create a user"""
create_user = Element("user",
xmlns=XMLNS,
name=name,
password=password,
tenantId=tenant_id,
email=email)
xmlns=XMLNS,
name=name,
password=password,
tenantId=tenant_id,
email=email)
resp, body = self.post('users', str(Document(create_user)),
self.headers)
body = self._parse_body(etree.fromstring(body))
@ -181,8 +178,7 @@ class AdminClientXML(RestClientXML):
def enable_disable_user(self, user_id, enabled):
"""Enables or disables a user"""
enable_user = Element("user",
enabled=str(enabled).lower())
enable_user = Element("user", enabled=str(enabled).lower())
resp, body = self.put('users/%s/enabled' % user_id,
str(Document(enable_user)), self.headers)
body = self._parse_array(etree.fromstring(body))
@ -209,7 +205,7 @@ class AdminClientXML(RestClientXML):
description=kwargs.get('description'))
resp, body = self.post('OS-KSADM/services',
str(Document(create_service)),
self.headers)
self.headers)
body = self._parse_body(etree.fromstring(body))
return resp, body
@ -235,8 +231,7 @@ class TokenClientXML(RestClientXML):
passwordCreds = Element("passwordCredentials",
username=user,
password=password)
auth = Element("auth",
tenantName=tenant)
auth = Element("auth", tenantName=tenant)
auth.append(passwordCreds)
headers = {'Content-Type': 'application/xml'}
resp, body = self.post(self.auth_url, headers=headers,

8
tempest/services/network/json/network_client.py
View File

@ -22,9 +22,7 @@ class NetworkClient(RestClient):
}
headers = {'Content-Type': 'application/json'}
body = json.dumps(post_body)
resp, body = self.post('networks',
headers=headers,
body=body)
resp, body = self.post('networks', headers=headers, body=body)
body = json.loads(body)
return resp, body
@ -59,13 +57,13 @@ class NetworkClient(RestClient):
headers = {'Content-Type': 'application/json'}
body = json.dumps(post_body)
resp, body = self.post('networks/%s/ports.json' % network_id,
headers=headers, body=body)
headers=headers, body=body)
body = json.loads(body)
return resp, body
def delete_port(self, network_id, port_id):
resp, body = self.delete('networks/%s/ports/%s.json' %
(network_id, port_id))
(network_id, port_id))
return resp, body
def list_ports(self, network_id):

22
tempest/services/nova/json/images_client.py
View File

@ -26,8 +26,8 @@ class ImagesClientJSON(RestClient):
post_body['createImage']['metadata'] = meta
post_body = json.dumps(post_body)
resp, body = self.post('servers/%s/action' %
str(server_id), post_body, self.headers)
resp, body = self.post('servers/%s/action' % str(server_id),
post_body, self.headers)
return resp, body
def list_images(self, params=None):
@ -107,37 +107,35 @@ class ImagesClientJSON(RestClient):
def set_image_metadata(self, image_id, meta):
"""Sets the metadata for an image"""
post_body = json.dumps({'metadata': meta})
resp, body = self.put('images/%s/metadata' %
str(image_id), post_body, self.headers)
resp, body = self.put('images/%s/metadata' % str(image_id),
post_body, self.headers)
body = json.loads(body)
return resp, body['metadata']
def update_image_metadata(self, image_id, meta):
"""Updates the metadata for an image"""
post_body = json.dumps({'metadata': meta})
resp, body = self.post('images/%s/metadata' %
str(image_id), post_body, self.headers)
resp, body = self.post('images/%s/metadata' % str(image_id),
post_body, self.headers)
body = json.loads(body)
return resp, body['metadata']
def get_image_metadata_item(self, image_id, key):
"""Returns the value for a specific image metadata key"""
resp, body = self.get("images/%s/metadata/%s" %
(str(image_id), key))
resp, body = self.get("images/%s/metadata/%s" % (str(image_id), key))
body = json.loads(body)
return resp, body['meta']
def set_image_metadata_item(self, image_id, key, meta):
"""Sets the value for a specific image metadata key"""
post_body = json.dumps({'meta': meta})
resp, body = self.put('images/%s/metadata/%s' %
(str(image_id), key), post_body,
self.headers)
resp, body = self.put('images/%s/metadata/%s' % (str(image_id), key),
post_body, self.headers)
body = json.loads(body)
return resp, body['meta']
def delete_image_metadata_item(self, image_id, key):
"""Deletes a single image metadata key/value pair"""
resp, body = self.delete("images/%s/metadata/%s" %
(str(image_id), key))
(str(image_id), key))
return resp, body

2
tempest/services/nova/json/keypairs_client.py
View File

@ -30,7 +30,7 @@ class KeyPairsClientJSON(RestClient):
post_body['keypair']['public_key'] = pub_key
post_body = json.dumps(post_body)
resp, body = self.post("os-keypairs",
headers=self.headers, body=post_body)
headers=self.headers, body=post_body)
body = json.loads(body)
return resp, body['keypair']

11
tempest/services/nova/json/security_groups_client.py
View File

@ -42,18 +42,16 @@ class SecurityGroupsClient(RestClient):
'description': description,
}
post_body = json.dumps({'security_group': post_body})
resp, body = self.post('os-security-groups',
post_body, self.headers)
resp, body = self.post('os-security-groups', post_body, self.headers)
body = json.loads(body)
return resp, body['security_group']
def delete_security_group(self, security_group_id):
"""Deletes the provided Security Group"""
return self.delete('os-security-groups/%s'
% str(security_group_id))
return self.delete('os-security-groups/%s' % str(security_group_id))
def create_security_group_rule(self, parent_group_id, ip_proto, from_port,
to_port, **kwargs):
to_port, **kwargs):
"""
Creating a new security group rules.
parent_group_id :ID of Security group
@ -80,5 +78,4 @@ class SecurityGroupsClient(RestClient):
def delete_security_group_rule(self, group_rule_id):
"""Deletes the provided Security Group rule"""
return self.delete('os-security-group-rules/%s'
% str(group_rule_id))
return self.delete('os-security-group-rules/%s' % str(group_rule_id))

59
tempest/services/nova/json/servers_client.py
View File

@ -40,10 +40,10 @@ class ServersClientJSON(RestClient):
}
for option in ['personality', 'adminPass', 'key_name',
'security_groups', 'networks', 'user_data',
'availability_zone', 'accessIPv4', 'accessIPv6',
'min_count', 'max_count', ('metadata', 'meta'),
('OS-DCF:diskConfig', 'disk_config')]:
'security_groups', 'networks', 'user_data',
'availability_zone', 'accessIPv4', 'accessIPv6',
'min_count', 'max_count', ('metadata', 'meta'),
('OS-DCF:diskConfig', 'disk_config')]:
if isinstance(option, tuple):
post_param = option[0]
key = option[1]
@ -86,7 +86,7 @@ class ServersClientJSON(RestClient):
post_body = json.dumps({'server': post_body})
resp, body = self.put("servers/%s" % str(server_id),
post_body, self.headers)
post_body, self.headers)
body = json.loads(body)
return resp, body['server']
@ -180,7 +180,7 @@ class ServersClientJSON(RestClient):
def list_addresses_by_network(self, server_id, network_id):
"""Lists all addresses of a specific network type for a server"""
resp, body = self.get("servers/%s/ips/%s" %
(str(server_id), network_id))
(str(server_id), network_id))
body = json.loads(body)
return resp, body
@ -194,7 +194,7 @@ class ServersClientJSON(RestClient):
post_body = json.dumps(post_body)
return self.post('servers/%s/action' % str(server_id),
post_body, self.headers)
post_body, self.headers)
def reboot(self, server_id, reboot_type):
"""Reboots a server"""
@ -206,7 +206,7 @@ class ServersClientJSON(RestClient):
post_body = json.dumps(post_body)
return self.post('servers/%s/action' % str(server_id),
post_body, self.headers)
post_body, self.headers)
def rebuild(self, server_id, image_ref, name=None, meta=None,
personality=None, adminPass=None, disk_config=None):
@ -231,9 +231,8 @@ class ServersClientJSON(RestClient):
post_body['OS-DCF:diskConfig'] = disk_config
post_body = json.dumps({'rebuild': post_body})
resp, body = self.post('servers/%s/action' %
str(server_id), post_body,
self.headers)
resp, body = self.post('servers/%s/action' % str(server_id),
post_body, self.headers)
body = json.loads(body)
return resp, body['server']
@ -249,8 +248,8 @@ class ServersClientJSON(RestClient):
post_body['resize']['OS-DCF:diskConfig'] = disk_config
post_body = json.dumps(post_body)
resp, body = self.post('servers/%s/action' %
str(server_id), post_body, self.headers)
resp, body = self.post('servers/%s/action' % str(server_id),
post_body, self.headers)
return resp, body
def confirm_resize(self, server_id):
@ -260,8 +259,8 @@ class ServersClientJSON(RestClient):
}
post_body = json.dumps(post_body)
resp, body = self.post('servers/%s/action' %
str(server_id), post_body, self.headers)
resp, body = self.post('servers/%s/action' % str(server_id),
post_body, self.headers)
return resp, body
def revert_resize(self, server_id):
@ -271,8 +270,8 @@ class ServersClientJSON(RestClient):
}
post_body = json.dumps(post_body)
resp, body = self.post('servers/%s/action' %
str(server_id), post_body, self.headers)
resp, body = self.post('servers/%s/action' % str(server_id),
post_body, self.headers)
return resp, body
def create_image(self, server_id, image_name):
@ -284,8 +283,8 @@ class ServersClientJSON(RestClient):
}
post_body = json.dumps(post_body)
resp, body = self.post('servers/%s/action' %
str(server_id), post_body, self.headers)
resp, body = self.post('servers/%s/action' % str(server_id),
post_body, self.headers)
return resp, body
def list_server_metadata(self, server_id):
@ -295,35 +294,33 @@ class ServersClientJSON(RestClient):
def set_server_metadata(self, server_id, meta):
post_body = json.dumps({'metadata': meta})
resp, body = self.put('servers/%s/metadata' %
str(server_id), post_body, self.headers)
resp, body = self.put('servers/%s/metadata' % str(server_id),
post_body, self.headers)
body = json.loads(body)
return resp, body['metadata']
def update_server_metadata(self, server_id, meta):
post_body = json.dumps({'metadata': meta})
resp, body = self.post('servers/%s/metadata' %
str(server_id), post_body, self.headers)
resp, body = self.post('servers/%s/metadata' % str(server_id),
post_body, self.headers)
body = json.loads(body)
return resp, body['metadata']
def get_server_metadata_item(self, server_id, key):
resp, body = self.get("servers/%s/metadata/%s" %
(str(server_id), key))
resp, body = self.get("servers/%s/metadata/%s" % (str(server_id), key))
body = json.loads(body)
return resp, body['meta']
def set_server_metadata_item(self, server_id, key, meta):
post_body = json.dumps({'meta': meta})
resp, body = self.put('servers/%s/metadata/%s' %
(str(server_id), key),
post_body, self.headers)
resp, body = self.put('servers/%s/metadata/%s' % (str(server_id), key),
post_body, self.headers)
body = json.loads(body)
return resp, body['meta']
def delete_server_metadata_item(self, server_id, key):
resp, body = self.delete("servers/%s/metadata/%s" %
(str(server_id), key))
(str(server_id), key))
return resp, body
def stop(self, server_id):
@ -363,7 +360,7 @@ class ServersClientJSON(RestClient):
}
post_body = json.dumps(post_body)
return self.post('servers/%s/action' % server_id,
post_body, self.headers)
post_body, self.headers)
def remove_security_group(self, server_id, security_group_name):
"""Removes a security group from the server"""
@ -374,4 +371,4 @@ class ServersClientJSON(RestClient):
}
post_body = json.dumps(post_body)
return self.post('servers/%s/action' % server_id,
post_body, self.headers)
post_body, self.headers)

5
tempest/services/nova/xml/servers_client.py
View File

@ -241,8 +241,9 @@ class ServersClientXML(RestClientXML):
def list_addresses_by_network(self, server_id, network_id):
"""Lists all addresses of a specific network type for a server"""
resp, body = self.get("servers/%s/ips/%s" %
(str(server_id), network_id), self.headers)
resp, body = self.get("servers/%s/ips/%s" % (str(server_id),
network_id),
self.headers)
network = self._parse_network(etree.fromstring(body))
return resp, network

4
tempest/services/volume/xml/volumes_client.py
View File

@ -96,9 +96,7 @@ class VolumesClientXML(RestClientXML):
:param display_name: Optional Volume Name.
:param metadata: An optional dictionary of values for metadata.
"""
volume = Element("volume",
xmlns=XMLNS_11,
size=size)
volume = Element("volume", xmlns=XMLNS_11, size=size)
if display_name:
volume.add_attr('display_name', display_name)

2
tempest/tests/compute/admin/test_flavors.py
View File

@ -140,7 +140,7 @@ class FlavorsAdminTestXML(base.BaseComputeAdminTestXML,
class FlavorsAdminTestJSON(base.BaseComputeAdminTestJSON,
FlavorsAdminTestBase):
FlavorsAdminTestBase):
@classmethod
def setUpClass(cls):

23
tempest/tests/compute/test_authorization.py
View File

@ -179,7 +179,7 @@ class AuthorizationTest(BaseComputeTest):
def test_create_server_with_unauthorized_image(self):
"""Server creation with another user's image should fail"""
self.alt_client.create_server('test', self.image['id'],
self.flavor_ref)
self.flavor_ref)
@raises(exceptions.BadRequest)
@attr(type='negative')
@ -193,7 +193,7 @@ class AuthorizationTest(BaseComputeTest):
# Change the base URL to impersonate another user
self.alt_client.base_url = self.client.base_url
self.alt_client.create_server('test', self.image['id'],
self.flavor_ref)
self.flavor_ref)
finally:
# Reset the base_url...
self.alt_client.base_url = saved_base_url
@ -337,8 +337,7 @@ class AuthorizationTest(BaseComputeTest):
def test_set_metadata_of_alt_account_server_fails(self):
""" A set metadata for another user's server should fail """
req_metadata = {'meta1': 'data1', 'meta2': 'data2'}
self.alt_client.set_server_metadata(self.server['id'],
req_metadata)
self.alt_client.set_server_metadata(self.server['id'], req_metadata)
@raises(exceptions.NotFound)
@attr(type='negative')
@ -346,18 +345,17 @@ class AuthorizationTest(BaseComputeTest):
""" A set metadata for another user's image should fail """
req_metadata = {'meta1': 'value1', 'meta2': 'value2'}
self.alt_images_client.set_image_metadata(self.image['id'],
req_metadata)
req_metadata)
@attr(type='negative')
def test_get_metadata_of_alt_account_server_fails(self):
""" A get metadata for another user's server should fail """
req_metadata = {'meta1': 'data1'}
self.client.set_server_metadata(self.server['id'],
req_metadata)
self.client.set_server_metadata(self.server['id'], req_metadata)
try:
resp, meta = \
self.alt_client.get_server_metadata_item(self.server['id'],
'meta1')
'meta1')
except exceptions.NotFound:
pass
finally:
@ -373,7 +371,7 @@ class AuthorizationTest(BaseComputeTest):
try:
resp, meta = \
self.alt_images_client.get_image_metadata_item(self.image['id'],
'meta1')
'meta1')
except exceptions.NotFound:
pass
finally:
@ -384,8 +382,7 @@ class AuthorizationTest(BaseComputeTest):
def test_delete_metadata_of_alt_account_server_fails(self):
""" A delete metadata for another user's server should fail """
req_metadata = {'meta1': 'data1'}
self.client.set_server_metadata(self.server['id'],
req_metadata)
self.client.set_server_metadata(self.server['id'], req_metadata)
try:
resp, body = \
self.alt_client.delete_server_metadata_item(self.server['id'],
@ -411,7 +408,7 @@ class AuthorizationTest(BaseComputeTest):
finally:
resp, body = \
self.images_client.delete_image_metadata_item(self.image['id'],
'meta1')
'meta1')
@raises(exceptions.NotFound)
@attr(type='negative')
@ -420,4 +417,4 @@ class AuthorizationTest(BaseComputeTest):
A Get Console Output for another user's server should fail
"""
self.alt_console_outputs_client.get_console_output(self.server['id'],
10)
10)

6
tempest/tests/compute/test_console_output.py
View File

@ -78,11 +78,11 @@ class ConsoleOutputTest(BaseComputeTest):
try:
resp, output = self.servers_client.reboot(self.server_id, 'SOFT')
self.servers_client.wait_for_server_status(self.server_id,
'REBOOT')
'REBOOT')
resp, server = self.servers_client.get_server(self.server_id)
if (server['status'] == 'REBOOT'):
resp, output = self.client.get_console_output(self.server_id,
10)
10)
self.assertEqual(200, resp.status)
self.assertNotEqual(output, None)
lines = len(output.split('\n'))
@ -91,4 +91,4 @@ class ConsoleOutputTest(BaseComputeTest):
self.fail("Could not capture instance in Reboot status")
finally:
self.servers_client.wait_for_server_status(self.server_id,
'ACTIVE')
'ACTIVE')

14
tempest/tests/compute/test_floating_ips_actions.py
View File

@ -89,8 +89,8 @@ class FloatingIPsTestBase(object):
#Creating the floating IP that is to be deleted in this method
resp, floating_ip_body = self.client.create_floating_ip()
#Storing the details of floating IP before deleting it
resp, floating_ip_details = \
self.client.get_floating_ip_details(floating_ip_body['id'])
cli_resp = self.client.get_floating_ip_details(floating_ip_body['id'])
resp, floating_ip_details = cli_resp
#Deleting the floating IP from the project
resp, body = self.client.delete_floating_ip(floating_ip_body['id'])
self.assertEqual(202, resp.status)
@ -171,8 +171,8 @@ class FloatingIPsTestBase(object):
"""
#Create server so as to use for Multiple association
resp, body = self.servers_client.create_server('floating-server2',
self.image_ref,
self.flavor_ref)
self.image_ref,
self.flavor_ref)
self.servers_client.wait_for_server_status(body['id'], 'ACTIVE')
self.new_server_id = body['id']
@ -222,8 +222,7 @@ class FloatingIPsTestBase(object):
' with out passing floating IP should raise BadRequest')
class FloatingIPsTestJSON(base.BaseComputeTestJSON,
FloatingIPsTestBase):
class FloatingIPsTestJSON(base.BaseComputeTestJSON, FloatingIPsTestBase):
@classmethod
def setUpClass(cls):
super(FloatingIPsTestJSON, cls).setUpClass()
@ -235,8 +234,7 @@ class FloatingIPsTestJSON(base.BaseComputeTestJSON,
super(FloatingIPsTestJSON, cls).tearDownClass()
class FloatingIPsTestXML(base.BaseComputeTestXML,
FloatingIPsTestBase):
class FloatingIPsTestXML(base.BaseComputeTestXML, FloatingIPsTestBase):
@classmethod
def setUpClass(cls):
super(FloatingIPsTestXML, cls).setUpClass()

9
tempest/tests/compute/test_image_metadata.py
View File

@ -134,8 +134,7 @@ class ImagesMetadataTest(BaseComputeTest):
def test_get_nonexistant_image_metadata_item(self):
"""Negative test: Get on nonexistant image should not happen"""
try:
resp, metadata = self.client.get_image_metadata_item(999,
'key2')
resp, metadata = self.client.get_image_metadata_item(999, 'key2')
except exceptions.NotFound:
pass
else:
@ -158,8 +157,7 @@ class ImagesMetadataTest(BaseComputeTest):
nonexistant image"""
meta = {'key1': 'alt'}
try:
resp, body = self.client.set_image_metadata_item(999,
'key1', meta)
resp, body = self.client.set_image_metadata_item(999, 'key1', meta)
resp, metadata = self.client.list_image_metadata(999)
except exceptions.NotFound:
pass
@ -171,8 +169,7 @@ class ImagesMetadataTest(BaseComputeTest):
"""Negative test: Shouldnt be able to delete metadata
item from nonexistant image"""
try:
resp, body = self.client.delete_image_metadata_item(999,
'key1')
resp, body = self.client.delete_image_metadata_item(999, 'key1')
resp, metadata = self.client.list_image_metadata(999)
except exceptions.NotFound:
pass

8
tempest/tests/compute/test_images.py
View File

@ -120,8 +120,8 @@ class ImagesTestBase(object):
if (resp['status'] is not None):
image_id = parse_image_id(resp['location'])
resp, _ = self.client.delete_image(image_id)
self.fail("An image should not be created"
" with invalid server id")
self.fail("An image should not be created "
"with invalid server id")
@attr(type='negative')
@unittest.skipUnless(compute.MULTI_USER, 'Second user not configured')
@ -282,8 +282,8 @@ class ImagesTestBase(object):
pass
else:
self.fail("DELETE image request should rasie NotFound exception"
"when requested with invalid image")
self.fail("DELETE image request should rasie NotFound exception "
"when requested with invalid image")
@attr(type='negative')
def test_delete_non_existent_image(self):

4
tempest/tests/compute/test_keypairs.py
View File

@ -94,8 +94,8 @@ class KeyPairsTestBase(object):
self.assertTrue(public_key is not None,
"Field public_key is empty or not found.")
except:
self.fail("GET keypair details requested by keypair name"
" has failed")
self.fail("GET keypair details requested by keypair name "
"has failed")
finally:
resp, _ = self.client.delete_keypair(k_name)
self.assertEqual(202, resp.status)

8
tempest/tests/compute/test_security_groups.py
View File

@ -49,9 +49,9 @@ class SecurityGroupsTest(object):
missing_sgs =\
[sg for sg in security_group_list if sg not in fetched_list]
self.assertFalse(missing_sgs,
"Failed to find Security Group %s in fetched list"
% ', '.join(m_group['name']
for m_group in missing_sgs))
"Failed to find Security Group %s in fetched "
"list" % ', '.join(m_group['name']
for m_group in missing_sgs))
finally:
#Delete all the Security Groups created in this method
for securitygroup in security_group_list:
@ -252,7 +252,7 @@ class SecurityGroupsTest(object):
pass
else:
self.fail('Should not be able to delete a Security Group'
'with out passing ID')
'with out passing ID')
def test_server_security_groups(self):
"""

6
tempest/tests/compute/test_server_personality.py
View File

@ -57,8 +57,8 @@ class ServerPersonalityTestBase(object):
name = rand_name('server')
file_contents = 'This is a test file.'
resp, max_file_limit = self.user_client.\
get_personality_file_limit()
cli_resp = self.user_client.get_personality_file_limit()
resp, max_file_limit = cli_resp
self.assertEqual(200, resp.status)
personality = []
@ -83,7 +83,7 @@ class ServerPersonalityTestBase(object):
class ServerPersonalityTestXML(base.BaseComputeTestXML,
ServerPersonalityTestBase):
ServerPersonalityTestBase):
@classmethod
def setUpClass(cls):
cls._interface = "xml"

6
tempest/tests/compute/test_servers_negative.py
View File

@ -58,9 +58,9 @@ class ServersNegativeTest(BaseComputeTest):
try:
resp, server = self.client.create_server('test',
self.image_ref,
self.flavor_ref,
personality=personality)
self.image_ref,
self.flavor_ref,
personality=personality)
except exceptions.BadRequest:
pass
else:

28
tempest/tests/compute/test_volumes_list.py
View File

@ -37,13 +37,14 @@ class VolumesTestBase(object):
resp, fetched_list = self.client.list_volumes()
self.assertEqual(200, resp.status)
# Now check if all the Volumes created in setup are in fetched list
missing_volumes = \
[v for v in self.volume_list if v not in fetched_list]
missing_volumes = [
v for v in self.volume_list if v not in fetched_list
]
self.assertFalse(missing_volumes,
"Failed to find volume %s in fetched list"
% ', '.join(m_vol['displayName']
for m_vol in missing_volumes))
"Failed to find volume %s in fetched list" %
', '.join(m_vol['displayName']
for m_vol in missing_volumes))
def test_volume_list_with_details(self):
"""Should return the list of Volumes with details"""
@ -51,13 +52,14 @@ class VolumesTestBase(object):
resp, fetched_list = self.client.list_volumes_with_detail()
self.assertEqual(200, resp.status)
#Now check if all the Volumes created in setup are in fetched list
missing_volumes = \
[v for v in self.volume_list if v not in fetched_list]
missing_volumes = [
v for v in self.volume_list if v not in fetched_list
]
self.assertFalse(missing_volumes,
"Failed to find volume %s in fetched list"
% ', '.join(m_vol['displayName']
for m_vol in missing_volumes))
"Failed to find volume %s in fetched list" %
', '.join(m_vol['displayName']
for m_vol in missing_volumes))
class VolumesTestXML(base.BaseComputeTestXML, VolumesTestBase):
@ -77,8 +79,7 @@ class VolumesTestXML(base.BaseComputeTestXML, VolumesTestBase):
resp, volume = cls.client.create_volume(size=1,
display_name=v_name,
metadata=metadata)
cls.client.wait_for_volume_status(volume['id'],
'available')
cls.client.wait_for_volume_status(volume['id'], 'available')
resp, volume = cls.client.get_volume(volume['id'])
cls.volume_list.append(volume)
cls.volume_id_list.append(volume['id'])
@ -124,8 +125,7 @@ class VolumesTestJSON(base.BaseComputeTestJSON, VolumesTestBase):
resp, volume = cls.client.create_volume(size=1,
display_name=v_name,
metadata=metadata)
cls.client.wait_for_volume_status(volume['id'],
'available')
cls.client.wait_for_volume_status(volume['id'], 'available')
resp, volume = cls.client.get_volume(volume['id'])
cls.volume_list.append(volume)
cls.volume_id_list.append(volume['id'])

4
tempest/tests/compute/test_volumes_negative.py
View File

@ -138,7 +138,7 @@ class VolumesNegativeTestBase(object):
class VolumesNegativeTestXML(base.BaseComputeTestXML,
VolumesNegativeTestBase):
VolumesNegativeTestBase):
@classmethod
def setUpClass(cls):
cls._interface = "xml"
@ -147,7 +147,7 @@ class VolumesNegativeTestXML(base.BaseComputeTestXML,
class VolumesNegativeTestJSON(base.BaseComputeTestJSON,
VolumesNegativeTestBase):
VolumesNegativeTestBase):
@classmethod
def setUpClass(cls):
cls._interface = "json"

2
tempest/tests/identity/admin/test_roles.py
View File

@ -273,7 +273,7 @@ class UserRolesTestJSON(RolesTestJSON,
class UserRolesTestXML(RolesTestXML,
UserRolesTestBase):
UserRolesTestBase):
@classmethod
def setUpClass(cls):

3
tempest/tests/identity/admin/test_tenants.py
View File

@ -261,8 +261,7 @@ class TenantsTestJSON(base.BaseIdentityAdminTestJSON,
TenantsTestBase.setUpClass(cls)
class TenantsTestXML(base.BaseIdentityAdminTestXML,
TenantsTestBase):
class TenantsTestXML(base.BaseIdentityAdminTestXML, TenantsTestBase):
@classmethod
def setUpClass(cls):

19
tempest/tests/identity/admin/test_users.py
View File

@ -118,8 +118,8 @@ class UsersTestBase(object):
# Delete the token from database
self.client.delete_token(token)
self.assertRaises(exceptions.Unauthorized, self.client.create_user,
self.alt_user, self.alt_password,
self.data.tenant['id'], self.alt_email)
self.alt_user, self.alt_password,
self.data.tenant['id'], self.alt_email)
# Unset the token to allow further tests to generate a new token
self.client.clear_auth()
@ -230,7 +230,7 @@ class UsersTestBase(object):
self.data.setup_test_user()
resp, users = self.client.get_users()
self.assertIn(self.data.test_user, [u['name'] for u in users],
"Could not find %s" % self.data.test_user)
"Could not find %s" % self.data.test_user)
@attr(type='negative')
def test_get_users_by_unauthorized_user(self):
@ -272,8 +272,8 @@ class UsersTestBase(object):
missing_users =\
[user for user in user_ids if user not in fetched_user_ids]
self.assertEqual(0, len(missing_users),
"Failed to find user %s in fetched list"
% ', '.join(m_user for m_user in missing_users))
"Failed to find user %s in fetched list" %
', '.join(m_user for m_user in missing_users))
@attr(type='positive')
def test_list_users_with_roles_for_tenant(self):
@ -304,8 +304,8 @@ class UsersTestBase(object):
missing_users =\
[user for user in user_ids if user not in fetched_user_ids]
self.assertEqual(0, len(missing_users),
"Failed to find user %s in fetched list"
% ', '.join(m_user for m_user in missing_users))
"Failed to find user %s in fetched list" %
', '.join(m_user for m_user in missing_users))
@attr(type='negative')
def test_list_users_with_invalid_tenant(self):
@ -330,7 +330,7 @@ class UsersTestBase(object):
fail.append(invalid)
if len(fail) != 0:
self.fail('Should raise Not Found when list users with invalid'
'tenant ids %s' % fail)
'tenant ids %s' % fail)
class UsersTestJSON(base.BaseIdentityAdminTestJSON,
@ -340,8 +340,7 @@ class UsersTestJSON(base.BaseIdentityAdminTestJSON,
super(UsersTestJSON, cls).setUpClass()
class UsersTestXML(base.BaseIdentityAdminTestXML,
UsersTestBase):
class UsersTestXML(base.BaseIdentityAdminTestXML, UsersTestBase):
@classmethod
def setUpClass(cls):
super(UsersTestXML, cls).setUpClass()

2
tempest/tests/volume/base.py
View File

@ -57,7 +57,7 @@ class BaseVolumeTest(unittest.TestCase):
cls.volumes = {}
skip_msg = ("%s skipped as Cinder endpoint is not available" %
cls.__name__)
cls.__name__)
try:
cls.volumes_client.keystone_auth(cls.os.username,
cls.os.password,

4
tempest/tests/volume/test_volumes_actions.py
View File

@ -70,8 +70,8 @@ class VolumesActionsTest(BaseVolumeTest):
"""Verify that a volume's attachment information is retrieved"""
mountpoint = '/dev/vdc'
resp, body = self.client.attach_volume(self.volume['id'],
self.server['id'],
mountpoint)
self.server['id'],
mountpoint)
self.client.wait_for_volume_status(self.volume['id'], 'in-use')
self.assertEqual(202, resp.status)
try:

18
tempest/tests/volume/test_volumes_list.py
View File

@ -41,9 +41,9 @@ class VolumesListTestBase(object):
# Now check if all the volumes created in setup are in fetched list
missing_vols = [v for v in self.volume_list if v not in fetched_list]
self.assertFalse(missing_vols,
"Failed to find volume %s in fetched list"
% ', '.join(m_vol['display_name']
for m_vol in missing_vols))
"Failed to find volume %s in fetched list" %
', '.join(m_vol['display_name']
for m_vol in missing_vols))
@attr(type='smoke')
def test_volume_list_with_details(self):
@ -54,9 +54,9 @@ class VolumesListTestBase(object):
# Verify that all the volumes are returned
missing_vols = [v for v in self.volume_list if v not in fetched_list]
self.assertFalse(missing_vols,
"Failed to find volume %s in fetched list"
% ', '.join(m_vol['display_name']
for m_vol in missing_vols))
"Failed to find volume %s in fetched list" %
', '.join(m_vol['display_name']
for m_vol in missing_vols))
class VolumeListTestXML(base.BaseVolumeTestXML, VolumesListTestBase):
@ -76,8 +76,7 @@ class VolumeListTestXML(base.BaseVolumeTestXML, VolumesListTestBase):
resp, volume = cls.client.create_volume(size=1,
display_name=v_name,
metadata=metadata)
cls.client.wait_for_volume_status(volume['id'],
'available')
cls.client.wait_for_volume_status(volume['id'], 'available')
resp, volume = cls.client.get_volume(volume['id'])
cls.volume_list.append(volume)
cls.volume_id_list.append(volume['id'])
@ -123,8 +122,7 @@ class VolumeListTestJSON(base.BaseVolumeTestJSON, VolumesListTestBase):
resp, volume = cls.client.create_volume(size=1,
display_name=v_name,
metadata=metadata)
cls.client.wait_for_volume_status(volume['id'],
'available')
cls.client.wait_for_volume_status(volume['id'], 'available')
resp, volume = cls.client.get_volume(volume['id'])
cls.volume_list.append(volume)
cls.volume_id_list.append(volume['id'])

2
tox.ini
View File

@ -15,4 +15,4 @@ commands = nosetests {posargs}
[testenv:pep8]
deps = pep8==1.3.3
commands = pep8 --ignore=E121,E122,E123,E124,E125,E126,E127 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack,kong .
commands = pep8 --ignore=E121,E122,E123,E124,E125,E126 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack,kong .