From dfeaf988a11fe2d7cee4533ef89e2544fd70e965 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Tue, 13 Sep 2011 16:38:11 -0500 Subject: pep8 --- nova/tests/api/openstack/test_images.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index c63d1203a..10c7663ff 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1182,7 +1182,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): # Snapshot for User 1 server_ref = 'http://localhost/v1.1/servers/42' snapshot_properties = {'instance_ref': server_ref, 'user_id': 'fake'} - statuses = ('queued', 'saving', 'active','killed', + statuses = ('queued', 'saving', 'active', 'killed', 'deleted', 'pending_delete') for status in statuses: add_fixture(id=image_id, name='%s snapshot' % status, -- cgit From 1a8f5bb3961f000d3159fd7478e8644afed5dc8d Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Wed, 14 Sep 2011 10:17:25 -0500 Subject: skip a bunch of tests for the moment since we will need to rework them --- nova/tests/api/openstack/test_servers.py | 2 +- nova/tests/test_compute.py | 4 ++++ nova/tests/test_metadata.py | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index f0a1c5ce5..6394a80f2 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -1208,7 +1208,7 @@ class ServersTest(test.TestCase): self.assertEqual(servers[0]['id'], 100) def test_tenant_id_filter_converts_to_project_id_for_admin(self): - def fake_get_all(context, filters=None): + def fake_get_all(context, filters=None, instances=None): self.assertNotEqual(filters, None) self.assertEqual(filters['project_id'], 'faketenant') self.assertFalse(filters.get('tenant_id')) diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 4d463572b..886ace1a9 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1002,6 +1002,7 @@ class ComputeTestCase(test.TestCase): db.instance_destroy(c, instance_id2) db.instance_destroy(c, instance_id3) + @test.skip_test("need to fix/move") def test_get_by_fixed_ip(self): """Test getting 1 instance by Fixed IP""" c = context.get_admin_context() @@ -1051,6 +1052,7 @@ class ComputeTestCase(test.TestCase): db.instance_destroy(c, instance_id1) db.instance_destroy(c, instance_id2) + @test.skip_test("need to move/fix") def test_get_all_by_ip_regexp(self): """Test searching by Floating and Fixed IP""" c = context.get_admin_context() @@ -1125,6 +1127,7 @@ class ComputeTestCase(test.TestCase): db.instance_destroy(c, instance_id2) db.instance_destroy(c, instance_id3) + @test.skip_test("need to move/fix") def test_get_all_by_ipv6_regexp(self): """Test searching by IPv6 address""" @@ -1182,6 +1185,7 @@ class ComputeTestCase(test.TestCase): db.instance_destroy(c, instance_id2) db.instance_destroy(c, instance_id3) + @test.skip_test("need to fix/move") def test_get_all_by_multiple_options_at_once(self): """Test searching by multiple options at once""" c = context.get_admin_context() diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index b06e5c136..f63c833e8 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -75,13 +75,16 @@ class MetadataTestCase(test.TestCase): request.remote_addr = "127.0.0.1" return request.get_response(self.app).body + @test.skip_test("need to fix remote IP filtering") def test_base(self): self.assertEqual(self.request('/'), 'meta-data/\nuser-data') + @test.skip_test("need to fix remote IP filtering") def test_user_data(self): self.instance['user_data'] = base64.b64encode('happy') self.assertEqual(self.request('/user-data'), 'happy') + @test.skip_test("need to fix remote IP filtering") def test_security_groups(self): def sg_get(*args, **kwargs): return [{'name': 'default'}, {'name': 'other'}] @@ -89,6 +92,7 @@ class MetadataTestCase(test.TestCase): self.assertEqual(self.request('/meta-data/security-groups'), 'default\nother') + @test.skip_test("need to fix remote IP filtering") def test_user_data_non_existing_fixed_address(self): self.stubs.Set(api, 'instance_get_all_by_filters', return_non_existing_server_by_address) @@ -97,6 +101,7 @@ class MetadataTestCase(test.TestCase): response = request.get_response(self.app) self.assertEqual(response.status_int, 404) + @test.skip_test("need to fix remote IP filtering") def test_user_data_none_fixed_address(self): self.stubs.Set(api, 'instance_get_all_by_filters', return_non_existing_server_by_address) @@ -105,12 +110,14 @@ class MetadataTestCase(test.TestCase): response = request.get_response(self.app) self.assertEqual(response.status_int, 500) + @test.skip_test("need to fix remote IP filtering") def test_user_data_invalid_url(self): request = webob.Request.blank('/user-data-invalid') request.remote_addr = "127.0.0.1" response = request.get_response(self.app) self.assertEqual(response.status_int, 404) + @test.skip_test("need to fix remote IP filtering") def test_user_data_with_use_forwarded_header(self): self.instance['user_data'] = ENCODE_USER_DATA_STRING self.flags(use_forwarded_for=True) -- cgit From c70595e1631cc2568599c457b503329cfa4b09c9 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Wed, 14 Sep 2011 11:06:28 -0500 Subject: fix the test so that it fakes out the network --- .../api/openstack/contrib/test_virtual_interfaces.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/contrib/test_virtual_interfaces.py b/nova/tests/api/openstack/contrib/test_virtual_interfaces.py index 1db253b35..0260e89d4 100644 --- a/nova/tests/api/openstack/contrib/test_virtual_interfaces.py +++ b/nova/tests/api/openstack/contrib/test_virtual_interfaces.py @@ -14,22 +14,20 @@ # under the License. import json -import stubout import webob from nova import test -from nova import compute +from nova import network from nova.tests.api.openstack import fakes from nova.api.openstack.contrib.virtual_interfaces import \ ServerVirtualInterfaceController -def compute_api_get(self, context, server_id): - return {'virtual_interfaces': [ - {'uuid': '00000000-0000-0000-0000-00000000000000000', - 'address': '00-00-00-00-00-00'}, - {'uuid': '11111111-1111-1111-1111-11111111111111111', - 'address': '11-11-11-11-11-11'}]} +def get_vifs_by_instance(self, context, server_id): + return [{'uuid': '00000000-0000-0000-0000-00000000000000000', + 'address': '00-00-00-00-00-00'}, + {'uuid': '11111111-1111-1111-1111-11111111111111111', + 'address': '11-11-11-11-11-11'}] class ServerVirtualInterfaceTest(test.TestCase): @@ -37,7 +35,8 @@ class ServerVirtualInterfaceTest(test.TestCase): def setUp(self): super(ServerVirtualInterfaceTest, self).setUp() self.controller = ServerVirtualInterfaceController() - self.stubs.Set(compute.api.API, "get", compute_api_get) + self.stubs.Set(network.api.API, "get_vifs_by_instance", + get_vifs_by_instance) def tearDown(self): super(ServerVirtualInterfaceTest, self).tearDown() -- cgit From 0a06f649f0ed18344fb9a8fb5d4c6fa1a3151554 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Wed, 14 Sep 2011 12:54:08 -0500 Subject: add stubs for future tests that need to be written --- nova/tests/test_network.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 926ea065a..ed77ccea5 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -4,8 +4,7 @@ # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at +# not use this file except in compliance with the License. You may obtain # a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # @@ -661,3 +660,12 @@ class CommonNetworkTestCase(test.TestCase): args = [None, 'foo', cidr, None, 10, 256, 'fd00::/48', None, None, None] self.assertTrue(manager.create_networks(*args)) + + def get_instance_ids_by_ip_regex(self): + pass + + def get_instance_ids_by_ipv6_regex(self): + pass + + def get_instance_ids_by_ip(self): + pass -- cgit From 4248cfe6864b81fcf6a2038bfb4c472039368c61 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Wed, 14 Sep 2011 14:13:26 -0500 Subject: pep8 --- nova/tests/test_network.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index ed77ccea5..6644a739a 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -4,7 +4,8 @@ # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain # a copy of the License at +# not use this file except in compliance with the License. You may obtain +# a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # @@ -662,10 +663,11 @@ class CommonNetworkTestCase(test.TestCase): self.assertTrue(manager.create_networks(*args)) def get_instance_ids_by_ip_regex(self): - pass + manager = self.FakeNetworkManager() + self.mox.StubOutWithMock(manager.db, 'virtual_interface_get_all') def get_instance_ids_by_ipv6_regex(self): - pass + manager = self.FakeNetworkManager() def get_instance_ids_by_ip(self): - pass + manager = self.FakeNetworkManager() -- cgit From 543fe5ced18a95faa6ef3f2b774beb052aa7d27f Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Wed, 14 Sep 2011 15:47:41 -0500 Subject: add tests --- nova/tests/test_network.py | 134 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 127 insertions(+), 7 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 6644a739a..30673050f 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -460,6 +460,26 @@ class CommonNetworkTestCase(test.TestCase): def network_get_all(self, context): raise exception.NoNetworksFound() + def virtual_interface_get_all(self, context): + floats = [{'address': '172.16.1.1'}, + {'address': '172.16.1.2'}, + {'address': '173.16.1.2'}] + + vifs = [{'instance_id': 0, + 'fixed_ipv6': '2001:db8::dcad:beff:feef:1', + 'fixed_ips': [{'address': '172.16.0.1', + 'floating_ips': [floats[0]]}]}, + {'instance_id': 1, + 'fixed_ipv6': '2001:db8::dcad:beff:feef:2', + 'fixed_ips': [{'address': '172.16.0.2', + 'floating_ips': [floats[1]]}]}, + {'instance_id': 2, + 'fixed_ipv6': '2002:db8::dcad:beff:feef:2', + 'fixed_ips': [{'address': '173.16.0.2', + 'floating_ips': [floats[2]]}]}] + return vifs + + def __init__(self): self.db = self.FakeDB() self.deallocate_called = None @@ -639,7 +659,6 @@ class CommonNetworkTestCase(test.TestCase): self.fake_create_fixed_ips) args = [None, 'foo', cidr, None, 1, 256, 'fd00::/48', None, None, None] - result = manager.create_networks(*args) self.assertTrue(manager.create_networks(*args)) def test_create_networks_cidr_already_used(self): @@ -662,12 +681,113 @@ class CommonNetworkTestCase(test.TestCase): None] self.assertTrue(manager.create_networks(*args)) - def get_instance_ids_by_ip_regex(self): - manager = self.FakeNetworkManager() - self.mox.StubOutWithMock(manager.db, 'virtual_interface_get_all') - def get_instance_ids_by_ipv6_regex(self): + def test_get_instance_ids_by_ip_regex(self): manager = self.FakeNetworkManager() - - def get_instance_ids_by_ip(self): + _vifs = manager.db.virtual_interface_get_all(None) + + # Greedy get eveything + res = manager.get_instance_ids_by_ip_filter(None, {'ip': '.*'}) + self.assertEqual(len(res), len(_vifs)) + + # Doesn't exist + res = manager.get_instance_ids_by_ip_filter(None, {'ip': '10.0.0.1'}) + self.assertFalse(res) + + # Get instance 1 + res = manager.get_instance_ids_by_ip_filter(None, + {'ip': '172.16.0.2'}) + self.assertTrue(res) + self.assertEqual(len(res), 1) + self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) + + # Get instance 2 + res = manager.get_instance_ids_by_ip_filter(None, + {'ip': '173.16.0.2'}) + self.assertTrue(res) + self.assertEqual(len(res), 1) + self.assertEqual(res[0]['instance_id'], _vifs[2]['instance_id']) + + # Get instance 0 and 1 + res = manager.get_instance_ids_by_ip_filter(None, + {'ip': '172.16.0.*'}) + self.assertTrue(res) + self.assertEqual(len(res), 2) + self.assertEqual(res[0]['instance_id'], _vifs[0]['instance_id']) + self.assertEqual(res[1]['instance_id'], _vifs[1]['instance_id']) + + # Get instance 1 and 2 + res = manager.get_instance_ids_by_ip_filter(None, + {'ip': '17..16.0.2'}) + self.assertTrue(res) + self.assertEqual(len(res), 2) + self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) + self.assertEqual(res[1]['instance_id'], _vifs[2]['instance_id']) + + def test_get_instance_ids_by_ipv6_regex(self): + manager = self.FakeNetworkManager() + _vifs = manager.db.virtual_interface_get_all(None) + + # Greedy get eveything + res = manager.get_instance_ids_by_ip_filter(None, {'ip6': '.*'}) + self.assertEqual(len(res), len(_vifs)) + + # Doesn't exist + res = manager.get_instance_ids_by_ip_filter(None, {'ip6': '.*1034.*'}) + self.assertFalse(res) + + # Get instance 1 + res = manager.get_instance_ids_by_ip_filter(None, + {'ip6': '2001:.*:2'}) + self.assertTrue(res) + self.assertEqual(len(res), 1) + self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) + + # Get instance 2 + ip6 = '2002:db8::dcad:beff:feef:2' + res = manager.get_instance_ids_by_ip_filter(None, {'ip6': ip6}) + self.assertTrue(res) + self.assertEqual(len(res), 1) + self.assertEqual(res[0]['instance_id'], _vifs[2]['instance_id']) + + # Get instance 0 and 1 + res = manager.get_instance_ids_by_ip_filter(None, {'ip6': '2001:.*'}) + self.assertTrue(res) + self.assertEqual(len(res), 2) + self.assertEqual(res[0]['instance_id'], _vifs[0]['instance_id']) + self.assertEqual(res[1]['instance_id'], _vifs[1]['instance_id']) + + # Get instance 1 and 2 + ip6 = '200.:db8::dcad:beff:feef:2' + res = manager.get_instance_ids_by_ip_filter(None, {'ip6': ip6}) + self.assertTrue(res) + self.assertEqual(len(res), 2) + self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) + self.assertEqual(res[1]['instance_id'], _vifs[2]['instance_id']) + + def test_get_instance_ids_by_ip(self): manager = self.FakeNetworkManager() + _vifs = manager.db.virtual_interface_get_all(None) + + # No regex for you! + res = manager.get_instance_ids_by_ip_filter(None, {'fixed_ip': '.*'}) + self.assertFalse(res) + + # Doesn't exist + ip = '10.0.0.1' + res = manager.get_instance_ids_by_ip_filter(None, {'fixed_ip': ip}) + self.assertFalse(res) + + # Get instance 1 + ip = '172.16.0.2' + res = manager.get_instance_ids_by_ip_filter(None, {'fixed_ip': ip}) + self.assertTrue(res) + self.assertEqual(len(res), 1) + self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) + + # Get instance 2 + ip = '173.16.0.2' + res = manager.get_instance_ids_by_ip_filter(None, {'fixed_ip': ip}) + self.assertTrue(res) + self.assertEqual(len(res), 1) + self.assertEqual(res[0]['instance_id'], _vifs[2]['instance_id']) -- cgit From b1a98b631c9d97b85884c54465f6f0e2f4099e0d Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Wed, 14 Sep 2011 15:49:10 -0500 Subject: ip tests were moved to networking --- nova/tests/test_compute.py | 183 --------------------------------------------- 1 file changed, 183 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 886ace1a9..a63433a43 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1002,189 +1002,6 @@ class ComputeTestCase(test.TestCase): db.instance_destroy(c, instance_id2) db.instance_destroy(c, instance_id3) - @test.skip_test("need to fix/move") - def test_get_by_fixed_ip(self): - """Test getting 1 instance by Fixed IP""" - c = context.get_admin_context() - instance_id1 = self._create_instance() - instance_id2 = self._create_instance({'id': 20}) - instance_id3 = self._create_instance({'id': 30}) - - vif_ref1 = db.virtual_interface_create(c, - {'address': '12:34:56:78:90:12', - 'instance_id': instance_id1, - 'network_id': 1}) - vif_ref2 = db.virtual_interface_create(c, - {'address': '90:12:34:56:78:90', - 'instance_id': instance_id2, - 'network_id': 1}) - - db.fixed_ip_create(c, - {'address': '1.1.1.1', - 'instance_id': instance_id1, - 'virtual_interface_id': vif_ref1['id']}) - db.fixed_ip_create(c, - {'address': '1.1.2.1', - 'instance_id': instance_id2, - 'virtual_interface_id': vif_ref2['id']}) - - # regex not allowed - instances = self.compute_api.get_all(c, - search_opts={'fixed_ip': '.*'}) - self.assertEqual(len(instances), 0) - - instances = self.compute_api.get_all(c, - search_opts={'fixed_ip': '1.1.3.1'}) - self.assertEqual(len(instances), 0) - - instances = self.compute_api.get_all(c, - search_opts={'fixed_ip': '1.1.1.1'}) - self.assertEqual(len(instances), 1) - self.assertEqual(instances[0].id, instance_id1) - - instances = self.compute_api.get_all(c, - search_opts={'fixed_ip': '1.1.2.1'}) - self.assertEqual(len(instances), 1) - self.assertEqual(instances[0].id, instance_id2) - - db.virtual_interface_delete(c, vif_ref1['id']) - db.virtual_interface_delete(c, vif_ref2['id']) - db.instance_destroy(c, instance_id1) - db.instance_destroy(c, instance_id2) - - @test.skip_test("need to move/fix") - def test_get_all_by_ip_regexp(self): - """Test searching by Floating and Fixed IP""" - c = context.get_admin_context() - instance_id1 = self._create_instance({'display_name': 'woot'}) - instance_id2 = self._create_instance({ - 'display_name': 'woo', - 'id': 20}) - instance_id3 = self._create_instance({ - 'display_name': 'not-woot', - 'id': 30}) - - vif_ref1 = db.virtual_interface_create(c, - {'address': '12:34:56:78:90:12', - 'instance_id': instance_id1, - 'network_id': 1}) - vif_ref2 = db.virtual_interface_create(c, - {'address': '90:12:34:56:78:90', - 'instance_id': instance_id2, - 'network_id': 1}) - vif_ref3 = db.virtual_interface_create(c, - {'address': '34:56:78:90:12:34', - 'instance_id': instance_id3, - 'network_id': 1}) - - db.fixed_ip_create(c, - {'address': '1.1.1.1', - 'instance_id': instance_id1, - 'virtual_interface_id': vif_ref1['id']}) - db.fixed_ip_create(c, - {'address': '1.1.2.1', - 'instance_id': instance_id2, - 'virtual_interface_id': vif_ref2['id']}) - fix_addr = db.fixed_ip_create(c, - {'address': '1.1.3.1', - 'instance_id': instance_id3, - 'virtual_interface_id': vif_ref3['id']}) - fix_ref = db.fixed_ip_get_by_address(c, fix_addr) - flo_ref = db.floating_ip_create(c, - {'address': '10.0.0.2', - 'fixed_ip_id': fix_ref['id']}) - - # ends up matching 2nd octet here.. so all 3 match - instances = self.compute_api.get_all(c, - search_opts={'ip': '.*\.1'}) - self.assertEqual(len(instances), 3) - - instances = self.compute_api.get_all(c, - search_opts={'ip': '1.*'}) - self.assertEqual(len(instances), 3) - - instances = self.compute_api.get_all(c, - search_opts={'ip': '.*\.1.\d+$'}) - self.assertEqual(len(instances), 1) - instance_ids = [instance.id for instance in instances] - self.assertTrue(instance_id1 in instance_ids) - - instances = self.compute_api.get_all(c, - search_opts={'ip': '.*\.2.+'}) - self.assertEqual(len(instances), 1) - self.assertEqual(instances[0].id, instance_id2) - - instances = self.compute_api.get_all(c, - search_opts={'ip': '10.*'}) - self.assertEqual(len(instances), 1) - self.assertEqual(instances[0].id, instance_id3) - - db.virtual_interface_delete(c, vif_ref1['id']) - db.virtual_interface_delete(c, vif_ref2['id']) - db.virtual_interface_delete(c, vif_ref3['id']) - db.floating_ip_destroy(c, '10.0.0.2') - db.instance_destroy(c, instance_id1) - db.instance_destroy(c, instance_id2) - db.instance_destroy(c, instance_id3) - - @test.skip_test("need to move/fix") - def test_get_all_by_ipv6_regexp(self): - """Test searching by IPv6 address""" - - c = context.get_admin_context() - instance_id1 = self._create_instance({'display_name': 'woot'}) - instance_id2 = self._create_instance({ - 'display_name': 'woo', - 'id': 20}) - instance_id3 = self._create_instance({ - 'display_name': 'not-woot', - 'id': 30}) - - vif_ref1 = db.virtual_interface_create(c, - {'address': '12:34:56:78:90:12', - 'instance_id': instance_id1, - 'network_id': 1}) - vif_ref2 = db.virtual_interface_create(c, - {'address': '90:12:34:56:78:90', - 'instance_id': instance_id2, - 'network_id': 1}) - vif_ref3 = db.virtual_interface_create(c, - {'address': '34:56:78:90:12:34', - 'instance_id': instance_id3, - 'network_id': 1}) - - # This will create IPv6 addresses of: - # 1: fd00::1034:56ff:fe78:9012 - # 20: fd00::9212:34ff:fe56:7890 - # 30: fd00::3656:78ff:fe90:1234 - - instances = self.compute_api.get_all(c, - search_opts={'ip6': '.*1034.*'}) - self.assertEqual(len(instances), 1) - self.assertEqual(instances[0].id, instance_id1) - - instances = self.compute_api.get_all(c, - search_opts={'ip6': '^fd00.*'}) - self.assertEqual(len(instances), 3) - instance_ids = [instance.id for instance in instances] - self.assertTrue(instance_id1 in instance_ids) - self.assertTrue(instance_id2 in instance_ids) - self.assertTrue(instance_id3 in instance_ids) - - instances = self.compute_api.get_all(c, - search_opts={'ip6': '^.*12.*34.*'}) - self.assertEqual(len(instances), 2) - instance_ids = [instance.id for instance in instances] - self.assertTrue(instance_id2 in instance_ids) - self.assertTrue(instance_id3 in instance_ids) - - db.virtual_interface_delete(c, vif_ref1['id']) - db.virtual_interface_delete(c, vif_ref2['id']) - db.virtual_interface_delete(c, vif_ref3['id']) - db.instance_destroy(c, instance_id1) - db.instance_destroy(c, instance_id2) - db.instance_destroy(c, instance_id3) - @test.skip_test("need to fix/move") def test_get_all_by_multiple_options_at_once(self): """Test searching by multiple options at once""" -- cgit From d2c111697e158feefaf585332f32f471809ea6e8 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Wed, 14 Sep 2011 15:59:12 -0500 Subject: move the FakeNetworkManager into fake_network --- nova/tests/fake_network.py | 54 ++++++++++++++++++++++++++- nova/tests/test_network.py | 92 ++++++++++------------------------------------ 2 files changed, 73 insertions(+), 73 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 142206755..4185668b1 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -16,8 +16,8 @@ # under the License. from nova import db +from nova import exception from nova import flags -from nova import test from nova.network import manager as network_manager @@ -64,6 +64,58 @@ class FakeModel(dict): return self[name] +class FakeNetworkManager(network_manager.NetworkManager): + """This NetworkManager doesn't call the base class so we can bypass all + inherited service cruft and just perform unit tests. + """ + + class FakeDB: + def fixed_ip_get_by_instance(self, context, instance_id): + return [dict(address='10.0.0.0'), dict(address='10.0.0.1'), + dict(address='10.0.0.2')] + + def network_get_by_cidr(self, context, cidr): + raise exception.NetworkNotFoundForCidr() + + def network_create_safe(self, context, net): + fakenet = dict(net) + fakenet['id'] = 999 + return fakenet + + def network_get_all(self, context): + raise exception.NoNetworksFound() + + def virtual_interface_get_all(self, context): + floats = [{'address': '172.16.1.1'}, + {'address': '172.16.1.2'}, + {'address': '173.16.1.2'}] + + vifs = [{'instance_id': 0, + 'fixed_ipv6': '2001:db8::dcad:beff:feef:1', + 'fixed_ips': [{'address': '172.16.0.1', + 'floating_ips': [floats[0]]}]}, + {'instance_id': 1, + 'fixed_ipv6': '2001:db8::dcad:beff:feef:2', + 'fixed_ips': [{'address': '172.16.0.2', + 'floating_ips': [floats[1]]}]}, + {'instance_id': 2, + 'fixed_ipv6': '2002:db8::dcad:beff:feef:2', + 'fixed_ips': [{'address': '173.16.0.2', + 'floating_ips': [floats[2]]}]}] + return vifs + + + def __init__(self): + self.db = self.FakeDB() + self.deallocate_called = None + + def deallocate_fixed_ip(self, context, address): + self.deallocate_called = address + + def _create_fixed_ips(self, context, network_id): + pass + + flavor = {'id': 0, 'name': 'fake_flavor', 'memory_mb': 2048, diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 30673050f..19ccd8c18 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -438,75 +438,23 @@ class VlanNetworkTestCase(test.TestCase): class CommonNetworkTestCase(test.TestCase): - - class FakeNetworkManager(network_manager.NetworkManager): - """This NetworkManager doesn't call the base class so we can bypass all - inherited service cruft and just perform unit tests. - """ - - class FakeDB: - def fixed_ip_get_by_instance(self, context, instance_id): - return [dict(address='10.0.0.0'), dict(address='10.0.0.1'), - dict(address='10.0.0.2')] - - def network_get_by_cidr(self, context, cidr): - raise exception.NetworkNotFoundForCidr() - - def network_create_safe(self, context, net): - fakenet = dict(net) - fakenet['id'] = 999 - return fakenet - - def network_get_all(self, context): - raise exception.NoNetworksFound() - - def virtual_interface_get_all(self, context): - floats = [{'address': '172.16.1.1'}, - {'address': '172.16.1.2'}, - {'address': '173.16.1.2'}] - - vifs = [{'instance_id': 0, - 'fixed_ipv6': '2001:db8::dcad:beff:feef:1', - 'fixed_ips': [{'address': '172.16.0.1', - 'floating_ips': [floats[0]]}]}, - {'instance_id': 1, - 'fixed_ipv6': '2001:db8::dcad:beff:feef:2', - 'fixed_ips': [{'address': '172.16.0.2', - 'floating_ips': [floats[1]]}]}, - {'instance_id': 2, - 'fixed_ipv6': '2002:db8::dcad:beff:feef:2', - 'fixed_ips': [{'address': '173.16.0.2', - 'floating_ips': [floats[2]]}]}] - return vifs - - - def __init__(self): - self.db = self.FakeDB() - self.deallocate_called = None - - def deallocate_fixed_ip(self, context, address): - self.deallocate_called = address - - def _create_fixed_ips(self, context, network_id): - pass - def fake_create_fixed_ips(self, context, network_id): return None def test_remove_fixed_ip_from_instance(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() manager.remove_fixed_ip_from_instance(None, 99, '10.0.0.1') self.assertEquals(manager.deallocate_called, '10.0.0.1') def test_remove_fixed_ip_from_instance_bad_input(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.assertRaises(exception.FixedIpNotFoundForSpecificInstance, manager.remove_fixed_ip_from_instance, None, 99, 'bad input') def test_validate_cidrs(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() nets = manager.create_networks(None, 'fake', '192.168.0.0/24', False, 1, 256, None, None, None, None) @@ -515,7 +463,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertTrue('192.168.0.0/24' in cidrs) def test_validate_cidrs_split_exact_in_half(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() nets = manager.create_networks(None, 'fake', '192.168.0.0/24', False, 2, 128, None, None, None, None) @@ -525,7 +473,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertTrue('192.168.0.128/25' in cidrs) def test_validate_cidrs_split_cidr_in_use_middle_of_range(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.mox.StubOutWithMock(manager.db, 'network_get_all') ctxt = mox.IgnoreArg() manager.db.network_get_all(ctxt).AndReturn([{'id': 1, @@ -543,7 +491,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertFalse('192.168.2.0/24' in cidrs) def test_validate_cidrs_smaller_subnet_in_use(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.mox.StubOutWithMock(manager.db, 'network_get_all') ctxt = mox.IgnoreArg() manager.db.network_get_all(ctxt).AndReturn([{'id': 1, @@ -556,7 +504,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertRaises(ValueError, manager.create_networks, *args) def test_validate_cidrs_split_smaller_cidr_in_use(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.mox.StubOutWithMock(manager.db, 'network_get_all') ctxt = mox.IgnoreArg() manager.db.network_get_all(ctxt).AndReturn([{'id': 1, @@ -573,7 +521,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertFalse('192.168.2.0/24' in cidrs) def test_validate_cidrs_split_smaller_cidr_in_use2(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.mox.StubOutWithMock(manager.db, 'network_get_all') ctxt = mox.IgnoreArg() manager.db.network_get_all(ctxt).AndReturn([{'id': 1, @@ -589,7 +537,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertFalse('192.168.2.0/27' in cidrs) def test_validate_cidrs_split_all_in_use(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.mox.StubOutWithMock(manager.db, 'network_get_all') ctxt = mox.IgnoreArg() in_use = [{'id': 1, 'cidr': '192.168.2.9/29'}, @@ -605,14 +553,14 @@ class CommonNetworkTestCase(test.TestCase): self.assertRaises(ValueError, manager.create_networks, *args) def test_validate_cidrs_one_in_use(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() args = (None, 'fake', '192.168.0.0/24', False, 2, 256, None, None, None, None) # ValueError: network_size * num_networks exceeds cidr size self.assertRaises(ValueError, manager.create_networks, *args) def test_validate_cidrs_already_used(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.mox.StubOutWithMock(manager.db, 'network_get_all') ctxt = mox.IgnoreArg() manager.db.network_get_all(ctxt).AndReturn([{'id': 1, @@ -624,7 +572,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertRaises(ValueError, manager.create_networks, *args) def test_validate_cidrs_too_many(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() args = (None, 'fake', '192.168.0.0/24', False, 200, 256, None, None, None, None) # ValueError: Not enough subnets avail to satisfy requested @@ -632,7 +580,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertRaises(ValueError, manager.create_networks, *args) def test_validate_cidrs_split_partial(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() nets = manager.create_networks(None, 'fake', '192.168.0.0/16', False, 2, 256, None, None, None, None) returned_cidrs = [str(net['cidr']) for net in nets] @@ -640,7 +588,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertTrue('192.168.1.0/24' in returned_cidrs) def test_validate_cidrs_conflict_existing_supernet(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.mox.StubOutWithMock(manager.db, 'network_get_all') ctxt = mox.IgnoreArg() fakecidr = [{'id': 1, 'cidr': '192.168.0.0/8'}] @@ -654,7 +602,7 @@ class CommonNetworkTestCase(test.TestCase): def test_create_networks(self): cidr = '192.168.0.0/24' - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.stubs.Set(manager, '_create_fixed_ips', self.fake_create_fixed_ips) args = [None, 'foo', cidr, None, 1, 256, 'fd00::/48', None, None, @@ -662,7 +610,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertTrue(manager.create_networks(*args)) def test_create_networks_cidr_already_used(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.mox.StubOutWithMock(manager.db, 'network_get_all') ctxt = mox.IgnoreArg() fakecidr = [{'id': 1, 'cidr': '192.168.0.0/24'}] @@ -674,7 +622,7 @@ class CommonNetworkTestCase(test.TestCase): def test_create_networks_many(self): cidr = '192.168.0.0/16' - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() self.stubs.Set(manager, '_create_fixed_ips', self.fake_create_fixed_ips) args = [None, 'foo', cidr, None, 10, 256, 'fd00::/48', None, None, @@ -683,7 +631,7 @@ class CommonNetworkTestCase(test.TestCase): def test_get_instance_ids_by_ip_regex(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() _vifs = manager.db.virtual_interface_get_all(None) # Greedy get eveything @@ -725,7 +673,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertEqual(res[1]['instance_id'], _vifs[2]['instance_id']) def test_get_instance_ids_by_ipv6_regex(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() _vifs = manager.db.virtual_interface_get_all(None) # Greedy get eveything @@ -766,7 +714,7 @@ class CommonNetworkTestCase(test.TestCase): self.assertEqual(res[1]['instance_id'], _vifs[2]['instance_id']) def test_get_instance_ids_by_ip(self): - manager = self.FakeNetworkManager() + manager = fake_network.FakeNetworkManager() _vifs = manager.db.virtual_interface_get_all(None) # No regex for you! -- cgit From 0a564c054d8e8bfe726dbd942ad7d00b42da788d Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Thu, 15 Sep 2011 13:29:37 -0500 Subject: update tests --- nova/tests/fake_network.py | 8 +++-- nova/tests/test_compute.py | 74 ++++++++++++++++------------------------------ 2 files changed, 31 insertions(+), 51 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 4185668b1..576e9b61c 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -94,16 +94,20 @@ class FakeNetworkManager(network_manager.NetworkManager): 'fixed_ipv6': '2001:db8::dcad:beff:feef:1', 'fixed_ips': [{'address': '172.16.0.1', 'floating_ips': [floats[0]]}]}, - {'instance_id': 1, + {'instance_id': 20, 'fixed_ipv6': '2001:db8::dcad:beff:feef:2', 'fixed_ips': [{'address': '172.16.0.2', 'floating_ips': [floats[1]]}]}, - {'instance_id': 2, + {'instance_id': 30, 'fixed_ipv6': '2002:db8::dcad:beff:feef:2', 'fixed_ips': [{'address': '173.16.0.2', 'floating_ips': [floats[2]]}]}] return vifs + def instance_get_uuids_by_ids(self, context): + # NOTE(jkoelker): This is just here until we can rely on UUIDs + pass + def __init__(self): self.db = self.FakeDB() diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index a63433a43..5960bd226 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -21,22 +21,24 @@ Tests For Compute """ from nova import compute -from nova.compute import instance_types -from nova.compute import manager as compute_manager -from nova.compute import power_state -from nova.compute import vm_states from nova import context from nova import db -from nova.db.sqlalchemy import models -from nova.db.sqlalchemy import api as sqlalchemy_api from nova import exception from nova import flags -import nova.image.fake from nova import log as logging from nova import rpc from nova import test from nova import utils + +from nova.compute import instance_types +from nova.compute import manager as compute_manager +from nova.compute import power_state +from nova.compute import vm_states +from nova.db.sqlalchemy import models +from nova.image import fake as fake_image from nova.notifier import test_notifier +from nova.tests import fake_network + LOG = logging.getLogger('nova.tests.compute') FLAGS = flags.FLAGS @@ -74,7 +76,7 @@ class ComputeTestCase(test.TestCase): def fake_show(meh, context, id): return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1}} - self.stubs.Set(nova.image.fake._FakeImageService, 'show', fake_show) + self.stubs.Set(fake_image._FakeImageService, 'show', fake_show) def _create_instance(self, params=None): """Create a test instance""" @@ -1002,11 +1004,19 @@ class ComputeTestCase(test.TestCase): db.instance_destroy(c, instance_id2) db.instance_destroy(c, instance_id3) - @test.skip_test("need to fix/move") def test_get_all_by_multiple_options_at_once(self): """Test searching by multiple options at once""" c = context.get_admin_context() - instance_id1 = self._create_instance({'display_name': 'woot'}) + network_manager = fake_network.FakeNetworkManager() + self.stubs.Set(self.compute_api.network_api, + 'get_instance_uuids_by_ip_filter', + network_manager.get_instance_uuids_by_ip_filter) + self.stubs.Set(network_manager.db, + 'instance_get_uuids_by_ids', + db.instance_get_uuids_by_ids) + + instance_id1 = self._create_instance({'display_name': 'woot', + 'id': 0}) instance_id2 = self._create_instance({ 'display_name': 'woo', 'id': 20}) @@ -1014,36 +1024,6 @@ class ComputeTestCase(test.TestCase): 'display_name': 'not-woot', 'id': 30}) - vif_ref1 = db.virtual_interface_create(c, - {'address': '12:34:56:78:90:12', - 'instance_id': instance_id1, - 'network_id': 1}) - vif_ref2 = db.virtual_interface_create(c, - {'address': '90:12:34:56:78:90', - 'instance_id': instance_id2, - 'network_id': 1}) - vif_ref3 = db.virtual_interface_create(c, - {'address': '34:56:78:90:12:34', - 'instance_id': instance_id3, - 'network_id': 1}) - - db.fixed_ip_create(c, - {'address': '1.1.1.1', - 'instance_id': instance_id1, - 'virtual_interface_id': vif_ref1['id']}) - db.fixed_ip_create(c, - {'address': '1.1.2.1', - 'instance_id': instance_id2, - 'virtual_interface_id': vif_ref2['id']}) - fix_addr = db.fixed_ip_create(c, - {'address': '1.1.3.1', - 'instance_id': instance_id3, - 'virtual_interface_id': vif_ref3['id']}) - fix_ref = db.fixed_ip_get_by_address(c, fix_addr) - flo_ref = db.floating_ip_create(c, - {'address': '10.0.0.2', - 'fixed_ip_id': fix_ref['id']}) - # ip ends up matching 2nd octet here.. so all 3 match ip # but 'name' only matches one instances = self.compute_api.get_all(c, @@ -1051,18 +1031,18 @@ class ComputeTestCase(test.TestCase): self.assertEqual(len(instances), 1) self.assertEqual(instances[0].id, instance_id3) - # ip ends up matching any ip with a '2' in it.. so instance - # 2 and 3.. but name should only match #2 + # ip ends up matching any ip with a '1' in the last octet.. + # so instance 1 and 3.. but name should only match #1 # but 'name' only matches one instances = self.compute_api.get_all(c, - search_opts={'ip': '.*2', 'name': '^woo.*'}) + search_opts={'ip': '.*\.1$', 'name': '^woo.*'}) self.assertEqual(len(instances), 1) - self.assertEqual(instances[0].id, instance_id2) + self.assertEqual(instances[0].id, instance_id1) # same as above but no match on name (name matches instance_id1 # but the ip query doesn't instances = self.compute_api.get_all(c, - search_opts={'ip': '.*2.*', 'name': '^woot.*'}) + search_opts={'ip': '.*\.2$', 'name': '^woot.*'}) self.assertEqual(len(instances), 0) # ip matches all 3... ipv6 matches #2+#3...name matches #3 @@ -1073,10 +1053,6 @@ class ComputeTestCase(test.TestCase): self.assertEqual(len(instances), 1) self.assertEqual(instances[0].id, instance_id3) - db.virtual_interface_delete(c, vif_ref1['id']) - db.virtual_interface_delete(c, vif_ref2['id']) - db.virtual_interface_delete(c, vif_ref3['id']) - db.floating_ip_destroy(c, '10.0.0.2') db.instance_destroy(c, instance_id1) db.instance_destroy(c, instance_id2) db.instance_destroy(c, instance_id3) -- cgit From 3929ab2f32de6db7fee0394e276a5ceeca356368 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Thu, 15 Sep 2011 13:44:29 -0500 Subject: build the query with the query builder --- nova/tests/test_db_api.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 60d7abd8c..c791eec27 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -91,6 +91,8 @@ class DbApiTestCase(test.TestCase): inst2 = db.instance_create(self.context, args2) db.instance_destroy(self.context, inst1.id) result = db.instance_get_all_by_filters(self.context.elevated(), {}) + print str(dict(result[0])) + print str(dict(result[1])) self.assertEqual(2, len(result)) self.assertEqual(result[0].id, inst2.id) self.assertEqual(result[1].id, inst1.id) -- cgit From 5a264e9844eba5ef0c21ae47f300f5c805eda71d Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Thu, 15 Sep 2011 13:47:26 -0500 Subject: fix test --- nova/tests/test_db_api.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index c791eec27..5ebab9cc8 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -91,9 +91,7 @@ class DbApiTestCase(test.TestCase): inst2 = db.instance_create(self.context, args2) db.instance_destroy(self.context, inst1.id) result = db.instance_get_all_by_filters(self.context.elevated(), {}) - print str(dict(result[0])) - print str(dict(result[1])) self.assertEqual(2, len(result)) - self.assertEqual(result[0].id, inst2.id) - self.assertEqual(result[1].id, inst1.id) - self.assertTrue(result[1].deleted) + self.assertEqual(result[0].id, inst1.id) + self.assertEqual(result[1].id, inst2.id) + self.assertTrue(result[0].deleted) -- cgit From 03e01921b1043337515777849aa5432ba08b66f7 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Thu, 15 Sep 2011 14:02:24 -0500 Subject: update for the id->uuid flip --- nova/tests/fake_network.py | 6 ++++-- nova/tests/test_network.py | 42 +++++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 21 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 576e9b61c..667d8a211 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -18,6 +18,7 @@ from nova import db from nova import exception from nova import flags +from nova import utils from nova.network import manager as network_manager @@ -104,9 +105,10 @@ class FakeNetworkManager(network_manager.NetworkManager): 'floating_ips': [floats[2]]}]}] return vifs - def instance_get_uuids_by_ids(self, context): + def instance_get_uuids_by_ids(self, context, ids): # NOTE(jkoelker): This is just here until we can rely on UUIDs - pass + return [{'uuid': str(utils.gen_uuid()), + 'id': id} for id in ids] def __init__(self): diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 19ccd8c18..9ef9bd96b 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -630,34 +630,34 @@ class CommonNetworkTestCase(test.TestCase): self.assertTrue(manager.create_networks(*args)) - def test_get_instance_ids_by_ip_regex(self): + def test_get_instance_uuids_by_ip_regex(self): manager = fake_network.FakeNetworkManager() _vifs = manager.db.virtual_interface_get_all(None) # Greedy get eveything - res = manager.get_instance_ids_by_ip_filter(None, {'ip': '.*'}) + res = manager.get_instance_uuids_by_ip_filter(None, {'ip': '.*'}) self.assertEqual(len(res), len(_vifs)) # Doesn't exist - res = manager.get_instance_ids_by_ip_filter(None, {'ip': '10.0.0.1'}) + res = manager.get_instance_uuids_by_ip_filter(None, {'ip': '10.0.0.1'}) self.assertFalse(res) # Get instance 1 - res = manager.get_instance_ids_by_ip_filter(None, + res = manager.get_instance_uuids_by_ip_filter(None, {'ip': '172.16.0.2'}) self.assertTrue(res) self.assertEqual(len(res), 1) self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) # Get instance 2 - res = manager.get_instance_ids_by_ip_filter(None, + res = manager.get_instance_uuids_by_ip_filter(None, {'ip': '173.16.0.2'}) self.assertTrue(res) self.assertEqual(len(res), 1) self.assertEqual(res[0]['instance_id'], _vifs[2]['instance_id']) # Get instance 0 and 1 - res = manager.get_instance_ids_by_ip_filter(None, + res = manager.get_instance_uuids_by_ip_filter(None, {'ip': '172.16.0.*'}) self.assertTrue(res) self.assertEqual(len(res), 2) @@ -665,27 +665,27 @@ class CommonNetworkTestCase(test.TestCase): self.assertEqual(res[1]['instance_id'], _vifs[1]['instance_id']) # Get instance 1 and 2 - res = manager.get_instance_ids_by_ip_filter(None, + res = manager.get_instance_uuids_by_ip_filter(None, {'ip': '17..16.0.2'}) self.assertTrue(res) self.assertEqual(len(res), 2) self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) self.assertEqual(res[1]['instance_id'], _vifs[2]['instance_id']) - def test_get_instance_ids_by_ipv6_regex(self): + def test_get_instance_uuids_by_ipv6_regex(self): manager = fake_network.FakeNetworkManager() _vifs = manager.db.virtual_interface_get_all(None) # Greedy get eveything - res = manager.get_instance_ids_by_ip_filter(None, {'ip6': '.*'}) + res = manager.get_instance_uuids_by_ip_filter(None, {'ip6': '.*'}) self.assertEqual(len(res), len(_vifs)) # Doesn't exist - res = manager.get_instance_ids_by_ip_filter(None, {'ip6': '.*1034.*'}) + res = manager.get_instance_uuids_by_ip_filter(None, {'ip6': '.*1034.*'}) self.assertFalse(res) # Get instance 1 - res = manager.get_instance_ids_by_ip_filter(None, + res = manager.get_instance_uuids_by_ip_filter(None, {'ip6': '2001:.*:2'}) self.assertTrue(res) self.assertEqual(len(res), 1) @@ -693,13 +693,13 @@ class CommonNetworkTestCase(test.TestCase): # Get instance 2 ip6 = '2002:db8::dcad:beff:feef:2' - res = manager.get_instance_ids_by_ip_filter(None, {'ip6': ip6}) + res = manager.get_instance_uuids_by_ip_filter(None, {'ip6': ip6}) self.assertTrue(res) self.assertEqual(len(res), 1) self.assertEqual(res[0]['instance_id'], _vifs[2]['instance_id']) # Get instance 0 and 1 - res = manager.get_instance_ids_by_ip_filter(None, {'ip6': '2001:.*'}) + res = manager.get_instance_uuids_by_ip_filter(None, {'ip6': '2001:.*'}) self.assertTrue(res) self.assertEqual(len(res), 2) self.assertEqual(res[0]['instance_id'], _vifs[0]['instance_id']) @@ -707,35 +707,39 @@ class CommonNetworkTestCase(test.TestCase): # Get instance 1 and 2 ip6 = '200.:db8::dcad:beff:feef:2' - res = manager.get_instance_ids_by_ip_filter(None, {'ip6': ip6}) + res = manager.get_instance_uuids_by_ip_filter(None, {'ip6': ip6}) self.assertTrue(res) self.assertEqual(len(res), 2) self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) self.assertEqual(res[1]['instance_id'], _vifs[2]['instance_id']) - def test_get_instance_ids_by_ip(self): + def test_get_instance_uuids_by_ip(self): manager = fake_network.FakeNetworkManager() _vifs = manager.db.virtual_interface_get_all(None) # No regex for you! - res = manager.get_instance_ids_by_ip_filter(None, {'fixed_ip': '.*'}) + res = manager.get_instance_uuids_by_ip_filter(None, + {'fixed_ip': '.*'}) self.assertFalse(res) # Doesn't exist ip = '10.0.0.1' - res = manager.get_instance_ids_by_ip_filter(None, {'fixed_ip': ip}) + res = manager.get_instance_uuids_by_ip_filter(None, + {'fixed_ip': ip}) self.assertFalse(res) # Get instance 1 ip = '172.16.0.2' - res = manager.get_instance_ids_by_ip_filter(None, {'fixed_ip': ip}) + res = manager.get_instance_uuids_by_ip_filter(None, + {'fixed_ip': ip}) self.assertTrue(res) self.assertEqual(len(res), 1) self.assertEqual(res[0]['instance_id'], _vifs[1]['instance_id']) # Get instance 2 ip = '173.16.0.2' - res = manager.get_instance_ids_by_ip_filter(None, {'fixed_ip': ip}) + res = manager.get_instance_uuids_by_ip_filter(None, + {'fixed_ip': ip}) self.assertTrue(res) self.assertEqual(len(res), 1) self.assertEqual(res[0]['instance_id'], _vifs[2]['instance_id']) -- cgit From 62516cac832bd24003f1bf29b4a03e7f5d9a1579 Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Thu, 15 Sep 2011 14:09:14 -0500 Subject: Added a unit test. --- nova/tests/test_virt_drivers.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py index 440d3401b..8e20e999f 100644 --- a/nova/tests/test_virt_drivers.py +++ b/nova/tests/test_virt_drivers.py @@ -176,6 +176,10 @@ class _VirtDriverTestCase(test.TestCase): def test_poll_rescued_instances(self): self.connection.poll_rescued_instances(10) + @catch_notimplementederror + def test_poll_unconfirmed_resizes(self): + self.connection.poll_unconfirmed_resizes(10) + @catch_notimplementederror def test_migrate_disk_and_power_off(self): instance_ref = test_utils.get_test_instance() -- cgit From 95443980b8aecbfd4531e0ec7baefa519d235aa1 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Thu, 15 Sep 2011 14:25:52 -0500 Subject: remove undedded imports and skips --- nova/tests/fake_network.py | 1 - nova/tests/test_metadata.py | 9 --------- nova/tests/test_network.py | 4 ++-- 3 files changed, 2 insertions(+), 12 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 667d8a211..d839f20b0 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -110,7 +110,6 @@ class FakeNetworkManager(network_manager.NetworkManager): return [{'uuid': str(utils.gen_uuid()), 'id': id} for id in ids] - def __init__(self): self.db = self.FakeDB() self.deallocate_called = None diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index f63c833e8..9b78852ad 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -19,13 +19,11 @@ """Tests for the testing the metadata code.""" import base64 -import httplib import webob from nova import exception from nova import test -from nova import wsgi from nova.api.ec2 import metadatarequesthandler from nova.db.sqlalchemy import api @@ -75,16 +73,13 @@ class MetadataTestCase(test.TestCase): request.remote_addr = "127.0.0.1" return request.get_response(self.app).body - @test.skip_test("need to fix remote IP filtering") def test_base(self): self.assertEqual(self.request('/'), 'meta-data/\nuser-data') - @test.skip_test("need to fix remote IP filtering") def test_user_data(self): self.instance['user_data'] = base64.b64encode('happy') self.assertEqual(self.request('/user-data'), 'happy') - @test.skip_test("need to fix remote IP filtering") def test_security_groups(self): def sg_get(*args, **kwargs): return [{'name': 'default'}, {'name': 'other'}] @@ -92,7 +87,6 @@ class MetadataTestCase(test.TestCase): self.assertEqual(self.request('/meta-data/security-groups'), 'default\nother') - @test.skip_test("need to fix remote IP filtering") def test_user_data_non_existing_fixed_address(self): self.stubs.Set(api, 'instance_get_all_by_filters', return_non_existing_server_by_address) @@ -101,7 +95,6 @@ class MetadataTestCase(test.TestCase): response = request.get_response(self.app) self.assertEqual(response.status_int, 404) - @test.skip_test("need to fix remote IP filtering") def test_user_data_none_fixed_address(self): self.stubs.Set(api, 'instance_get_all_by_filters', return_non_existing_server_by_address) @@ -110,14 +103,12 @@ class MetadataTestCase(test.TestCase): response = request.get_response(self.app) self.assertEqual(response.status_int, 500) - @test.skip_test("need to fix remote IP filtering") def test_user_data_invalid_url(self): request = webob.Request.blank('/user-data-invalid') request.remote_addr = "127.0.0.1" response = request.get_response(self.app) self.assertEqual(response.status_int, 404) - @test.skip_test("need to fix remote IP filtering") def test_user_data_with_use_forwarded_header(self): self.instance['user_data'] = ENCODE_USER_DATA_STRING self.flags(use_forwarded_for=True) diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 9ef9bd96b..15c179177 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -629,7 +629,6 @@ class CommonNetworkTestCase(test.TestCase): None] self.assertTrue(manager.create_networks(*args)) - def test_get_instance_uuids_by_ip_regex(self): manager = fake_network.FakeNetworkManager() _vifs = manager.db.virtual_interface_get_all(None) @@ -681,7 +680,8 @@ class CommonNetworkTestCase(test.TestCase): self.assertEqual(len(res), len(_vifs)) # Doesn't exist - res = manager.get_instance_uuids_by_ip_filter(None, {'ip6': '.*1034.*'}) + res = manager.get_instance_uuids_by_ip_filter(None, + {'ip6': '.*1034.*'}) self.assertFalse(res) # Get instance 1 -- cgit From 7fe530a24917ea072adcb459e06cc42ce7c3a992 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Thu, 15 Sep 2011 14:41:53 -0500 Subject: add the fake_network Manager to prevent rpc calls --- nova/tests/test_metadata.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'nova/tests') diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 9b78852ad..2f82132fa 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -26,13 +26,14 @@ from nova import exception from nova import test from nova.api.ec2 import metadatarequesthandler from nova.db.sqlalchemy import api +from nova.tests import fake_network USER_DATA_STRING = ("This is an encoded string") ENCODE_USER_DATA_STRING = base64.b64encode(USER_DATA_STRING) -def return_non_existing_server_by_address(context, address): +def return_non_existing_server_by_address(context, address, *args, **kwarg): raise exception.NotFound() @@ -67,6 +68,10 @@ class MetadataTestCase(test.TestCase): self.stubs.Set(api, 'instance_get_all_by_filters', instance_get_list) self.stubs.Set(api, 'instance_get_floating_address', floating_get) self.app = metadatarequesthandler.MetadataRequestHandler() + network_manager = fake_network.FakeNetworkManager() + self.stubs.Set(self.app.cc.network_api, + 'get_instance_uuids_by_ip_filter', + network_manager.get_instance_uuids_by_ip_filter) def request(self, relative_url): request = webob.Request.blank(relative_url) -- cgit From 340c0dd5250d6cdee08ccf86cf7a1e88cfbeea07 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Sun, 18 Sep 2011 16:01:28 -0400 Subject: catching AttributeError and adding tests --- nova/tests/api/openstack/test_servers.py | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index a2c8b3b04..890ff7de0 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -2194,6 +2194,58 @@ class ServersTest(test.TestCase): res = req.get_response(fakes.wsgi_app()) self.assertEqual(res.status_int, 400) + def test_create_instance_v1_1_malformed_entity(self): + self._setup_for_create_instance() + req = webob.Request.blank('/v1.1/fake/servers') + req.method = 'POST' + req.body = json.dumps({'server': 'string'}) + req.headers['content-type'] = "application/json" + res = req.get_response(fakes.wsgi_app()) + self.assertEqual(res.status_int, 400) + + def test_create_instance_v1_1_malformed_body_string(self): + self._setup_for_create_instance() + req = webob.Request.blank('/v1.1/fake/servers') + req.method = 'POST' + req.body = 'string' + req.headers['content-type'] = "application/json" + res = req.get_response(fakes.wsgi_app()) + self.assertEqual(res.status_int, 400) + + def test_create_instance_v1_1_malformed_body_list(self): + self._setup_for_create_instance() + body = ['string'] + req = webob.Request.blank('/v1.1/fake/servers') + req.method = 'POST' + req.body = json.dumps(['string']) + req.headers['content-type'] = "application/json" + res = req.get_response(fakes.wsgi_app()) + self.assertEqual(res.status_int, 422) + + def test_create_instance_v1_0_malformed_entity(self): + req = webob.Request.blank('/v1.0/servers') + req.method = 'POST' + req.body = json.dumps({'server': 'string'}) + req.headers['content-type'] = "application/json" + res = req.get_response(fakes.wsgi_app()) + self.assertEqual(res.status_int, 400) + + def test_create_instance_v1_0_malformed_body_string(self): + req = webob.Request.blank('/v1.0/servers') + req.method = 'POST' + req.body = 'string' + req.headers['content-type'] = "application/json" + res = req.get_response(fakes.wsgi_app()) + self.assertEqual(res.status_int, 400) + + def test_create_instance_v1_0_malformed_body_list(self): + req = webob.Request.blank('/v1.0/servers') + req.method = 'POST' + req.body = json.dumps(['string']) + req.headers['content-type'] = "application/json" + res = req.get_response(fakes.wsgi_app()) + self.assertEqual(res.status_int, 422) + def test_update_server_no_body(self): req = webob.Request.blank('/v1.0/servers/1') req.method = 'PUT' -- cgit From 66977838d02ad51ced525321b21e648bcc2065bc Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Mon, 19 Sep 2011 11:58:20 -0500 Subject: Added unit test. --- nova/tests/test_db_api.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 60d7abd8c..c99709ffa 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -18,6 +18,8 @@ """Unit tests for the DB API""" +import datetime + from nova import test from nova import context from nova import db @@ -95,3 +97,26 @@ class DbApiTestCase(test.TestCase): self.assertEqual(result[0].id, inst2.id) self.assertEqual(result[1].id, inst1.id) self.assertTrue(result[1].deleted) + + def test_migration_get_all_unconfirmed(self): + ctxt = context.get_admin_context() + + # Ensure no migrations are returned. + results = db.migration_get_all_unconfirmed(ctxt, 10) + self.assertEqual(0, len(results)) + + # Ensure one migration older than 10 seconds is returned. + updated_at = datetime.datetime(2000, 01, 01, 12, 00, 00) + values = {"status": "FINISHED", "updated_at": updated_at} + migration = db.migration_create(ctxt, values) + results = db.migration_get_all_unconfirmed(ctxt, 10) + self.assertEqual(1, len(results)) + db.migration_update(ctxt, migration.id, {"status": "CONFIRMED"}) + + # Ensure the new migration is not returned. + updated_at = datetime.datetime.utcnow() + values = {"status": "FINISHED", "updated_at": updated_at} + migration = db.migration_create(ctxt, values) + results = db.migration_get_all_unconfirmed(ctxt, 10) + self.assertEqual(0, len(results)) + db.migration_update(ctxt, migration.id, {"status": "CONFIRMED"}) -- cgit From 83aca0e78727a870fb6aa788158920a1c8321541 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Mon, 19 Sep 2011 14:53:17 -0700 Subject: Removed the extra code added to support filtering instances by instance uuids. Instead, added 'uuid' to the list of exact_filter_match names. Updated the caller to add 'uuid: uuid_list' to the filters dictionary, instead of passing it in as another argument. Updated the ID to UUID mapping code to return a dictionary, which allows the caller to be more efficient... It removes an extra loop there. A couple of typo fixes. --- nova/tests/fake_network.py | 8 +++++--- nova/tests/test_compute.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index d839f20b0..febac5e09 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -105,10 +105,12 @@ class FakeNetworkManager(network_manager.NetworkManager): 'floating_ips': [floats[2]]}]}] return vifs - def instance_get_uuids_by_ids(self, context, ids): + def instance_get_id_to_uuid_mapping(self, context, ids): # NOTE(jkoelker): This is just here until we can rely on UUIDs - return [{'uuid': str(utils.gen_uuid()), - 'id': id} for id in ids] + mapping = {} + for id in ids: + mapping[id] = str(utils.gen_uuid()) + return mapping def __init__(self): self.db = self.FakeDB() diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 4ef57b760..948c7ad40 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1033,8 +1033,8 @@ class ComputeTestCase(test.TestCase): 'get_instance_uuids_by_ip_filter', network_manager.get_instance_uuids_by_ip_filter) self.stubs.Set(network_manager.db, - 'instance_get_uuids_by_ids', - db.instance_get_uuids_by_ids) + 'instance_get_id_to_uuid_mapping', + db.instance_get_id_to_uuid_mapping) instance_id1 = self._create_instance({'display_name': 'woot', 'id': 0}) -- cgit From b0ca3a42995cc25852420083e431c3be5071d221 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Mon, 19 Sep 2011 15:08:25 -0700 Subject: fix a test where list order was assumed --- nova/tests/test_db_api.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 5ebab9cc8..aaf5212d0 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -92,6 +92,9 @@ class DbApiTestCase(test.TestCase): db.instance_destroy(self.context, inst1.id) result = db.instance_get_all_by_filters(self.context.elevated(), {}) self.assertEqual(2, len(result)) - self.assertEqual(result[0].id, inst1.id) - self.assertEqual(result[1].id, inst2.id) - self.assertTrue(result[0].deleted) + self.assertIn(inst1.id, [result[0].id, result[1].id]) + self.assertIn(inst2.id, [result[0].id, result[1].id]) + if inst1.id == result[0].id: + self.assertTrue(result[0].deleted) + else: + self.assertTrue(result[1].deleted) -- cgit