Further pylint cleanup

3 files changed, 23 insertions, 15 deletions

diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index ad9188ff3..02969c8e9 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -103,7 +103,7 @@ class CloudController(object):
         result = {}
         for instance in self.instdir.all:
             if instance['project_id'] == project_id:
-                line = '%s slots=%d' % (instance['private_dns_name'], 
+                line = '%s slots=%d' % (instance['private_dns_name'],
                     INSTANCE_TYPES[instance['instance_type']]['vcpus'])
                 if instance['key_name'] in result:
                     result[instance['key_name']].append(line)
@@ -423,7 +423,7 @@ class CloudController(object):
             i['key_name'] = instance.get('key_name', None)
             if context.user.is_admin():
                 i['key_name'] = '%s (%s, %s)' % (i['key_name'],
-                    instance.get('project_id', None), 
+                    instance.get('project_id', None),
                     instance.get('node_name', ''))
             i['product_codes_set'] = self._convert_to_set(
                 instance.get('product_codes', None), 'product_code')
@@ -560,15 +560,15 @@ class CloudController(object):
         # TODO: Get the real security group of launch in here
         security_group = "default"
         for num in range(int(kwargs['max_count'])):
-            vpn = False
+            is_vpn = False
             if image_id  == FLAGS.vpn_image_id:
-                vpn = True
+                is_vpn = True
             allocate_result = yield rpc.call(network_topic,
                      {"method": "allocate_fixed_ip",
                       "args": {"user_id": context.user.id,
                                "project_id": context.project.id,
                                "security_group": security_group,
-                               "vpn": vpn}})
+                               "is_vpn": is_vpn}})
             allocate_data = allocate_result['result']
             inst = self.instdir.new()
             inst['image_id'] = image_id
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 2f6a9638d..56b4a9dd2 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -158,7 +158,7 @@ def start_dnsmasq(network):
         #           correct dnsmasq process
         try:
             os.kill(pid, signal.SIGHUP)
-        except Exception as exc:  # pylint: disable-msg=W0703
+        except Exception as exc:  # pylint: disable=W0703
             logging.debug("Hupping dnsmasq threw %s", exc)
 
     # otherwise delete the existing leases file and start dnsmasq
@@ -179,7 +179,7 @@ def stop_dnsmasq(network):
     if pid:
         try:
             os.kill(pid, signal.SIGTERM)
-        except Exception as exc:  # pylint: disable-msg=W0703
+        except Exception as exc:  # pylint: disable=W0703
             logging.debug("Killing dnsmasq threw %s", exc)
 
 
diff --git a/nova/network/service.py b/nova/network/service.py
index f13324103..fd45496c9 100644
--- a/nova/network/service.py
+++ b/nova/network/service.py
@@ -17,7 +17,7 @@
 #    under the License.
 
 """
-Network Nodes are responsible for allocating ips and setting up network
+Network Hosts are responsible for allocating ips and setting up network
 """
 
 from nova import datastore
@@ -53,6 +53,7 @@ flags.DEFINE_string('flat_network_dns', '8.8.4.4',
 
 
 def type_to_class(network_type):
+    """Convert a network_type string into an actual Python class"""
     if network_type == 'flat':
         return FlatNetworkService
     elif network_type == 'vlan':
@@ -61,6 +62,7 @@ def type_to_class(network_type):
 
 
 def setup_compute_network(network_type, user_id, project_id, security_group):
+    """Sets up the network on a compute host"""
     srv = type_to_class(network_type)
     srv.setup_compute_network(network_type,
                               user_id,
@@ -69,12 +71,14 @@ def setup_compute_network(network_type, user_id, project_id, security_group):
 
 
 def get_host_for_project(project_id):
+    """Get host allocated to project from datastore"""
     redis = datastore.Redis.instance()
     return redis.get(_host_key(project_id))
 
 
 def _host_key(project_id):
-    return "network_host:%s" % project_id
+    """Returns redis host key for network"""
+    return "networkhost:%s" % project_id
 
 
 class BaseNetworkService(service.Service):
@@ -84,6 +88,7 @@ class BaseNetworkService(service.Service):
     """
     def __init__(self, *args, **kwargs):
         self.network = model.PublicNetworkController()
+        super(BaseNetworkService, self).__init__(*args, **kwargs)
 
     def set_network_host(self, user_id, project_id, *args, **kwargs):
         """Safely sets the host of the projects network"""
@@ -113,7 +118,7 @@ class BaseNetworkService(service.Service):
         pass
 
     @classmethod
-    def setup_compute_network(self, user_id, project_id, security_group,
+    def setup_compute_network(cls, user_id, project_id, security_group,
                               *args, **kwargs):
         """Sets up matching network for compute hosts"""
         raise NotImplementedError()
@@ -142,7 +147,7 @@ class FlatNetworkService(BaseNetworkService):
     """Basic network where no vlans are used"""
 
     @classmethod
-    def setup_compute_network(self, user_id, project_id, security_group,
+    def setup_compute_network(cls, user_id, project_id, security_group,
                               *args, **kwargs):
         """Network is created manually"""
         pass
@@ -186,13 +191,14 @@ class VlanNetworkService(BaseNetworkService):
     #             simplified and improved.  Also there it may be useful
     #             to support vlans separately from dhcp, instead of having
     #             both of them together in this class.
+    # pylint: disable=W0221
     def allocate_fixed_ip(self, user_id, project_id,
                           security_group='default',
-                          vpn=False, *args, **kwargs):
-        """Gets a fixed ip from the pool """
+                          is_vpn=False, *args, **kwargs):
+        """Gets a fixed ip from the pool"""
         mac = utils.generate_mac()
         net = model.get_project_network(project_id)
-        if vpn:
+        if is_vpn:
             fixed_ip = net.allocate_vpn_ip(user_id, project_id, mac)
         else:
             fixed_ip = net.allocate_ip(user_id, project_id, mac)
@@ -207,9 +213,11 @@ class VlanNetworkService(BaseNetworkService):
         return model.get_network_by_address(fixed_ip).deallocate_ip(fixed_ip)
 
     def lease_ip(self, address):
+        """Called by bridge when ip is leased"""
         return model.get_network_by_address(address).lease_ip(address)
 
     def release_ip(self, address):
+        """Called by bridge when ip is released"""
         return model.get_network_by_address(address).release_ip(address)
 
     def restart_nets(self):
@@ -223,7 +231,7 @@ class VlanNetworkService(BaseNetworkService):
         vpn.NetworkData.create(project_id)
 
     @classmethod
-    def setup_compute_network(self, user_id, project_id, security_group,
+    def setup_compute_network(cls, user_id, project_id, security_group,
                               *args, **kwargs):
         """Sets up matching network for compute hosts"""
         # NOTE(vish): Use BridgedNetwork instead of DHCPNetwork because