openstack
/
fuel-web
Code Issues Proposed changes

Small code fixes and improvements

This commit is contained in:
Dmitry Shulyak 2013-09-30 13:36:30 +03:00
parent 146d8412e2
commit 12d9bd06a7
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -11,9 +11,10 @@
*.pid *.pid
# Vagrant housekeeping file # Vagrant housekeeping file
/.vagrant .vagrant
/build build
dist
/local_mirror /local_mirror
/virtualbox/iso/*.iso /virtualbox/iso/*.iso
nosetests.xml nosetests.xml
@ -23,5 +24,4 @@ lock
.idea .idea
.DS_Store .DS_Store
Nailgun.egg-info *.egg-info
Shotgun.egg-info

31
nailgun/nailgun/rpc/receiver.py
View File

@ -587,16 +587,16 @@ class NailgunReceiver(object):
For example of kwargs check FakeCheckingDhcpThread For example of kwargs check FakeCheckingDhcpThread
""" """
logger.info( logger.info(
"RPC method check_dhcp_resp received: %s" % "RPC method check_dhcp_resp received: %s",
json.dumps(kwargs) json.dumps(kwargs)
) )
messages = [] messages = []
result = collections.defaultdict(list) result = collections.defaultdict(list)
message_template = ("Dhcp server on {server_id} - {mac}." message_template = (u"Dhcp server on {server_id} - {mac}."
"Discovered from node {yiaddr} on {iface}.") "Discovered from node {yiaddr} on {iface}.")
task_uuid = kwargs.get('task_uuid') task_uuid = kwargs.get('task_uuid')
nodes = kwargs.get('nodes') nodes = kwargs.get('nodes', [])
error_msg = kwargs.get('error') error_msg = kwargs.get('error')
status = kwargs.get('status') status = kwargs.get('status')
progress = kwargs.get('progress') progress = kwargs.get('progress')
@ -604,19 +604,18 @@ class NailgunReceiver(object):
macs = [item['addr'] for item in cls._get_master_macs()] macs = [item['addr'] for item in cls._get_master_macs()]
logger.debug('Mac addr on master node %s', macs) logger.debug('Mac addr on master node %s', macs)
if nodes: for node in nodes:
for node in nodes: if node['status'] == 'ready':
if node['status'] == 'ready': for row in node.get('data', []):
for row in node.get('data', []): if row['mac'] not in macs:
if row['mac'] not in macs: messages.append(message_template.format(**row))
messages.append(message_template.format(**row)) result[node['uid']].append(row)
result[node['uid']].append(row) elif node['status'] == 'error':
elif node['status'] == 'error': messages.append(node.get('error_msg',
messages.append(node.get('error_msg', ('Dhcp check method failed.'
('Dhcp check method failed.' ' Check logs for details.')))
' Check logs for details.'))) status = status if not messages else "error"
status = status if not messages else "error" error_msg = '\n'.join(messages) if messages else error_msg
error_msg = '\n'.join(messages) if messages else error_msg
TaskHelper.update_task_status(task_uuid, status, TaskHelper.update_task_status(task_uuid, status,
progress, error_msg, result) progress, error_msg, result)

4
nailgun/nailgun/task/helpers.py
View File

@ -154,7 +154,7 @@ class TaskHelper(object):
if all(map(lambda s: s.status == 'ready', subtasks)): if all(map(lambda s: s.status == 'ready', subtasks)):
task.status = 'ready' task.status = 'ready'
task.progress = 100 task.progress = 100
task.message = '\n'.join(map( task.message = u'\n'.join(map(
lambda s: s.message, filter( lambda s: s.message, filter(
lambda s: s.message is not None, subtasks))) lambda s: s.message is not None, subtasks)))
db().add(task) db().add(task)
@ -163,7 +163,7 @@ class TaskHelper(object):
elif all(map(lambda s: s.status in ('ready', 'error'), subtasks)): elif all(map(lambda s: s.status in ('ready', 'error'), subtasks)):
task.status = 'error' task.status = 'error'
task.progress = 100 task.progress = 100
task.message = '\n'.join(list(set(map( task.message = u'\n'.join(list(set(map(
lambda s: (s.message or ""), filter( lambda s: (s.message or ""), filter(
lambda s: ( lambda s: (
s.status == 'error' and not s.status == 'error' and not

2
nailgun/nailgun/task/manager.py
View File

@ -334,7 +334,7 @@ class VerifyNetworksTaskManager(TaskManager):
) )
if not task.cluster.nodes: if not task.cluster.nodes:
task.status = 'error' task.status = 'error'
task.message = ('There should be atleast 1 node for dhcp check.' task.message = ('There should be at least 1 node for dhcp check.'
'And 2 nodes for connectivity check') 'And 2 nodes for connectivity check')
db().add(task) db().add(task)