openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Fix E128 failures in novaclient/tests"

This commit is contained in:
Jenkins 2014-11-20 00:07:44 +00:00 committed by Gerrit Code Review
parent e138750beb 2126b93e68
commit ae0890ad69
22 changed files with 249 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
novaclient/tests/fixture_data/servers.py
View File

@ -346,7 +346,8 @@ class V1(Base):
# tI2/++UsXVg3ow6ItqCJGgdNuGG5JB+bslDHWPxROpesEIHdczk46HCpHQN8f1sk
# Hi/fmZZNQQqj1Ijq0caOIw==
get_server_password = {'password':
get_server_password = {
'password':
'OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r'
'qG447iRz0uTEEYq3RAYJk1mh3mMIRVl27t8MtIecR5ggVVbz1S9AwXJQypDKl0ho'
'QFvhCBcMWPohyGewDJOhDbtuN1IoFI9G55ZvFwCm5y7m7B2aVcoLeIsJZE4PLsIw'
@ -543,7 +544,8 @@ class V3(Base):
def post_servers(self, request, context):
body = jsonutils.loads(request.body)
assert set(body.keys()) <= set(['server'])
fakes.assert_has_keys(body['server'],
fakes.assert_has_keys(
body['server'],
required=['name', 'image_ref', 'flavor_ref'],
optional=['metadata', 'personality',
'os-scheduler-hints:scheduler_hints'])

3
novaclient/tests/test_client.py
View File

@ -371,7 +371,8 @@ class ClientTest(utils.TestCase):
'X-Auth-Token': 'totally_bogus'}
})
cs.http_log_req('GET', '/foo', {'headers': {},
'data': '{"auth": {"passwordCredentials": '
'data':
'{"auth": {"passwordCredentials": '
'{"password": "zhaoqin"}}}'})
output = self.logger.output.split('\n')

9
novaclient/tests/v1_1/contrib/fakes.py
View File

@ -26,17 +26,20 @@ class FakeClient(fakes.FakeClient):
class FakeHTTPClient(fakes.FakeHTTPClient):
def get_os_tenant_networks(self):
return (200, {}, {'networks': [{"label": "1", "cidr": "10.0.0.0/24",
return (200, {}, {
'networks': [{"label": "1", "cidr": "10.0.0.0/24",
'project_id': '4ffc664c198e435e9853f2538fbcd7a7',
'id': '1'}]})
def get_os_tenant_networks_1(self, **kw):
return (200, {}, {'network': {"label": "1", "cidr": "10.0.0.0/24",
return (200, {}, {
'network': {"label": "1", "cidr": "10.0.0.0/24",
'project_id': '4ffc664c198e435e9853f2538fbcd7a7',
'id': '1'}})
def post_os_tenant_networks(self, **kw):
return (201, {}, {'network': {"label": "1", "cidr": "10.0.0.0/24",
return (201, {}, {
'network': {"label": "1", "cidr": "10.0.0.0/24",
'project_id': '4ffc664c198e435e9853f2538fbcd7a7',
'id': '1'}})

3
novaclient/tests/v1_1/contrib/test_assisted_volume_snapshots.py
View File

@ -37,5 +37,6 @@ class AssistedVolumeSnapshotsTestCase(utils.TestCase):
def test_delete_snap(self):
cs.assisted_volume_snapshots.delete('x', {})
cs.assert_called('DELETE',
cs.assert_called(
'DELETE',
'/os-assisted-volume-snapshots/x?delete_info={}')

8
novaclient/tests/v1_1/contrib/test_instance_actions.py
View File

@ -30,12 +30,14 @@ class InstanceActionExtensionTests(utils.TestCase):
def test_list_instance_actions(self):
server_uuid = '1234'
cs.instance_action.list(server_uuid)
cs.assert_called('GET', '/servers/%s/os-instance-actions' %
cs.assert_called(
'GET', '/servers/%s/os-instance-actions' %
server_uuid)
def test_get_instance_action(self):
server_uuid = '1234'
request_id = 'req-abcde12345'
cs.instance_action.get(server_uuid, request_id)
cs.assert_called('GET', '/servers/%s/os-instance-actions/%s' %
(server_uuid, request_id))
cs.assert_called(
'GET', '/servers/%s/os-instance-actions/%s'
% (server_uuid, request_id))

91
novaclient/tests/v1_1/fakes.py
View File

@ -95,7 +95,8 @@ class FakeHTTPClient(base_client.HTTPClient):
def get_os_agents(self, **kw):
hypervisor = kw.get('hypervisor', 'kvm')
return (200, {}, {'agents':
return (200, {}, {
'agents':
[{'hypervisor': hypervisor,
'os': 'win',
'architecture': 'x86',
@ -109,8 +110,7 @@ class FakeHTTPClient(base_client.HTTPClient):
'version': '16.0',
'url': 'xxx://xxxx/xxx/xxx1',
'md5hash': 'add6bb58e139be103324d04d82d8f546',
'id': 2},
]})
'id': 2}]})
def post_os_agents(self, body):
return (200, {}, {'agent': {
@ -366,7 +366,8 @@ class FakeHTTPClient(base_client.HTTPClient):
def post_servers(self, body, **kw):
assert set(body.keys()) <= set(['server', 'os:scheduler_hints'])
fakes.assert_has_keys(body['server'],
fakes.assert_has_keys(
body['server'],
required=['name', 'imageRef', 'flavorRef'],
optional=['metadata', 'personality'])
if 'personality' in body['server']:
@ -379,7 +380,8 @@ class FakeHTTPClient(base_client.HTTPClient):
def post_os_volumes_boot(self, body, **kw):
assert set(body.keys()) <= set(['server', 'os:scheduler_hints'])
fakes.assert_has_keys(body['server'],
fakes.assert_has_keys(
body['server'],
required=['name', 'flavorRef'],
optional=['imageRef'])
@ -487,15 +489,19 @@ class FakeHTTPClient(base_client.HTTPClient):
#
def get_servers_1234_ips(self, **kw):
return (200, {}, {'addresses':
return (200, {}, {
'addresses':
self.get_servers_1234()[1]['server']['addresses']})
def get_servers_1234_ips_public(self, **kw):
return (200, {}, {'public':
return (200, {}, {
'public':
self.get_servers_1234_ips()[1]['addresses']['public']})
def get_servers_1234_ips_private(self, **kw):
return (200, {}, {'private':
return (
200, {},
{'private':
self.get_servers_1234_ips()[1]['addresses']['private']})
def delete_servers_1234_ips_public_1_2_3_4(self, **kw):
@ -519,7 +525,8 @@ class FakeHTTPClient(base_client.HTTPClient):
# tI2/++UsXVg3ow6ItqCJGgdNuGG5JB+bslDHWPxROpesEIHdczk46HCpHQN8f1sk
# Hi/fmZZNQQqj1Ijq0caOIw==
def get_servers_1234_os_server_password(self, **kw):
return (200, {}, {'password':
return (200, {}, {
'password':
'OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r'
'qG447iRz0uTEEYq3RAYJk1mh3mMIRVl27t8MtIecR5ggVVbz1S9AwXJQypDKl0ho'
'QFvhCBcMWPohyGewDJOhDbtuN1IoFI9G55ZvFwCm5y7m7B2aVcoLeIsJZE4PLsIw'
@ -797,21 +804,25 @@ class FakeHTTPClient(base_client.HTTPClient):
)
def get_flavors_1_os_extra_specs(self, **kw):
return (200,
return (
200,
{},
{'extra_specs': {"k1": "v1"}})
def get_flavors_2_os_extra_specs(self, **kw):
return (200,
return (
200,
{},
{'extra_specs': {"k2": "v2"}})
def get_flavors_aa1_os_extra_specs(self, **kw):
return (200, {},
return (
200, {},
{'extra_specs': {"k3": "v3"}})
def get_flavors_4_os_extra_specs(self, **kw):
return (200,
return (
200,
{},
{'extra_specs': {"k4": "v4"}})
@ -819,14 +830,16 @@ class FakeHTTPClient(base_client.HTTPClient):
assert list(body) == ['extra_specs']
fakes.assert_has_keys(body['extra_specs'],
required=['k1'])
return (200,
return (
200,
{},
{'extra_specs': {"k1": "v1"}})
def post_flavors_4_os_extra_specs(self, body, **kw):
assert list(body) == ['extra_specs']
return (200,
return (
200,
{},
body)
@ -841,10 +854,10 @@ class FakeHTTPClient(base_client.HTTPClient):
return (404, {}, None)
def get_flavors_2_os_flavor_access(self, **kw):
return (200, {}, {'flavor_access': [
{'flavor_id': '2', 'tenant_id': 'proj1'},
{'flavor_id': '2', 'tenant_id': 'proj2'}
]})
return (
200, {},
{'flavor_access': [{'flavor_id': '2', 'tenant_id': 'proj1'},
{'flavor_id': '2', 'tenant_id': 'proj2'}]})
def post_flavors_2_action(self, body, **kw):
return (202, {}, self.get_flavors_2_os_flavor_access()[2])
@ -871,18 +884,20 @@ class FakeHTTPClient(base_client.HTTPClient):
)
def get_os_floating_ips_1(self, **kw):
return (200, {}, {'floating_ip':
{'id': 1, 'fixed_ip': '10.0.0.1', 'ip': '11.0.0.1'}
})
return (
200, {}, {'floating_ip': {'id': 1, 'fixed_ip': '10.0.0.1',
'ip': '11.0.0.1'}})
def post_os_floating_ips(self, body):
if body.get('pool'):
return (200, {}, {'floating_ip':
{'id': 1, 'fixed_ip': '10.0.0.1', 'ip': '11.0.0.1',
return (
200, {}, {'floating_ip': {'id': 1, 'fixed_ip': '10.0.0.1',
'ip': '11.0.0.1',
'pool': 'nova'}})
else:
return (200, {}, {'floating_ip':
{'id': 1, 'fixed_ip': '10.0.0.1', 'ip': '11.0.0.1',
return (
200, {}, {'floating_ip': {'id': 1, 'fixed_ip': '10.0.0.1',
'ip': '11.0.0.1',
'pool': None}})
def delete_os_floating_ips_1(self, **kw):
@ -1016,7 +1031,8 @@ class FakeHTTPClient(base_client.HTTPClient):
assert list(body) == ['metadata']
fakes.assert_has_keys(body['metadata'],
required=['test_key'])
return (200,
return (
200,
{},
{'metadata': self.get_images_1()[2]['image']['metadata']})
@ -1569,23 +1585,20 @@ class FakeHTTPClient(base_client.HTTPClient):
def get_os_services(self, **kw):
host = kw.get('host', 'host1')
binary = kw.get('binary', 'nova-compute')
return (200, {}, {'services':
[{'binary': binary,
return (200, {}, {'services': [{'binary': binary,
'host': host,
'zone': 'nova',
'status': 'enabled',
'state': 'up',
'updated_at': datetime.datetime(
2012, 10, 29, 13, 42, 2
)},
2012, 10, 29, 13, 42, 2)},
{'binary': binary,
'host': host,
'zone': 'nova',
'status': 'disabled',
'state': 'down',
'updated_at': datetime.datetime(
2012, 9, 18, 8, 3, 38
)},
2012, 9, 18, 8, 3, 38)},
]})
def put_os_services_enable(self, body, **kw):
@ -1599,7 +1612,8 @@ class FakeHTTPClient(base_client.HTTPClient):
'status': 'disabled'}})
def put_os_services_disable_log_reason(self, body, **kw):
return (200, {}, {'service': {'host': body['host'],
return (200, {}, {'service': {
'host': body['host'],
'binary': body['binary'],
'status': 'disabled',
'disabled_reason': body['disabled_reason']}})
@ -1611,8 +1625,7 @@ class FakeHTTPClient(base_client.HTTPClient):
# Fixed IPs
#
def get_os_fixed_ips_192_168_1_1(self, *kw):
return (200, {}, {"fixed_ip":
{'cidr': '192.168.1.0/24',
return (200, {}, {"fixed_ip": {'cidr': '192.168.1.0/24',
'address': '192.168.1.1',
'hostname': 'foo',
'host': 'bar'}})
@ -1636,8 +1649,7 @@ class FakeHTTPClient(base_client.HTTPClient):
def get_os_hosts(self, **kw):
zone = kw.get('zone', 'nova1')
return (200, {}, {'hosts':
[{'host': 'host1',
return (200, {}, {'hosts': [{'host': 'host1',
'service': 'nova-compute',
'zone': zone},
{'host': 'host1',
@ -1793,7 +1805,8 @@ class FakeHTTPClient(base_client.HTTPClient):
def get_os_networks(self, **kw):
return (200, {}, {'networks': [{"label": "1", "cidr": "10.0.0.0/24",
'project_id': '4ffc664c198e435e9853f2538fbcd7a7',
'project_id':
'4ffc664c198e435e9853f2538fbcd7a7',
'id': '1', 'vlan': '1234'}]})
def delete_os_networks_1(self, **kw):

7
novaclient/tests/v1_1/test_agents.py
View File

@ -27,8 +27,8 @@ class AgentsTest(utils.FixturedTestCase):
('session', {'client_fixture_class': client.SessionV1})]
def stub_hypervisors(self, hypervisor='kvm'):
get_os_agents = {'agents':
[
get_os_agents = {
'agents': [
{
'hypervisor': hypervisor,
'os': 'win',
@ -76,8 +76,7 @@ class AgentsTest(utils.FixturedTestCase):
'/xxx/xxx/xxx',
'add6bb58e139be103324d04d82d8f546',
'xen')
body = {'agent': {
'url': '/xxx/xxx/xxx',
body = {'agent': {'url': '/xxx/xxx/xxx',
'hypervisor': 'xen',
'md5hash': 'add6bb58e139be103324d04d82d8f546',
'version': '7.0',

9
novaclient/tests/v1_1/test_security_group_rules.py
View File

@ -66,13 +66,16 @@ class SecurityGroupRulesTest(utils.FixturedTestCase):
def test_invalid_parameters_create(self):
self.assertRaises(exceptions.CommandError,
self.cs.security_group_rules.create,
1, "invalid_ip_protocol", 1, 65535, "10.0.0.0/16", 101)
1, "invalid_ip_protocol", 1, 65535,
"10.0.0.0/16", 101)
self.assertRaises(exceptions.CommandError,
self.cs.security_group_rules.create,
1, "tcp", "invalid_from_port", 65535, "10.0.0.0/16", 101)
1, "tcp", "invalid_from_port", 65535,
"10.0.0.0/16", 101)
self.assertRaises(exceptions.CommandError,
self.cs.security_group_rules.create,
1, "tcp", 1, "invalid_to_port", "10.0.0.0/16", 101)
1, "tcp", 1, "invalid_to_port",
"10.0.0.0/16", 101)
def test_security_group_rule_str(self):
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,

39
novaclient/tests/v1_1/test_shell.py
View File

@ -841,16 +841,19 @@ class ShellTest(utils.TestCase):
def test_list_by_tenant(self):
self.run_command('list --tenant fake_tenant')
self.assert_called('GET',
self.assert_called(
'GET',
'/servers/detail?all_tenants=1&tenant_id=fake_tenant')
def test_list_by_user(self):
self.run_command('list --user fake_user')
self.assert_called('GET',
self.assert_called(
'GET',
'/servers/detail?all_tenants=1&user_id=fake_user')
def test_list_fields(self):
output = self.run_command('list --fields '
output = self.run_command(
'list --fields '
'host,security_groups,OS-EXT-MOD:some_thing')
self.assert_called('GET', '/servers/detail')
self.assertIn('computenode1', output)
@ -1661,15 +1664,19 @@ class ShellTest(utils.TestCase):
self.assert_called('GET', '/os-hypervisors/statistics')
def test_quota_show(self):
self.run_command('quota-show --tenant '
self.run_command(
'quota-show --tenant '
'97f4c221bff44578b0300df4ef119353')
self.assert_called('GET',
self.assert_called(
'GET',
'/os-quota-sets/97f4c221bff44578b0300df4ef119353')
def test_user_quota_show(self):
self.run_command('quota-show --tenant '
self.run_command(
'quota-show --tenant '
'97f4c221bff44578b0300df4ef119353 --user u1')
self.assert_called('GET',
self.assert_called(
'GET',
'/os-quota-sets/97f4c221bff44578b0300df4ef119353?user_id=u1')
def test_quota_show_no_tenant(self):
@ -1677,9 +1684,11 @@ class ShellTest(utils.TestCase):
self.assert_called('GET', '/os-quota-sets/tenant_id')
def test_quota_defaults(self):
self.run_command('quota-defaults --tenant '
self.run_command(
'quota-defaults --tenant '
'97f4c221bff44578b0300df4ef119353')
self.assert_called('GET',
self.assert_called(
'GET',
'/os-quota-sets/97f4c221bff44578b0300df4ef119353/defaults')
def test_quota_defaults_no_tenant(self):
@ -1736,7 +1745,8 @@ class ShellTest(utils.TestCase):
self.run_command('quota-delete --tenant '
'97f4c221bff44578b0300df4ef119353 '
'--user u1')
self.assert_called('DELETE',
self.assert_called(
'DELETE',
'/os-quota-sets/97f4c221bff44578b0300df4ef119353?user_id=u1')
def test_quota_class_show(self):
@ -1767,7 +1777,8 @@ class ShellTest(utils.TestCase):
self.assert_called('GET', '/os-networks')
def test_network_list_fields(self):
output = self.run_command('network-list --fields '
output = self.run_command(
'network-list --fields '
'vlan,project_id')
self.assert_called('GET', '/os-networks')
self.assertIn('1234', output)
@ -2133,7 +2144,8 @@ class ShellTest(utils.TestCase):
def test_instance_action_get(self):
self.run_command('instance-action sample-server req-abcde12345')
self.assert_called('GET',
self.assert_called(
'GET',
'/servers/1234/os-instance-actions/req-abcde12345')
def test_cell_show(self):
@ -2244,7 +2256,8 @@ class ShellTest(utils.TestCase):
mock.mock_open(read_data='FAKE_PUBLIC_KEY'))
def test_keypair_import(self):
self.run_command('keypair-add --pub-key test.pub test')
self.assert_called('POST', '/os-keypairs', {
self.assert_called(
'POST', '/os-keypairs', {
'keypair': {'public_key': 'FAKE_PUBLIC_KEY', 'name': 'test'}})
def test_keypair_list(self):

6
novaclient/tests/v1_1/test_usage.py
View File

@ -34,7 +34,8 @@ class UsageTest(utils.TestCase):
now = datetime.datetime.now()
usages = self.cs.usage.list(now, now, detailed)
self.cs.assert_called('GET',
self.cs.assert_called(
'GET',
"/os-simple-tenant-usage?" +
("start=%s&" % now.isoformat()) +
("end=%s&" % now.isoformat()) +
@ -48,7 +49,8 @@ class UsageTest(utils.TestCase):
now = datetime.datetime.now()
u = self.cs.usage.get("tenantfoo", now, now)
self.cs.assert_called('GET',
self.cs.assert_called(
'GET',
"/os-simple-tenant-usage/tenantfoo?" +
("start=%s&" % now.isoformat()) +
("end=%s" % now.isoformat()))