diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-28 12:31:35 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-28 12:31:35 -0700 |
| commit | ecbd4df9f63f556f6700d3c7a489adaec3ed3a93 (patch) | |
| tree | 95ca449ddc8858a22c9251503c75408d3602f99b | |
| parent | e4cb0d3a93ddc4cae40c4a8c570c7e7d2a0061ff (diff) | |
| parent | bb1540d7bf2c323d43110738e43e9b99ef49b62c (diff) | |
| download | nova-ecbd4df9f63f556f6700d3c7a489adaec3ed3a93.tar.gz nova-ecbd4df9f63f556f6700d3c7a489adaec3ed3a93.tar.xz nova-ecbd4df9f63f556f6700d3c7a489adaec3ed3a93.zip | |
merged network-lease-fix
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index dc7001b93..7a80acd92 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -19,6 +19,8 @@ Implementation of SQLAlchemy backend """ +import sys + from nova import db from nova import exception from nova import flags @@ -349,6 +351,7 @@ def fixed_ip_disassociate_all_by_timeout(_context, host, time): 'time': time.isoformat()}) return result.rowcount + def fixed_ip_get_by_address(_context, address): session = get_session() result = session.query(models.FixedIp @@ -552,7 +555,6 @@ def network_associate(_context, project_id): return network_ref - def network_count(_context): return models.Network.count() |