Commit 961d69dc authored by Vincent Pelletier's avatar Vincent Pelletier

Call _getClassFromNodeType rather than duplicating its code.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2047 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent bbaa9a63
...@@ -425,6 +425,10 @@ class NodeManager(object): ...@@ -425,6 +425,10 @@ class NodeManager(object):
def update(self, node_list): def update(self, node_list):
for node_type, addr, uuid, state in node_list: for node_type, addr, uuid, state in node_list:
# This should be done here (although klass might not be used in this
# iteration), as it raises if type is not valid.
klass = self._getClassFromNodeType(node_type)
# lookup in current table # lookup in current table
node_by_uuid = self.getByUUID(uuid) node_by_uuid = self.getByUUID(uuid)
node_by_addr = self.getByAddress(addr) node_by_addr = self.getByAddress(addr)
...@@ -446,9 +450,6 @@ class NodeManager(object): ...@@ -446,9 +450,6 @@ class NodeManager(object):
# exists only by address, # exists only by address,
self.remove(node) self.remove(node)
# don't exists, add it # don't exists, add it
klass = NODE_TYPE_MAPPING.get(node_type, None)
if klass is None:
raise RuntimeError('Unknown node type')
node = klass(self, address=addr, uuid=uuid) node = klass(self, address=addr, uuid=uuid)
node.setState(state) node.setState(state)
logging.debug('create node %s %s %s %s' % log_args) logging.debug('create node %s %s %s %s' % log_args)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment