openstack/senlin
Code Issues Proposed changes

Modify node status const using

Browse Source 
Remove node_mod prefix.

Change-Id: I4383b9f1d55cda2341b8465eb62301828fcba7bb
This commit is contained in:
jonnary 2016-10-27 10:32:30 +08:00
parent e29f30669c
commit 33de348c98
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
senlin/engine/service.py
View File

@ -1032,7 +1032,7 @@ class EngineService(service.Service):
try: try:
db_node = self.node_find(context, node) db_node = self.node_find(context, node)
# Skip node in the same cluster already # Skip node in the same cluster already
if db_node.status != node_mod.consts.NS_ACTIVE: if db_node.status != consts.NS_ACTIVE:
bad_nodes.append(db_node.id) bad_nodes.append(db_node.id)
elif len(db_node.cluster_id) != 0: elif len(db_node.cluster_id) != 0:
owned_nodes.append(db_node.id) owned_nodes.append(db_node.id)
@ -1179,7 +1179,7 @@ class EngineService(service.Service):
not_member.append(old_node) not_member.append(old_node)
elif db_new_node.cluster_id: elif db_new_node.cluster_id:
owned_nodes.append(new_node) owned_nodes.append(new_node)
elif db_new_node.status != node_mod.consts.NS_ACTIVE: elif db_new_node.status != consts.NS_ACTIVE:
bad_nodes.append(new_node) bad_nodes.append(new_node)
else: else:
# check the profile type # check the profile type
@ -1749,10 +1749,10 @@ class EngineService(service.Service):
node = self.node_find(context, identity) node = self.node_find(context, identity)
if node.status in [node_mod.consts.NS_CREATING, if node.status in [consts.NS_CREATING,
node_mod.consts.NS_UPDATING, consts.NS_UPDATING,
node_mod.consts.NS_DELETING, consts.NS_DELETING,
node_mod.consts.NS_RECOVERING]: consts.NS_RECOVERING]:
raise exception.ActionInProgress(type='node', id=identity, raise exception.ActionInProgress(type='node', id=identity,
status=node.status) status=node.status)