diff options
| -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) |