Small code fixes and improvements

.gitignore

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

nailgun/nailgun/rpc/receiver.py

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

nailgun/nailgun/task/helpers.py

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

nailgun/nailgun/task/manager.py

@@ -334,7 +334,7 @@ class VerifyNetworksTaskManager(TaskManager):
         )
         if not task.cluster.nodes:
             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')
 
         db().add(task)