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:
parent
79d8d361a5
commit
e0884a3021
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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,8 +65,8 @@ 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,
|
||||
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']
|
||||
@ -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']
|
||||
|
||||
|
@ -61,9 +61,7 @@ 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)
|
||||
body = self._parse_body(etree.fromstring(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
|
||||
|
||||
@ -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))
|
||||
@ -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,
|
||||
|
@ -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
|
||||
|
||||
|
@ -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,32 +107,30 @@ 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']
|
||||
|
||||
|
@ -42,15 +42,13 @@ 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):
|
||||
@ -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))
|
||||
|
@ -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,28 +294,26 @@ 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),
|
||||
resp, body = self.put('servers/%s/metadata/%s' % (str(server_id), key),
|
||||
post_body, self.headers)
|
||||
body = json.loads(body)
|
||||
return resp, body['meta']
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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')
|
||||
@ -352,8 +351,7 @@ class AuthorizationTest(BaseComputeTest):
|
||||
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'],
|
||||
@ -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'],
|
||||
|
@ -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)
|
||||
@ -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()
|
||||
|
@ -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
|
||||
|
@ -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,7 +282,7 @@ class ImagesTestBase(object):
|
||||
pass
|
||||
|
||||
else:
|
||||
self.fail("DELETE image request should rasie NotFound exception"
|
||||
self.fail("DELETE image request should rasie NotFound exception "
|
||||
"when requested with invalid image")
|
||||
|
||||
@attr(type='negative')
|
||||
|
@ -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)
|
||||
|
@ -49,8 +49,8 @@ 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']
|
||||
"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
|
||||
|
@ -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 = []
|
||||
|
@ -37,12 +37,13 @@ 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']
|
||||
"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):
|
||||
@ -51,12 +52,13 @@ 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']
|
||||
"Failed to find volume %s in fetched list" %
|
||||
', '.join(m_vol['displayName']
|
||||
for m_vol in missing_volumes))
|
||||
|
||||
|
||||
@ -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'])
|
||||
|
@ -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):
|
||||
|
@ -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):
|
||||
@ -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()
|
||||
|
@ -41,8 +41,8 @@ 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']
|
||||
"Failed to find volume %s in fetched list" %
|
||||
', '.join(m_vol['display_name']
|
||||
for m_vol in missing_vols))
|
||||
|
||||
@attr(type='smoke')
|
||||
@ -54,8 +54,8 @@ 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']
|
||||
"Failed to find volume %s in fetched list" %
|
||||
', '.join(m_vol['display_name']
|
||||
for m_vol in missing_vols))
|
||||
|
||||
|
||||
@ -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
2
tox.ini
@ -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 .
|
||||
|
Loading…
Reference in New Issue
Block a user