diff options
| author | Dmitry Spikhalskiy <dmitry@spikhalskiy.com> | 2013-04-22 22:43:45 +0200 |
|---|---|---|
| committer | Dmitry Spikhalskiy <dmitry@spikhalskiy.com> | 2013-04-22 22:43:45 +0200 |
| commit | 101b80e020646fd82ae089ab9dd053ebab1cf48e (patch) | |
| tree | 43f3ac34561fee7b6b72b948ed35d63fd9de353a | |
| parent | 98990030c84ce9f377e581553ff49ae26de77c9f (diff) | |
| download | nova-101b80e020646fd82ae089ab9dd053ebab1cf48e.tar.gz nova-101b80e020646fd82ae089ab9dd053ebab1cf48e.tar.xz nova-101b80e020646fd82ae089ab9dd053ebab1cf48e.zip | |
Fix fixed_ip_count_by_project in DB API
Fix "by project" filtering in fixed_ip_count_by_project
method of SQLAlchemy DB API implementation.
Fixes: bug #1171161
Change-Id: Id408aba6db4dd953945feba36d17b056266ca4b7
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_db_api.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 4224d9c06..215312bb5 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1266,7 +1266,7 @@ def fixed_ip_count_by_project(context, project_id, session=None): session=session).\ join((models.Instance, models.Instance.uuid == models.FixedIp.instance_uuid)).\ - filter(models.Instance.uuid == project_id).\ + filter(models.Instance.project_id == project_id).\ count() diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 80123f8c3..bdf276432 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -2443,7 +2443,6 @@ class FixedIPTestCase(BaseInstanceTypeTestCase): ips_list = db.fixed_ips_by_virtual_interface(self.ctxt, vif.id) self.assertEquals(0, len(ips_list)) - @test.testtools.skip("bug #1171161") def test_fixed_ip_count_by_project_one_ip(self): PROJECT_ID = "project_id" instance_uuid = self._create_instance(PROJECT_ID) @@ -2453,7 +2452,6 @@ class FixedIPTestCase(BaseInstanceTypeTestCase): ips_count = db.fixed_ip_count_by_project(self.ctxt, PROJECT_ID) self.assertEquals(1, ips_count) - @test.testtools.skip("bug #1171161") def test_fixed_ip_count_by_project_two_ips_for_different_instances(self): PROJECT_ID = "project_id" instance_uuid = self._create_instance(PROJECT_ID) |