diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-26 18:26:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-26 18:26:25 +0000 |
| commit | 98e8670812a854c019d30846575107197d7c287f (patch) | |
| tree | bd6141e289e19f6e765d2c1978d92bc214b3d694 /nova | |
| parent | 165fbb80844381baf35d6d0fac72a8c5823936cf (diff) | |
| parent | 38ff7199bd861886307b6f346d7978100f63937b (diff) | |
| download | nova-98e8670812a854c019d30846575107197d7c287f.tar.gz nova-98e8670812a854c019d30846575107197d7c287f.tar.xz nova-98e8670812a854c019d30846575107197d7c287f.zip | |
Merge "Fix instance object's use of a db query method parameter"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/objects/instance.py | 4 | ||||
| -rw-r--r-- | nova/tests/objects/test_instance.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/objects/instance.py b/nova/objects/instance.py index 4f1db6302..6a18736d1 100644 --- a/nova/objects/instance.py +++ b/nova/objects/instance.py @@ -33,6 +33,8 @@ INSTANCE_OPTIONAL_FIELDS = ['metadata', 'system_metadata', 'fault'] INSTANCE_IMPLIED_FIELDS = ['info_cache', 'security_groups'] # These are fields that are optional but don't translate to db columns INSTANCE_OPTIONAL_NON_COLUMNS = ['fault'] +# These are all fields that most query calls load by default +INSTANCE_DEFAULT_FIELDS = INSTANCE_OPTIONAL_FIELDS + INSTANCE_IMPLIED_FIELDS class Instance(base.NovaObject): @@ -359,7 +361,7 @@ class InstanceList(base.ObjectListBase, base.NovaObject): sort_key=None, sort_dir=None, limit=None, marker=None, expected_attrs=None): db_inst_list = db.instance_get_all_by_filters( - context, filters, sort_key, sort_dir, limit, marker, + context, filters, sort_key, sort_dir, limit=limit, marker=marker, columns_to_join=expected_cols(expected_attrs)) return _make_instance_list(context, cls(), db_inst_list, expected_attrs) diff --git a/nova/tests/objects/test_instance.py b/nova/tests/objects/test_instance.py index f886e2f41..9f222951a 100644 --- a/nova/tests/objects/test_instance.py +++ b/nova/tests/objects/test_instance.py @@ -316,7 +316,7 @@ class _TestInstanceListObject(object): ctxt = context.get_admin_context() self.mox.StubOutWithMock(db, 'instance_get_all_by_filters') db.instance_get_all_by_filters(ctxt, {'foo': 'bar'}, 'uuid', 'asc', - None, None, + limit=None, marker=None, columns_to_join=['metadata']).AndReturn( fakes) self.mox.ReplayAll() |