diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-02 14:09:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-02 14:09:28 +0000 |
| commit | 7a378c212be4f52d24e35a177853dfba003f6445 (patch) | |
| tree | 1cbbfdbf5297e3cb81a5da01e046d3120155abfd /nova/db | |
| parent | bdb3b3c09216154ce9eb749798742f40ef43da94 (diff) | |
| parent | e12339def3d9182f5ab23869e6bdc946e8e42825 (diff) | |
| download | nova-7a378c212be4f52d24e35a177853dfba003f6445.tar.gz nova-7a378c212be4f52d24e35a177853dfba003f6445.tar.xz nova-7a378c212be4f52d24e35a177853dfba003f6445.zip | |
Merge "populate dnsmasq lease db with valid leases"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 61538fcdf..393e1a03c 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2212,7 +2212,9 @@ def network_get_associated_fixed_ips(context, network_id, host=None): models.VirtualInterface.address, models.Instance.hostname, models.Instance.updated_at, - models.Instance.created_at).\ + models.Instance.created_at, + models.FixedIp.allocated, + models.FixedIp.leased).\ filter(models.FixedIp.deleted == 0).\ filter(models.FixedIp.network_id == network_id).\ filter(models.FixedIp.allocated == True).\ @@ -2234,6 +2236,8 @@ def network_get_associated_fixed_ips(context, network_id, host=None): cleaned['instance_hostname'] = datum[5] cleaned['instance_updated'] = datum[6] cleaned['instance_created'] = datum[7] + cleaned['allocated'] = datum[8] + cleaned['leased'] = datum[9] data.append(cleaned) return data |