diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-13 21:45:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-13 21:45:39 +0000 |
| commit | 0882a1505168e4a020d52f478eebdd3874d98ab1 (patch) | |
| tree | f0ccb73c05398d31afd402d4334f4ace68863954 /nova/objects | |
| parent | 3ce38daace607f45fccd36430af904b868ea72f3 (diff) | |
| parent | 9f6d63c850934f93aada65cad2cf69ace839f6cb (diff) | |
Merge "Fix obj_load() in NovaObject base class"
Diffstat (limited to 'nova/objects')
| -rw-r--r-- | nova/objects/base.py | 2 | ||||
| -rw-r--r-- | nova/objects/instance.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/objects/base.py b/nova/objects/base.py index 09d59b772..2e0797477 100644 --- a/nova/objects/base.py +++ b/nova/objects/base.py @@ -42,7 +42,7 @@ def make_class_properties(cls): def getter(self, name=name, typefn=typefn): attrname = get_attrname(name) if not hasattr(self, attrname): - self.obj_load(name) + self.obj_load_attr(name) return getattr(self, attrname) def setter(self, value, name=name, typefn=typefn): diff --git a/nova/objects/instance.py b/nova/objects/instance.py index 18fdfb94d..aec6fe968 100644 --- a/nova/objects/instance.py +++ b/nova/objects/instance.py @@ -257,7 +257,7 @@ class Instance(base.NovaObject): self[field] != current[field]): self[field] = current[field] - def obj_load(self, attrname): + def obj_load_attr(self, attrname): extra = [] if attrname == 'system_metadata': extra.append('system_metadata') |