diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-20 19:07:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-20 19:07:06 +0000 |
| commit | e6fd33ebd2c632c9f713d8d098741ab313cf409a (patch) | |
| tree | 11a84664e5935854319ff1476c0aa5cdca5724a6 | |
| parent | d73417234f7d51ff4259a1f4b81c5b792628d24d (diff) | |
| parent | 6bbe906db0385bcd11e0532b8b180272feb76042 (diff) | |
| download | nova-e6fd33ebd2c632c9f713d8d098741ab313cf409a.tar.gz nova-e6fd33ebd2c632c9f713d8d098741ab313cf409a.tar.xz nova-e6fd33ebd2c632c9f713d8d098741ab313cf409a.zip | |
Merge "Remove straggling use of all-kwarg object methods"
| -rw-r--r-- | nova/objects/instance.py | 2 | ||||
| -rw-r--r-- | nova/tests/objects/test_instance.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/objects/instance.py b/nova/objects/instance.py index c1b765f29..de47f648f 100644 --- a/nova/objects/instance.py +++ b/nova/objects/instance.py @@ -191,7 +191,7 @@ class Instance(base.NovaObject): return instance @base.remotable_classmethod - def get_by_uuid(cls, context, uuid=None, expected_attrs=None): + def get_by_uuid(cls, context, uuid, expected_attrs=None): if expected_attrs is None: expected_attrs = [] diff --git a/nova/tests/objects/test_instance.py b/nova/tests/objects/test_instance.py index a55c5d502..09ce70355 100644 --- a/nova/tests/objects/test_instance.py +++ b/nova/tests/objects/test_instance.py @@ -90,7 +90,7 @@ class _TestInstanceObject(object): self.mox.StubOutWithMock(db, 'instance_get_by_uuid') db.instance_get_by_uuid(ctxt, 'uuid', []).AndReturn(self.fake_instance) self.mox.ReplayAll() - inst = instance.Instance.get_by_uuid(ctxt, uuid='uuid') + inst = instance.Instance.get_by_uuid(ctxt, 'uuid') # Make sure these weren't loaded for attr in instance.INSTANCE_OPTIONAL_FIELDS: attrname = base.get_attrname(attr) |