diff options
| author | Kevin Bringard <kbringard@attinteractive.com> | 2011-07-01 12:32:26 -0600 |
|---|---|---|
| committer | Kevin Bringard <kbringard@attinteractive.com> | 2011-07-01 12:32:26 -0600 |
| commit | 42ef4e0adb7b0ec939f40d5356d4a3d2d03dec9f (patch) | |
| tree | e56b19cd53a1fedb462b0f5d9c27ea8ecbcc3fd6 | |
| parent | 3a65ea2f29ca169779cbd09acf4f7ac50314c969 (diff) | |
Found some additional fixed_ip. entries in the Intance model contest that needed to be updated
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 7278ad1f5..fd7ace4c7 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1141,9 +1141,9 @@ def instance_get_active_by_window(context, begin, end=None): """Return instances that were continuously active over the given window""" session = get_session() query = session.query(models.Instance).\ - options(joinedload_all('fixed_ip.floating_ips')).\ + options(joinedload_all('fixed_ips.floating_ips')).\ options(joinedload('security_groups')).\ - options(joinedload_all('fixed_ip.network')).\ + options(joinedload_all('fixed_ips.network')).\ options(joinedload('instance_type')).\ filter(models.Instance.launched_at < begin) if end: |