Merge "Minor code style improvements"

virtualbmc/cmd/vbmc.py

@@ -52,10 +52,14 @@ class ZmqClient(object):
 
     SERVER_TIMEOUT = 5000  # milliseconds
 
+    @staticmethod
+    def to_dict(obj):
+        return {attr: getattr(obj, attr)
+                for attr in dir(obj) if not attr.startswith('_')}
+
     def communicate(self, command, args, no_daemon=False):
 
-        data_out = {attr: getattr(args, attr)
-                    for attr in dir(args) if not attr.startswith('_')}
+        data_out = self.to_dict(args)
 
         data_out.update(command=command)
 

virtualbmc/control.py

@@ -143,7 +143,7 @@ def command_dispatcher(vbmc_manager, data_in):
         data_out = [vbmc_manager.delete(domain_name)
                     for domain_name in set(data_in['domain_names'])]
         return {
-            'rc': max([rc for rc, msg in data_out]),
+            'rc': max(rc for rc, msg in data_out),
             'msg': [msg for rc, msg in data_out if msg],
         }
 
@@ -151,7 +151,7 @@ def command_dispatcher(vbmc_manager, data_in):
         data_out = [vbmc_manager.start(domain_name)
                     for domain_name in set(data_in['domain_names'])]
         return {
-            'rc': max([rc for rc, msg in data_out]),
+            'rc': max(rc for rc, msg in data_out),
             'msg': [msg for rc, msg in data_out if msg],
         }
 
@@ -159,7 +159,7 @@ def command_dispatcher(vbmc_manager, data_in):
         data_out = [vbmc_manager.stop(domain_name)
                     for domain_name in set(data_in['domain_names'])]
         return {
-            'rc': max([rc for rc, msg in data_out]),
+            'rc': max(rc for rc, msg in data_out),
             'msg': [msg for rc, msg in data_out if msg],
         }
 

virtualbmc/manager.py

@@ -76,7 +76,7 @@ class VirtualBMCManager(object):
         config = configparser.ConfigParser()
         config.add_section(DEFAULT_SECTION)
 
-        for option, value in sorted(options.items()):
+        for option, value in options.items():
             if value is not None:
                 config.set(DEFAULT_SECTION, option, six.text_type(value))
 
@@ -170,7 +170,7 @@ class VirtualBMCManager(object):
                 if not instance:
 
                     instance = multiprocessing.Process(
-                        name='xxx',
+                        name='vbmcd-managing-domain-%s' % domain_name,
                         target=vbmc_runner,
                         args=(bmc_config,)
                     )