diff options
| author | Ruby Loo <ruby.loo@intel.com> | 2016-12-06 18:07:17 +0000 |
|---|---|---|
| committer | Ruby Loo <ruby.loo@intel.com> | 2016-12-06 18:07:17 +0000 |
| commit | c7763a7e0251d672ed7d3c30b2aff3622ae7d814 (patch) | |
| tree | dbc1c3cee77fc1a773b9caf2206ed2afc0f7bd6f /ironic/objects/node.py | |
| parent | 349a4dd3235f76548afdf92ce69b6ff6aacc74bd (diff) | |
| download | ironic-c7763a7e0251d672ed7d3c30b2aff3622ae7d814.tar.gz | |
Clean up object code
This:
1. replaces hardcoded object names with the 'cls' variable where
appropriate.
2. removes __class__ from calls to <an object>.__class__.<class method>
since <an object>.<class method> works.
This is a follow up to reviewers' comments in
f766bbab451cd8a0b37b1085ee4d95bcda95a8b8.
Change-Id: Iecd057ec9a166620b22a6d6c3f780eed3f60b655
Diffstat (limited to 'ironic/objects/node.py')
| -rw-r--r-- | ironic/objects/node.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ironic/objects/node.py b/ironic/objects/node.py index bd63a1770..e47702cd8 100644 --- a/ironic/objects/node.py +++ b/ironic/objects/node.py @@ -182,7 +182,7 @@ class Node(base.IronicObject, object_base.VersionedObjectDictCompat): :returns: a :class:`Node` object. """ db_node = cls.dbapi.get_node_by_id(node_id) - node = Node._from_db_object(cls(context), db_node) + node = cls._from_db_object(cls(context), db_node) return node # NOTE(xek): We don't want to enable RPC on this call just yet. Remotable @@ -197,7 +197,7 @@ class Node(base.IronicObject, object_base.VersionedObjectDictCompat): :returns: a :class:`Node` object. """ db_node = cls.dbapi.get_node_by_uuid(uuid) - node = Node._from_db_object(cls(context), db_node) + node = cls._from_db_object(cls(context), db_node) return node # NOTE(xek): We don't want to enable RPC on this call just yet. Remotable @@ -212,7 +212,7 @@ class Node(base.IronicObject, object_base.VersionedObjectDictCompat): :returns: a :class:`Node` object. """ db_node = cls.dbapi.get_node_by_name(name) - node = Node._from_db_object(cls(context), db_node) + node = cls._from_db_object(cls(context), db_node) return node # NOTE(xek): We don't want to enable RPC on this call just yet. Remotable @@ -227,7 +227,7 @@ class Node(base.IronicObject, object_base.VersionedObjectDictCompat): :returns: a :class:`Node` object. """ db_node = cls.dbapi.get_node_by_instance(instance_uuid) - node = Node._from_db_object(cls(context), db_node) + node = cls._from_db_object(cls(context), db_node) return node # NOTE(xek): We don't want to enable RPC on this call just yet. Remotable @@ -272,7 +272,7 @@ class Node(base.IronicObject, object_base.VersionedObjectDictCompat): """ db_node = cls.dbapi.reserve_node(tag, node_id) - node = Node._from_db_object(cls(context), db_node) + node = cls._from_db_object(cls(context), db_node) return node # NOTE(xek): We don't want to enable RPC on this call just yet. Remotable @@ -376,7 +376,7 @@ class Node(base.IronicObject, object_base.VersionedObjectDictCompat): A context should be set when instantiating the object, e.g.: Node(context) """ - current = self.__class__.get_by_uuid(self._context, self.uuid) + current = self.get_by_uuid(self._context, self.uuid) self.obj_refresh(current) # NOTE(xek): We don't want to enable RPC on this call just yet. Remotable @@ -397,7 +397,7 @@ class Node(base.IronicObject, object_base.VersionedObjectDictCompat): :returns: a :class:`Node` object. """ db_node = cls.dbapi.get_node_by_port_addresses(addresses) - node = Node._from_db_object(cls(context), db_node) + node = cls._from_db_object(cls(context), db_node) return node |