From 38ff7199bd861886307b6f346d7978100f63937b Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 20 Jun 2013 11:30:54 -0700 Subject: Fix instance object's use of a db query method parameter The limit and marker arguments are kwargs, which need to be correct to pass some mock tests in the unit tests for api. Related to unified-object-model Change-Id: I16b45ff73a6d79313fdd4a1124309f558497ab72 --- nova/objects/instance.py | 4 +++- nova/tests/objects/test_instance.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'nova') 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() -- cgit