diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-08-04 17:30:07 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-08-04 17:30:07 -0700 |
| commit | 64966cbd83cbde6a240dad4ac786fe7a6a116f2f (patch) | |
| tree | 013316d5031e913e09a72f01fdc5cc2e31b8b0b4 | |
| parent | d722d6f635c99a758910f24e7681753599894e70 (diff) | |
| download | nova-64966cbd83cbde6a240dad4ac786fe7a6a116f2f.tar.gz nova-64966cbd83cbde6a240dad4ac786fe7a6a116f2f.tar.xz nova-64966cbd83cbde6a240dad4ac786fe7a6a116f2f.zip | |
pep8 fixes
| -rw-r--r-- | nova/api/openstack/servers.py | 1 | ||||
| -rw-r--r-- | nova/db/api.py | 1 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 63791bcd1..b54897b8a 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -66,7 +66,6 @@ class Controller(object): for opt in unknown_options: search_options.pop(opt, None) - def index(self, req): """ Returns a list of server names and ids for a given user """ try: diff --git a/nova/db/api.py b/nova/db/api.py index 23fac9921..4c8f25f5d 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -495,6 +495,7 @@ def instance_get_all_by_filters(context, filters): """Get all instances that match all filters.""" return IMPL.instance_get_all_by_filters(context, filters) + def instance_get_active_by_window(context, begin, end=None): """Get instances active during a certain time window.""" return IMPL.instance_get_active_by_window(context, begin, end) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 4d724dbdb..36fae1be1 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1205,7 +1205,7 @@ def instance_get_all_by_filters(context, filters): options(joinedload_all('fixed_ips.network')).\ options(joinedload('metadata')).\ options(joinedload('instance_type')) - + filters = filters.copy() if not context.is_admin: |