Merge lp:~salvatore-orlando/neutron/bug822813 into lp:neutron/diablo

[Salvatore Orlando]

This merge proposal is aimed at reducing pylint violations.
We currently have 1321 violations, 39 high.
The proposed branch brings violations back to 981, 23 of which high.

More could be done, but I did not want to generate an overwhelming diff.

[Tyler Smith (tylesmit)]

Looks good/tests pass.

review: Approve

[dan wendlandt (danwent)]

This branch is large enough that we decided to target it for Essex, not diablo.

[Salvatore Orlando (salvatore-orlando)]

Agreed

[Somik Behera (somikbehera)]

Hi Salvatore,

Great work! Most of changes look innocuous and help us better our pylint score!

I had just one concern regarding your changing of handling exceptions in cli_lib.py to handle only QuantumException.

I agree with your approach, and that's exactly how I would do it too, except for the fact that client.py still raises plain Exception as the default unknown exception.

client.py Line 202

                # Add error code and message to exception arguments
                ex = Exception("Server returned error: %s" % status_code)
                ex.args = ([dict(status_code=status_code,

                                 message=error_message)],)

                raise ex

The correct way to fix this in my opinion is to fix client.py to default to QuantumException as the exception client.py classes raise when we get a unknown error code from the server. QuantumException can be our catch-all exception indicating something bad but unknown happened at the remote server.

If that is difficult, then we can file a bug to that effect and revert your cli_lib.py changes to catch Exception instead of just QuantumException.

review: Needs Fixing (netstack-core)

[dan wendlandt (danwent)]

We will need to merge this commit over on github now.

Unmerged revisions

64. By Salvatore Orlando on 2011-09-02

Bringing violations back below 1000

63. By Salvatore Orlando on 2011-09-02

just starting. realized need another merge trunk

=== modified file 'quantum/api/api_common.py'
--- quantum/api/api_common.py	2011-08-08 14:52:05 +0000
+++ quantum/api/api_common.py	2011-09-02 10:10:23 +0000
@@ -15,6 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+""" Base controller class for Quantum API """
+
 import logging
 
 from webob import exc
@@ -31,6 +33,9 @@
 
     def __init__(self, plugin):
         self._plugin = plugin
+        # This variable will be initialized by subclasses
+        if not hasattr(self, '_resource_name'):
+            self._resource_name = ''
         super(QuantumController, self).__init__()
 
     def _parse_request_params(self, req, params):

=== modified file 'quantum/api/attachments.py'
--- quantum/api/attachments.py	2011-08-25 17:50:05 +0000
+++ quantum/api/attachments.py	2011-09-02 10:10:23 +0000
@@ -13,6 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+""" Controller for API operations for managing attachments for
+    Quantum logical ports
+"""
+
 import logging
 
 from webob import exc
@@ -50,38 +54,38 @@
             builder = attachments_view.get_view_builder(request)
             result = builder.build(att_data)['attachment']
             return dict(attachment=result)
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
-        except exception.PortNotFound as e:
-            return faults.Fault(faults.PortNotFound(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
+        except exception.PortNotFound as ex:
+            return faults.Fault(faults.PortNotFound(ex))
 
     def attach_resource(self, request, tenant_id, network_id, id):
         try:
             request_params = \
                 self._parse_request_params(request,
                                            self._attachment_ops_param_list)
-        except exc.HTTPError as e:
-            return faults.Fault(e)
+        except exc.HTTPError as ex:
+            return faults.Fault(ex)
         try:
             LOG.debug("PLUGGING INTERFACE:%s", request_params['id'])
             self._plugin.plug_interface(tenant_id, network_id, id,
                                         request_params['id'])
             return exc.HTTPNoContent()
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
-        except exception.PortNotFound as e:
-            return faults.Fault(faults.PortNotFound(e))
-        except exception.PortInUse as e:
-            return faults.Fault(faults.PortInUse(e))
-        except exception.AlreadyAttached as e:
-            return faults.Fault(faults.AlreadyAttached(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
+        except exception.PortNotFound as ex:
+            return faults.Fault(faults.PortNotFound(ex))
+        except exception.PortInUse as ex:
+            return faults.Fault(faults.PortInUse(ex))
+        except exception.AlreadyAttached as ex:
+            return faults.Fault(faults.AlreadyAttached(ex))
 
     def detach_resource(self, request, tenant_id, network_id, id):
         try:
             self._plugin.unplug_interface(tenant_id,
                                           network_id, id)
             return exc.HTTPNoContent()
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
-        except exception.PortNotFound as e:
-            return faults.Fault(faults.PortNotFound(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
+        except exception.PortNotFound as ex:
+            return faults.Fault(faults.PortNotFound(ex))

=== modified file 'quantum/api/networks.py'
--- quantum/api/networks.py	2011-08-17 21:48:56 +0000
+++ quantum/api/networks.py	2011-09-02 10:10:23 +0000
@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+""" Controller for API operations for managing Quantum networks """
+
 import logging
 
 from webob import exc
@@ -48,6 +50,11 @@
 
     def _item(self, req, tenant_id, network_id,
               net_details=True, port_details=False):
+        """ Retrieves a specific network.
+            net_details = False, port_details = False -> only ID
+            net_details = True,  port_details = False -> ID, name
+            net_details = True,  port_details = True  -> also port details
+        """
         # We expect get_network_details to return information
         # concerning logical ports as well.
         network = self._plugin.get_network_details(
@@ -79,10 +86,14 @@
         try:
             return self._item(request, tenant_id, id,
                               net_details=True, port_details=False)
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
 
     def detail(self, request, **kwargs):
+        """ Implements the 'detail' action for providing details
+            about a specific network.
+
+        """
         tenant_id = kwargs.get('tenant_id')
         network_id = kwargs.get('id')
         if network_id:
@@ -100,8 +111,8 @@
             request_params = \
                 self._parse_request_params(request,
                                            self._network_ops_param_list)
-        except exc.HTTPError as e:
-            return faults.Fault(e)
+        except exc.HTTPError as ex:
+            return faults.Fault(ex)
         network = self._plugin.\
                    create_network(tenant_id,
                                   request_params['name'])
@@ -122,15 +133,15 @@
             self._plugin.rename_network(tenant_id, id,
                                         request_params['name'])
             return exc.HTTPNoContent()
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
 
     def delete(self, request, tenant_id, id):
         """ Destroys the network with the given id """
         try:
             self._plugin.delete_network(tenant_id, id)
             return exc.HTTPNoContent()
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
-        except exception.NetworkInUse as e:
-            return faults.Fault(faults.NetworkInUse(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
+        except exception.NetworkInUse as ex:
+            return faults.Fault(faults.NetworkInUse(ex))

=== modified file 'quantum/api/ports.py'
--- quantum/api/ports.py	2011-08-17 21:48:56 +0000
+++ quantum/api/ports.py	2011-09-02 10:10:23 +0000
@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+""" Controller for API operations for managing Quantum logical ports """
+
 import logging
 
 from webob import exc
@@ -32,7 +34,7 @@
         'param-name': 'state',
         'default-value': 'DOWN',
         'required': False}, ]
-
+#look for port state in request
     _serialization_metadata = {
         "application/xml": {
             "attributes": {
@@ -63,8 +65,8 @@
             result = [builder.build(port, port_details)['port']
                       for port in port_list]
             return dict(ports=result)
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
 
     def _item(self, request, tenant_id, network_id, port_id,
               att_details=False):
@@ -81,15 +83,18 @@
         return self._items(request, tenant_id, network_id, port_details=False)
 
     def show(self, request, tenant_id, network_id, id):
-        """ Returns port details for given port and network """
+        """ Returns info for given port and network """
         try:
             return self._item(request, tenant_id, network_id, id)
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
-        except exception.PortNotFound as e:
-            return faults.Fault(faults.PortNotFound(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
+        except exception.PortNotFound as ex:
+            return faults.Fault(faults.PortNotFound(ex))
 
     def detail(self, request, **kwargs):
+        """ Implements the 'detail' action.
+            Returns detailed information about a specific port.
+        """
         tenant_id = kwargs.get('tenant_id')
         network_id = kwargs.get('network_id')
         port_id = kwargs.get('id')
@@ -117,10 +122,10 @@
             builder = ports_view.get_view_builder(request)
             result = builder.build(port)['port']
             return dict(port=result)
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
-        except exception.StateInvalid as e:
-            return faults.Fault(faults.RequestedStateInvalid(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
+        except exception.StateInvalid as ex:
+            return faults.Fault(faults.RequestedStateInvalid(ex))
 
     def update(self, request, tenant_id, network_id, id):
         """ Updates the state of a port for a given network """
@@ -134,22 +139,21 @@
             self._plugin.update_port(tenant_id, network_id, id,
                                      request_params['state'])
             return exc.HTTPNoContent()
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
-        except exception.PortNotFound as e:
-            return faults.Fault(faults.PortNotFound(e))
-        except exception.StateInvalid as e:
-            return faults.Fault(faults.RequestedStateInvalid(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
+        except exception.PortNotFound as ex:
+            return faults.Fault(faults.PortNotFound(ex))
+        except exception.StateInvalid as ex:
+            return faults.Fault(faults.RequestedStateInvalid(ex))
 
     def delete(self, request, tenant_id, network_id, id):
         """ Destroys the port with the given id """
-        #look for port state in request
         try:
             self._plugin.delete_port(tenant_id, network_id, id)
             return exc.HTTPNoContent()
-        except exception.NetworkNotFound as e:
-            return faults.Fault(faults.NetworkNotFound(e))
-        except exception.PortNotFound as e:
-            return faults.Fault(faults.PortNotFound(e))
-        except exception.PortInUse as e:
-            return faults.Fault(faults.PortInUse(e))
+        except exception.NetworkNotFound as ex:
+            return faults.Fault(faults.NetworkNotFound(ex))
+        except exception.PortNotFound as ex:
+            return faults.Fault(faults.PortNotFound(ex))
+        except exception.PortInUse as ex:
+            return faults.Fault(faults.PortInUse(ex))

=== modified file 'quantum/cli_lib.py'
--- quantum/cli_lib.py	2011-08-26 20:22:18 +0000
+++ quantum/cli_lib.py	2011-09-02 10:10:23 +0000
@@ -19,17 +19,22 @@
 # @author: Brad Hall, Nicira Networks, Inc.
 # @author: Salvatore Orlando, Citrix
 
+""" Functions used by Quantum CLI """
+
 import Cheetah.Template as cheetah_template
 import logging
 import os
 import sys
 
+from quantum.common.exceptions import QuantumException
+
 FORMAT = "json"
 CLI_TEMPLATE = "cli_output.template"
 LOG = logging.getLogger('quantum.cli_lib')
 
 
 def _handle_exception(ex):
+    """ Handles an exception occured in the client library. """
     LOG.exception(sys.exc_info())
     print "Exception:%s - %s" % (sys.exc_info()[0], sys.exc_info()[1])
     status_code = None
@@ -61,6 +66,7 @@
 
 
 def list_nets(client, *args):
+    """ Lists currently available networks """
     tenant_id = args[0]
     res = client.list_networks()
     LOG.debug("Operation 'list_networks' executed.")
@@ -69,6 +75,7 @@
 
 
 def create_net(client, *args):
+    """ Creates a network. Argument list must include network name. """
     tenant_id, name = args
     data = {'network': {'name': name}}
     new_net_id = None
@@ -79,11 +86,12 @@
         output = prepare_output("create_net", tenant_id,
                                 dict(network_id=new_net_id))
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def delete_net(client, *args):
+    """ Removes a networks. Argument list must include network id. """
     tenant_id, network_id = args
     try:
         client.delete_network(network_id)
@@ -91,11 +99,12 @@
         output = prepare_output("delete_net", tenant_id,
                             dict(network_id=network_id))
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def show_net(client, *args):
+    """ Retrieves a network. Argument list must include network id. """
     tenant_id, network_id = args
     try:
         #NOTE(salvatore-orlando) changed for returning exclusively
@@ -104,11 +113,15 @@
         LOG.debug("Operation 'show_network_details' executed.")
         output = prepare_output("show_net", tenant_id, dict(network=res))
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def rename_net(client, *args):
+    """ Renames a network.
+        Argument list must include network id, and new network name.
+
+    """
     tenant_id, network_id, name = args
     data = {'network': {'name': '%s' % name}}
     try:
@@ -118,11 +131,15 @@
         data['network']['id'] = network_id
         output = prepare_output("rename_net", tenant_id, data)
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def list_ports(client, *args):
+    """ Lists ports configured for a given network.
+        Argument list must include network id.
+
+    """
     tenant_id, network_id = args
     try:
         ports = client.list_ports(network_id)
@@ -131,11 +148,15 @@
         data['network_id'] = network_id
         output = prepare_output("list_ports", tenant_id, data)
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def create_port(client, *args):
+    """ Creates a logical port on the given network.
+        Argument list must include network id.
+
+    """
     tenant_id, network_id = args
     try:
         res = client.create_port(network_id)
@@ -145,11 +166,15 @@
                                 dict(network_id=network_id,
                                      port_id=new_port_id))
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def delete_port(client, *args):
+    """ Removes a logical port from the given network.
+        Argument list must include network id.
+
+    """
     tenant_id, network_id, port_id = args
     try:
         client.delete_port(network_id, port_id)
@@ -158,12 +183,16 @@
                                 dict(network_id=network_id,
                                      port_id=port_id))
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
         return
 
 
 def show_port(client, *args):
+    """ Retrieves a specific logical port.
+        Argument list must include network id and port id.
+
+    """
     tenant_id, network_id, port_id = args
     try:
         port = client.show_port_details(network_id, port_id)["port"]
@@ -181,11 +210,15 @@
                                 dict(network_id=network_id,
                                      port=port))
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def set_port_state(client, *args):
+    """ Updates the administrative state for a logical port.
+        Argument list must include network id and port_id.
+
+    """
     tenant_id, network_id, port_id, new_state = args
     data = {'port': {'state': '%s' % new_state}}
     try:
@@ -196,11 +229,16 @@
         data['port']['id'] = port_id
         output = prepare_output("set_port_state", tenant_id, data)
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def plug_iface(client, *args):
+    """ Plugs an interface into the given logical port.
+        Argument list must include network id, port id, and attachment id.
+
+    """
+
     tenant_id, network_id, port_id, attachment = args
     try:
         data = {'attachment': {'id': '%s' % attachment}}
@@ -211,11 +249,15 @@
                                      port_id=port_id,
                                      attachment=attachment))
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)
 
 
 def unplug_iface(client, *args):
+    """ Remove an interface from the given logical port.
+        Argument list must include network id and port id.
+
+    """
     tenant_id, network_id, port_id = args
     try:
         client.detach_resource(network_id, port_id)
@@ -224,5 +266,5 @@
                                 dict(network_id=network_id,
                                      port_id=port_id))
         print output
-    except Exception as ex:
+    except QuantumException as ex:
         _handle_exception(ex)

=== modified file 'quantum/client.py'
--- quantum/client.py	2011-08-30 01:59:14 +0000
+++ quantum/client.py	2011-09-02 10:10:23 +0000
@@ -16,6 +16,8 @@
 #    under the License.
 #    @author: Tyler Smith, Cisco Systems
 
+""" Client Library for accessing Quantum API """
+
 import logging
 import httplib
 import socket
@@ -46,7 +48,7 @@
             """
             Temporarily sets the format and tenant for this request
             """
-            (format, tenant) = (instance.format, instance.tenant)
+            (req_format, tenant) = (instance.format, instance.tenant)
 
             if 'format' in kwargs:
                 instance.format = kwargs['format']
@@ -54,7 +56,7 @@
                 instance.tenant = kwargs['tenant']
 
             ret = self.function(instance, *args)
-            (instance.format, instance.tenant) = (format, tenant)
+            (instance.format, instance.tenant) = (req_format, tenant)
             return ret
         return with_params
 
@@ -82,7 +84,7 @@
     attachment_path = "/networks/%s/ports/%s/attachment"
 
     def __init__(self, host="127.0.0.1", port=9696, use_ssl=False, tenant=None,
-                format="xml", testingStub=None, key_file=None, cert_file=None,
+                format="xml", testing_stub=None, key_file=None, cert_file=None,
                 logger=None, action_prefix="/v1.0/tenants/{tenant_id}"):
         """
         Creates a new client to some service.
@@ -102,7 +104,7 @@
         self.tenant = tenant
         self.format = format
         self.connection = None
-        self.testingStub = testingStub
+        self.testing_stub = testing_stub
         self.key_file = key_file
         self.cert_file = cert_file
         self.logger = logger
@@ -112,16 +114,15 @@
         """
         Returns the proper connection type
         """
-        if self.testingStub:
-            return self.testingStub
+        if self.testing_stub:
+            return self.testing_stub
         if self.use_ssl:
             return httplib.HTTPSConnection
         else:
             return httplib.HTTPConnection
 
     def _send_request(self, conn, method, action, body, headers):
-        # Salvatore: Isolating this piece of code in its own method to
-        # facilitate stubout for testing
+        """ Sends a request to the API server """
         if self.logger:
             self.logger.debug("Quantum Client Request:\n" \
                     + method + " " + action + "\n")
@@ -131,7 +132,7 @@
         return conn.getresponse()
 
     def do_request(self, method, action, body=None,
-                   headers=None, params=None, exception_args={}):
+                   headers=None, params=None, exception_args=None):
         """
         Connects to the server and issues a request.
         Returns the result data, or raises an appropriate exception if
@@ -145,6 +146,8 @@
 
         """
         LOG.debug("Client issuing request: %s", action)
+        if not exception_args:
+            exception_args = {}
         # Ensure we have a tenant id
         if not self.tenant:
             raise Exception("Tenant ID not set")
@@ -196,10 +199,11 @@
                 ex.args = ([dict(status_code=status_code,
                                  message=error_message)],)
                 raise ex
-        except (socket.error, IOError), e:
-            msg = "Unable to connect to server. Got error: %s" % e
+        except (socket.error, IOError), ex:
+            msg = "Unable to connect to server. Got error: %s" % ex
             LOG.exception(msg)
-            raise Exception(msg)
+            # Pylint: avoid raising/catching Exception
+            raise exceptions.QuantumException(msg)
 
     def get_status_code(self, response):
         """
@@ -233,14 +237,14 @@
         return Serializer(self._serialization_metadata).\
                     deserialize(data, self.content_type())
 
-    def content_type(self, format=None):
+    def content_type(self, req_format=None):
         """
         Returns the mime-type for either 'xml' or 'json'.  Defaults to the
         currently set format
         """
-        if not format:
-            format = self.format
-        return "application/%s" % (format)
+        if not req_format:
+            req_format = self.format
+        return "application/%s" % (req_format)
 
     @ApiCall
     def list_networks(self):

=== modified file 'quantum/common/config.py'
--- quantum/common/config.py	2011-06-24 13:52:17 +0000
+++ quantum/common/config.py	2011-09-02 10:10:23 +0000
@@ -20,19 +20,16 @@
 Routines for configuring Quantum
 """
 
-import ConfigParser
 import logging
 import logging.config
 import logging.handlers
 import optparse
 import os
-import re
 import sys
 
 from paste import deploy
 
 from quantum.common import flags
-from quantum.common import exceptions as exception
 
 DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"
 DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -280,10 +277,10 @@
 
     try:
         app = deploy.loadapp("config:%s" % conf_file, name=app_name)
-    except (LookupError, ImportError), e:
+    except (LookupError, ImportError), ex:
         raise RuntimeError("Unable to load %(app_name)s from "
                            "configuration file %(conf_file)s."
-                           "\nGot: %(e)r" % locals())
+                           "\nGot: %(ex)r" % locals())
     return conf, app
 
 

=== modified file 'quantum/common/exceptions.py'
--- quantum/common/exceptions.py	2011-08-30 01:59:14 +0000
+++ quantum/common/exceptions.py	2011-09-02 10:10:23 +0000
@@ -26,6 +26,8 @@
 gettext.install('quantum', unicode=1)
 
 
+# Disabling "undefined variable" error (due to gettext)
+# pylint: disable=E0602
 class QuantumException(Exception):
     """Base Quantum Exception
 
@@ -40,8 +42,9 @@
     def __init__(self, **kwargs):
         try:
             self._error_string = self.message % kwargs
+            super(QuantumException, self).__init__()
 
-        except Exception:
+        except:
             # at least get the core message out if something happened
             self._error_string = self.message
 
@@ -50,6 +53,10 @@
 
 
 class ProcessExecutionError(IOError):
+    """ Exception class for error which occur when
+    executing OS commands
+
+    """
     def __init__(self, stdout=None, stderr=None, exit_code=None, cmd=None,
                  description=None):
         if description is None:
@@ -62,11 +69,13 @@
 
 
 class Error(Exception):
+    """ Generic Error Exception """
     def __init__(self, message=None):
         super(Error, self).__init__(message)
 
 
 class ApiError(Error):
+    """ Class for reporting an API error """
     def __init__(self, message='Unknown', code='Unknown'):
         self.message = message
         self.code = code
@@ -78,34 +87,41 @@
 
 
 class ClassNotFound(NotFound):
+    """ Class for reporting a missing class """
     message = _("Class %(class_name)s could not be found")
 
 
 class NetworkNotFound(NotFound):
+    """ Exception Raised when a Quantum network is not found """
     message = _("Network %(net_id)s could not be found")
 
 
 class PortNotFound(NotFound):
+    """ Exception Raised when a Quantum port is not found """
     message = _("Port %(port_id)s could not be found " \
                 "on network %(net_id)s")
 
 
 class StateInvalid(QuantumException):
+    """ Exception raised when an invalid state is selected for a port """
     message = _("Unsupported port state: %(port_state)s")
 
 
 class NetworkInUse(QuantumException):
+    """ Exception raised on attempt to delete a network with attacchments """
     message = _("Unable to complete operation on network %(net_id)s. " \
                 "There is one or more attachments plugged into its ports.")
 
 
 class PortInUse(QuantumException):
+    """ Exception raised on attempt to delete a port with an attachment. """
     message = _("Unable to complete operation on port %(port_id)s " \
                 "for network %(net_id)s. The attachment '%(att_id)s" \
                 "is plugged into the logical port.")
 
 
 class AlreadyAttached(QuantumException):
+    """ Exception raised when an attachment is already plugged elsewhere """
     message = _("Unable to plug the attachment %(att_id)s into port " \
                 "%(port_id)s for network %(net_id)s. The attachment is " \
                 "already plugged into port %(att_port_id)s")
@@ -115,12 +131,20 @@
 # that is known on the server, thus, we create separate exception for
 # those scenarios
 class PortInUseClient(QuantumException):
+    """ Exception raised on attempt to delete a port with an attachment.
+        Raised client-side only
+
+    """
     message = _("Unable to complete operation on port %(port_id)s " \
                 "for network %(net_id)s. An attachment " \
                 "is plugged into the logical port.")
 
 
 class AlreadyAttachedClient(QuantumException):
+    """ Exception raised when an attachment is already plugged elsewhere
+        Raised client-side only
+
+    """
     message = _("Unable to plug the attachment %(att_id)s into port " \
                 "%(port_id)s for network %(net_id)s. The attachment is " \
                 "already plugged into another port.")
@@ -143,6 +167,7 @@
 
 
 class InvalidContentType(Invalid):
+    """ Raised when an invalid content type if specified """
     message = _("Invalid content type %(content_type)s.")
 
 
@@ -155,10 +180,10 @@
     pass
 
 
-def wrap_exception(f):
+def wrap_exception(func):
     def _wrap(*args, **kw):
         try:
-            return f(*args, **kw)
+            return func(*args, **kw)
         except Exception, e:
             if not isinstance(e, Error):
                 #exc_type, exc_value, exc_traceback = sys.exc_info()
@@ -166,5 +191,5 @@
                 #logging.error(traceback.extract_stack(exc_traceback))
                 raise Error(str(e))
             raise
-    _wrap.func_name = f.func_name
+    _wrap.func_name = func.func_name
     return _wrap

=== modified file 'quantum/common/extensions.py'
--- quantum/common/extensions.py	2011-08-26 10:20:55 +0000
+++ quantum/common/extensions.py	2011-09-02 10:10:23 +0000
@@ -16,6 +16,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
+""" Framework for adding extension to Quantum API """
+
 import imp
 import logging
 import os
@@ -32,6 +35,10 @@
 LOG = logging.getLogger('quantum.common.extensions')
 
 
+# pylint: disable=R0201
+# pylint: disable=R0903
+
+# NOTE(salvatore-orlando): How is this class used?
 class PluginInterface(object):
     __metaclass__ = ABCMeta
 
@@ -138,17 +145,23 @@
 
 
 class ActionExtensionController(wsgi.Controller):
+    """ Controller class for extensions adding
+    actions to resources.
+
+    """
 
     def __init__(self, application):
 
         self.application = application
         self.action_handlers = {}
+        super(ActionExtensionController, self).__init__()
 
     def add_action(self, action_name, handler):
+        """ Adds an action to the list of actions handlers """
         self.action_handlers[action_name] = handler
 
     def action(self, request, id):
-
+        """ Executes a specific action """
         input_dict = self._deserialize(request.body,
                                        request.get_content_type())
         for action_name, handler in self.action_handlers.iteritems():
@@ -160,15 +173,22 @@
 
 
 class RequestExtensionController(wsgi.Controller):
+    """ Controller class for extensions adding attributes
+    to resources.
+
+    """
 
     def __init__(self, application):
         self.application = application
         self.handlers = []
+        super(RequestExtensionController, self).__init__()
 
     def add_handler(self, handler):
+        """ Adds an extension handler """
         self.handlers.append(handler)
 
     def process(self, request, *args, **kwargs):
+        """ Processes the handlers on the incoming request """
         res = request.get_response(self.application)
         # currently request handlers are un-ordered
         for handler in self.handlers:
@@ -177,11 +197,14 @@
 
 
 class ExtensionController(wsgi.Controller):
+    """ Controller for managing API extensions """
 
     def __init__(self, extension_manager):
         self.extension_manager = extension_manager
+        super(ExtensionController, self).__init__()
 
     def _translate(self, ext):
+        """ Prepares a dictionary with data about the extensions """
         ext_data = {}
         ext_data['name'] = ext.get_name()
         ext_data['alias'] = ext.get_alias()
@@ -192,12 +215,14 @@
         return ext_data
 
     def index(self, request):
+        """ Retrieves a list of available extensions """
         extensions = []
         for _alias, ext in self.extension_manager.extensions.iteritems():
             extensions.append(self._translate(ext))
         return dict(extensions=extensions)
 
     def show(self, request, id):
+        """ Retrieves a specific extension """
         # NOTE(dprince): the extensions alias is used as the 'id' for show
         ext = self.extension_manager.extensions.get(id, None)
         if not ext:
@@ -206,9 +231,11 @@
         return self._translate(ext)
 
     def delete(self, request, id):
+        """ Not implemented """
         raise webob.exc.HTTPNotFound()
 
     def create(self, request):
+        """ Not implemented """
         raise webob.exc.HTTPNotFound()
 
 
@@ -361,7 +388,7 @@
         resources = []
         resources.append(ResourceExtension('extensions',
                                             ExtensionController(self)))
-        for alias, ext in self.extensions.iteritems():
+        for _alias, ext in self.extensions.iteritems():
             try:
                 resources.extend(ext.get_resources())
             except AttributeError:
@@ -373,7 +400,7 @@
     def get_actions(self):
         """Returns a list of ActionExtension objects."""
         actions = []
-        for alias, ext in self.extensions.iteritems():
+        for _alias, ext in self.extensions.iteritems():
             try:
                 actions.extend(ext.get_actions())
             except AttributeError:
@@ -385,7 +412,7 @@
     def get_request_extensions(self):
         """Returns a list of RequestExtension objects."""
         request_exts = []
-        for alias, ext in self.extensions.iteritems():
+        for _alias, ext in self.extensions.iteritems():
             try:
                 request_exts.extend(ext.get_request_extensions())
             except AttributeError:
@@ -423,6 +450,7 @@
             self._load_all_extensions_from_path(self.path)
 
     def _load_all_extensions_from_path(self, path):
+        """ Invoked by _load_all_extensions """
         for f in os.listdir(path):
             try:
                 LOG.info(_('Loading extension file: %s'), f)
@@ -440,11 +468,15 @@
                         continue
                     new_ext = new_ext_class()
                     self.add_extension(new_ext)
-            except Exception as exception:
+            except Exception, ex:
                 LOG.warn("extension file %s wasnt loaded due to %s",
-                         f, exception)
+                         f, ex)
 
     def add_extension(self, ext):
+        """ Checks that the extensions provides all the required methods and
+        then load it.
+
+        """
         # Do nothing if the extension doesn't check out
         if not self._check_extension(ext):
             return
@@ -459,6 +491,7 @@
 
 
 class PluginAwareExtensionManager(ExtensionManager):
+    """ Manager for API extensions which are aware of specific plugins """
 
     def __init__(self, path, plugin):
         self.plugin = plugin
@@ -474,6 +507,7 @@
                 self._plugin_implements_interface(extension))
 
     def _plugin_supports(self, extension):
+        """ Verifies that the current plugins supports the extension """
         alias = extension.get_alias()
         supports_extension = (hasattr(self.plugin,
                                       "supported_extension_aliases") and
@@ -484,6 +518,10 @@
         return supports_extension
 
     def _plugin_implements_interface(self, extension):
+        """ Verifies that the plugin correctly implements the interface
+        required by the extension.
+
+        """
         if(not hasattr(extension, "get_plugin_interface") or
            extension.get_plugin_interface() is None):
             return True
@@ -523,7 +561,12 @@
     """Add top level resources to the OpenStack API in Quantum."""
 
     def __init__(self, collection, controller, parent=None,
-                 collection_actions={}, member_actions={}):
+                 collection_actions=None, member_actions=None):
+        # Addressing pylint warning W0102
+        if collection_actions == None:
+            collection_actions = {}
+        if member_actions == None:
+            member_actions = {}
         self.collection = collection
         self.controller = controller
         self.parent = parent

=== modified file 'quantum/common/test_lib.py'
--- quantum/common/test_lib.py	2011-08-07 05:03:52 +0000
+++ quantum/common/test_lib.py	2011-09-02 10:10:23 +0000
@@ -37,15 +37,14 @@
 #    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 #    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import gettext
-import os
+""" Helper functions and classes for running unit tests """
+
 import unittest
 import sys
 import logging
 
 from nose import result
 from nose import core
-from nose import config
 
 
 class _AnsiColorizer(object):
@@ -81,8 +80,6 @@
                     return curses.tigetnum("colors") > 2
             except:
                 raise
-                # guess false in case of error
-                return False
     supported = classmethod(supported)
 
     def write(self, text, color):
@@ -161,6 +158,8 @@
 
 
 class QuantumTestResult(result.TextTestResult):
+    """ Creates results for unit tests in Quantum's test suite """
+
     def __init__(self, *args, **kw):
         result.TextTestResult.__init__(self, *args, **kw)
         self._last_case = None
@@ -203,7 +202,7 @@
         to the list for that class, not errors.
         """
         stream = getattr(self, 'stream', None)
-        ec, ev, tb = err
+        ec, _ev, _tb = err
         try:
             exc_info = self._exc_info_to_string(err, test)
         except TypeError:

=== modified file 'quantum/common/utils.py'
--- quantum/common/utils.py	2011-08-02 04:49:32 +0000
+++ quantum/common/utils.py	2011-09-02 10:10:23 +0000
@@ -27,7 +27,6 @@
 import os
 import random
 import subprocess
-import socket
 import sys
 
 
@@ -92,7 +91,7 @@
 
 
 def fetchfile(url, target):
-    logging.debug("Fetching %s" % url)
+    logging.debug("Fetching %s", url)
 #    c = pycurl.Curl()
 #    fp = open(target, "wb")
 #    c.setopt(c.URL, url)
@@ -117,7 +116,7 @@
         result = obj.communicate()
     obj.stdin.close()
     if obj.returncode:
-        logging.debug("Result was %s" % (obj.returncode))
+        logging.debug("Result was %s", obj.returncode)
         if check_exit_code and obj.returncode != 0:
             (stdout, stderr) = result
             raise ProcessExecutionError(exit_code=obj.returncode,
@@ -154,9 +153,9 @@
 
 
 def runthis(prompt, cmd, check_exit_code=True):
-    logging.debug("Running %s" % (cmd))
+    logging.debug("Running %s", cmd)
     exit_code = subprocess.call(cmd.split(" "))
-    logging.debug(prompt % (exit_code))
+    logging.debug(prompt, exit_code)
     if check_exit_code and exit_code != 0:
         raise ProcessExecutionError(exit_code=exit_code,
                                     stdout=None,
@@ -167,7 +166,7 @@
 def generate_uid(topic, size=8):
     return '%s-%s' % (topic, ''.join(
         [random.choice('01234567890abcdefghijklmnopqrstuvwxyz')
-         for x in xrange(size)]))
+         for _x in xrange(size)]))
 
 
 def generate_mac():

=== modified file 'quantum/db/api.py'
--- quantum/db/api.py	2011-08-30 01:16:39 +0000
+++ quantum/db/api.py	2011-09-02 10:10:23 +0000
@@ -16,6 +16,12 @@
 # @author: Somik Behera, Nicira Networks, Inc.
 # @author: Brad Hall, Nicira Networks, Inc.
 # @author: Dan Wendlandt, Nicira Networks, Inc.
+# @author: Salvatore Orlando, Citrix Systems
+
+""" DB operations for manipulating resources defined by the core API:
+    networks, ports, and attachments
+
+"""
 
 import logging
 
@@ -49,6 +55,10 @@
 
 
 def clear_db():
+    """ Destroys contents of the db.
+        Used in unit tests.
+
+    """
     global _ENGINE
     assert _ENGINE
     for table in reversed(BASE.metadata.sorted_tables):
@@ -80,26 +90,8 @@
     BASE.metadata.drop_all(_ENGINE)
 
 
-def _check_duplicate_net_name(tenant_id, net_name):
-    """Checks whether a network with the same name
-       already exists for the tenant.
-    """
-
-    #TODO(salvatore-orlando): Not used anymore - candidate for removal
-    session = get_session()
-    try:
-        net = session.query(models.Network).\
-          filter_by(tenant_id=tenant_id, name=net_name).\
-          one()
-        raise q_exc.NetworkNameExists(tenant_id=tenant_id,
-                        net_name=net_name, net_id=net.uuid)
-    except exc.NoResultFound:
-        # this is the "normal" path, as API spec specifies
-        # that net-names are unique within a tenant
-        pass
-
-
 def network_create(tenant_id, name):
+    """ Creates a network with a given name """
     session = get_session()
 
     with session.begin():
@@ -110,6 +102,7 @@
 
 
 def network_list(tenant_id):
+    """ List currently available networks """
     session = get_session()
     return session.query(models.Network).\
       filter_by(tenant_id=tenant_id).\
@@ -117,19 +110,20 @@
 
 
 def network_get(net_id):
+    """ Retrieves a specific network """
     session = get_session()
     try:
         return  session.query(models.Network).\
             filter_by(uuid=net_id).\
             one()
-    except exc.NoResultFound, e:
+    except exc.NoResultFound:
         raise q_exc.NetworkNotFound(net_id=net_id)
 
 
 def network_rename(net_id, tenant_id, new_name):
+    """ Renames a specific network """
     session = get_session()
     net = network_get(net_id)
-    _check_duplicate_net_name(tenant_id, new_name)
     net.name = new_name
     session.merge(net)
     session.flush()
@@ -137,6 +131,7 @@
 
 
 def network_destroy(net_id):
+    """ Removes a network """
     session = get_session()
     try:
         net = session.query(models.Network).\
@@ -146,8 +141,8 @@
         ports = session.query(models.Port).\
             filter_by(network_id=net_id).\
             all()
-        for p in ports:
-            session.delete(p)
+        for port in ports:
+            session.delete(port)
 
         session.delete(net)
         session.flush()
@@ -157,6 +152,7 @@
 
 
 def port_create(net_id, state=None):
+    """ Creates a port an a given network """
     # confirm network exists
     network_get(net_id)
 
@@ -170,6 +166,7 @@
 
 
 def port_list(net_id):
+    """ Lists ports configured for a network """
     session = get_session()
     return session.query(models.Port).\
       filter_by(network_id=net_id).\
@@ -177,6 +174,7 @@
 
 
 def port_get(port_id, net_id):
+    """ Retrieves a specific port """
     # confirm network exists
     network_get(net_id)
     session = get_session()
@@ -190,6 +188,7 @@
 
 
 def port_set_state(port_id, net_id, new_state):
+    """ Updates the state of a port """
     if new_state not in ('ACTIVE', 'DOWN'):
         raise q_exc.StateInvalid(port_state=new_state)
 
@@ -205,6 +204,7 @@
 
 
 def port_set_attachment(port_id, net_id, new_interface_id):
+    """ Sets the attachment for a port """
     # confirm network exists
     network_get(net_id)
 
@@ -235,6 +235,7 @@
 
 
 def port_unset_attachment(port_id, net_id):
+    """ Removes the attachment for a port """
     # confirm network exists
     network_get(net_id)
 
@@ -246,6 +247,7 @@
 
 
 def port_destroy(port_id, net_id):
+    """ Deletes a port """
     # confirm network exists
     network_get(net_id)
 

=== modified file 'quantum/manager.py'
--- quantum/manager.py	2011-08-26 10:20:55 +0000
+++ quantum/manager.py	2011-09-02 10:10:23 +0000
@@ -38,7 +38,7 @@
 
 
 def find_config(basepath):
-    for root, dirs, files in os.walk(basepath):
+    for root, _dirs, files in os.walk(basepath):
         if CONFIG_FILE in files:
             return os.path.join(root, CONFIG_FILE)
     return None

=== modified file 'quantum/plugins/SamplePlugin.py'
--- quantum/plugins/SamplePlugin.py	2011-09-01 16:17:36 +0000
+++ quantum/plugins/SamplePlugin.py	2011-09-02 10:10:23 +0000
@@ -16,6 +16,11 @@
 # @author: Somik Behera, Nicira Networks, Inc.
 # @author: Salvatore Orlando, Citrix
 
+""" Sample implementation of the quantum plugin interface
+exposed by QuantumPluginBase.
+FakePlugin and QuantumEcho plugin are used in unit tests.
+
+"""
 import logging
 
 from quantum.common import exceptions as exc
@@ -24,6 +29,8 @@
 LOG = logging.getLogger('quantum.plugins.SamplePlugin')
 
 
+# pylint: disable=W0613
+# pylint: disable=R0201
 class QuantumEchoPlugin(object):
 
     """
@@ -122,6 +129,9 @@
     supported_extension_aliases = ["FOXNSOX"]
 
     def method_to_support_foxnsox_extension(self):
+        """
+        Simple method invoked by API extensions unit tests
+        """
         print("method_to_support_foxnsox_extension() called\n")
 
 
@@ -136,15 +146,22 @@
         db.configure_db({'sql_connection': 'sqlite:///:memory:'})
         FakePlugin._net_counter = 0
 
-    def _get_network(self, tenant_id, network_id):
+    def _get_network(self, network_id):
+        """
+        Retrieves a network from db. Raises exception if network is not found.
+        """
         try:
             network = db.network_get(network_id)
         except:
             raise exc.NetworkNotFound(net_id=network_id)
         return network
 
-    def _get_port(self, tenant_id, network_id, port_id):
-        net = self._get_network(tenant_id, network_id)
+    def _get_port(self, network_id, port_id):
+        """
+        Retrieves a port from db.
+        Raises exception if either port or network are not found.
+        """
+        net = self._get_network(network_id)
         try:
             port = db.port_get(port_id, network_id)
         except:
@@ -155,6 +172,9 @@
         return port
 
     def _validate_port_state(self, port_state):
+        """
+        Verifies the proposed port state is allowed.
+        """
         if port_state.upper() not in ('ACTIVE', 'DOWN'):
             raise exc.StateInvalid(port_state=port_state)
         return True
@@ -188,7 +208,7 @@
         are attached to the network
         """
         LOG.debug("FakePlugin.get_network_details() called")
-        net = self._get_network(tenant_id, net_id)
+        net = self._get_network(net_id)
         # Retrieves ports for network
         ports = self.get_all_ports(tenant_id, net_id)
         return {'net-id': str(net.uuid),
@@ -211,7 +231,7 @@
         belonging to the specified tenant.
         """
         LOG.debug("FakePlugin.delete_network() called")
-        net = self._get_network(tenant_id, net_id)
+        net = self._get_network(net_id)
         # Verify that no attachments are plugged into the network
         if net:
             for port in db.port_list(net_id):
@@ -229,7 +249,7 @@
         """
         LOG.debug("FakePlugin.rename_network() called")
         db.network_rename(net_id, tenant_id, new_name)
-        net = self._get_network(tenant_id, net_id)
+        net = self._get_network(net_id)
         return net
 
     def get_all_ports(self, tenant_id, net_id):
@@ -240,8 +260,8 @@
         LOG.debug("FakePlugin.get_all_ports() called")
         port_ids = []
         ports = db.port_list(net_id)
-        for x in ports:
-            d = {'port-id': str(x.uuid)}
+        for port in ports:
+            d = {'port-id': str(port.uuid)}
             port_ids.append(d)
         return port_ids
 
@@ -251,7 +271,7 @@
         that is attached to this particular port.
         """
         LOG.debug("FakePlugin.get_port_details() called")
-        port = self._get_port(tenant_id, net_id, port_id)
+        port = self._get_port(net_id, port_id)
         return {'port-id': str(port.uuid),
                 'attachment': port.interface_id,
                 'port-state': port.state}
@@ -262,7 +282,7 @@
         """
         LOG.debug("FakePlugin.create_port() called")
         # verify net_id
-        self._get_network(tenant_id, net_id)
+        self._get_network(net_id)
         port = db.port_create(net_id, port_state)
         port_item = {'port-id': str(port.uuid)}
         return port_item
@@ -273,8 +293,8 @@
         """
         LOG.debug("FakePlugin.update_port() called")
         #validate port and network ids
-        self._get_network(tenant_id, net_id)
-        self._get_port(tenant_id, net_id, port_id)
+        self._get_network(net_id)
+        self._get_port(net_id, port_id)
         self._validate_port_state(new_state)
         db.port_set_state(port_id, net_id, new_state)
         port_item = {'port-id': port_id,
@@ -289,18 +309,17 @@
         is deleted.
         """
         LOG.debug("FakePlugin.delete_port() called")
-        net = self._get_network(tenant_id, net_id)
-        port = self._get_port(tenant_id, net_id, port_id)
+        port = self._get_port(net_id, port_id)
         if port['interface_id']:
             raise exc.PortInUse(net_id=net_id, port_id=port_id,
                                 att_id=port['interface_id'])
         try:
             port = db.port_destroy(port_id, net_id)
-        except Exception, e:
-            raise Exception("Failed to delete port: %s" % str(e))
-        d = {}
-        d["port-id"] = str(port.uuid)
-        return d
+        except Exception, ex:
+            raise Exception("Failed to delete port: %s" % str(ex))
+        port_data = {}
+        port_data["port-id"] = str(port.uuid)
+        return port_data
 
     def plug_interface(self, tenant_id, net_id, port_id, remote_interface_id):
         """
@@ -308,7 +327,7 @@
         specified Virtual Network.
         """
         LOG.debug("FakePlugin.plug_interface() called")
-        port = self._get_port(tenant_id, net_id, port_id)
+        port = self._get_port(net_id, port_id)
         # Validate attachment
         self._validate_attachment(tenant_id, net_id, port_id,
                                   remote_interface_id)
@@ -323,7 +342,5 @@
         specified Virtual Network.
         """
         LOG.debug("FakePlugin.unplug_interface() called")
-        self._get_port(tenant_id, net_id, port_id)
-        # TODO(salvatore-orlando):
-        # Should unplug on port without attachment raise an Error?
+        self._get_port(net_id, port_id)
         db.port_unset_attachment(port_id, net_id)

=== modified file 'quantum/plugins/cisco/common/cisco_credentials.py'
--- quantum/plugins/cisco/common/cisco_credentials.py	2011-08-26 02:54:08 +0000
+++ quantum/plugins/cisco/common/cisco_credentials.py	2011-09-02 10:10:23 +0000
@@ -58,7 +58,7 @@
     @staticmethod
     def putCredential(cred_name, username, password):
         """Set the username and password"""
-        credential = cdb.add_credential(TENANT, cred_name, username, password)
+        _credential = cdb.add_credential(TENANT, cred_name, username, password)
 
     @staticmethod
     def getUsername(cred_name):
@@ -75,7 +75,7 @@
     @staticmethod
     def getCredential(cred_name):
         """Get the username and password"""
-        credential = cdb.get_credential_name(TENANT, cred_name)
+        _credential = cdb.get_credential_name(TENANT, cred_name)
         return {const.USERNAME: const.CREDENTIAL_USERNAME,
                 const.PASSWORD: const.CREDENTIAL_PASSWORD}
 

=== modified file 'quantum/plugins/cisco/common/cisco_utils.py'
--- quantum/plugins/cisco/common/cisco_utils.py	2011-08-20 19:44:23 +0000
+++ quantum/plugins/cisco/common/cisco_utils.py	2011-09-02 10:10:23 +0000
@@ -26,7 +26,6 @@
 
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_nova_configuration as conf
-from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import l2network_db as cdb
 
 LOG.basicConfig(level=LOG.WARN)
@@ -100,7 +99,7 @@
         cursor = db.cursor()
         try:
             cursor.execute(sql_query)
-            results = cursor.fetchall()
+            _results = cursor.fetchall()
             db.commit()
             LOG.debug("DB query execution succeeded: %s" % sql_query)
             db.close()

=== modified file 'quantum/plugins/cisco/conf/db_conn.ini'
--- quantum/plugins/cisco/conf/db_conn.ini	2011-08-19 17:58:32 +0000
+++ quantum/plugins/cisco/conf/db_conn.ini	2011-09-02 10:10:23 +0000
@@ -1,5 +1,5 @@
 [DATABASE]
 name = quantum_l2network
-user = <put_db_user_name_here>
-pass = <put_db_password_here>
-host = <put_quantum_mysql_host_here>
+user = root
+pass = citrix
+host = 127.0.0.1

=== modified file 'quantum/plugins/cisco/conf/plugins.ini'
--- quantum/plugins/cisco/conf/plugins.ini	2011-08-22 10:34:48 +0000
+++ quantum/plugins/cisco/conf/plugins.ini	2011-09-02 10:10:23 +0000
@@ -1,5 +1,5 @@
 [PLUGINS]
-ucs_plugin=quantum.plugins.cisco.ucs.cisco_ucs_plugin.UCSVICPlugin
+#ucs_plugin=quantum.plugins.cisco.ucs.cisco_ucs_plugin.UCSVICPlugin
 #nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_plugin.NexusPlugin
 
 [INVENTORY]

=== modified file 'quantum/plugins/cisco/db/api.py'
--- quantum/plugins/cisco/db/api.py	2011-08-28 19:27:27 +0000
+++ quantum/plugins/cisco/db/api.py	2011-09-02 10:10:23 +0000
@@ -76,24 +76,9 @@
     BASE.metadata.drop_all(_ENGINE)
 
 
-def _check_duplicate_net_name(tenant_id, net_name):
-    session = get_session()
-    try:
-        net = session.query(models.Network).\
-          filter_by(tenant_id=tenant_id, name=net_name).\
-          one()
-        raise q_exc.NetworkNameExists(tenant_id=tenant_id,
-                        net_name=net_name, net_id=net.uuid)
-    except exc.NoResultFound:
-        # this is the "normal" path, as API spec specifies
-        # that net-names are unique within a tenant
-        pass
-
-
 def network_create(tenant_id, name):
     session = get_session()
 
-    _check_duplicate_net_name(tenant_id, name)
     with session.begin():
         net = models.Network(tenant_id, name)
         session.add(net)
@@ -123,7 +108,6 @@
 def network_rename(tenant_id, net_id, new_name):
     session = get_session()
     net = network_get(net_id)
-    _check_duplicate_net_name(tenant_id, new_name)
     net.name = new_name
     session.merge(net)
     session.flush()
@@ -159,7 +143,7 @@
 def port_list(net_id):
     session = get_session()
     return session.query(models.Port).\
-      options(joinedload(models.Port.network)). \
+      options(joinedload(models.Port.network_id)). \
       filter_by(network_id=net_id).\
       all()
 

=== modified file 'quantum/plugins/cisco/db/l2network_db.py'
--- quantum/plugins/cisco/db/l2network_db.py	2011-08-26 02:54:08 +0000
+++ quantum/plugins/cisco/db/l2network_db.py	2011-09-02 10:10:23 +0000
@@ -24,8 +24,6 @@
 
 import logging as LOG
 import quantum.plugins.cisco.db.api as db
-import quantum.plugins.cisco.db.nexus_db as ndb
-import quantum.plugins.cisco.db.ucs_db as udb
 
 
 def initialize():

=== modified file 'quantum/plugins/cisco/l2network_plugin.py'
--- quantum/plugins/cisco/l2network_plugin.py	2011-08-26 02:54:08 +0000
+++ quantum/plugins/cisco/l2network_plugin.py	2011-09-02 10:10:23 +0000
@@ -21,7 +21,6 @@
 
 import inspect
 import logging as LOG
-import platform
 
 from quantum.common import exceptions as exc
 from quantum.common import utils
@@ -197,7 +196,7 @@
         then the port can be deleted.
         """
         LOG.debug("delete_port() called\n")
-        network = db.network_get(net_id)
+        _network = db.network_get(net_id)
         port = db.port_get(net_id, port_id)
         attachment_id = port[const.INTERFACEID]
         if not attachment_id:
@@ -216,7 +215,7 @@
         Updates the state of a port on the specified Virtual Network.
         """
         LOG.debug("update_port() called\n")
-        network = db.network_get(net_id)
+        _network = db.network_get(net_id)
         self._invoke_device_plugins(self._func_name(), [tenant_id, net_id,
                                                      port_id, port_state])
         self._validate_port_state(port_state)
@@ -231,7 +230,7 @@
         that is attached to this particular port.
         """
         LOG.debug("get_port_details() called\n")
-        network = db.network_get(net_id)
+        _network = db.network_get(net_id)
         self._invoke_device_plugins(self._func_name(), [tenant_id, net_id,
                                                      port_id])
         port = db.port_get(net_id, port_id)
@@ -248,7 +247,7 @@
         specified Virtual Network.
         """
         LOG.debug("plug_interface() called\n")
-        network = db.network_get(net_id)
+        _network = db.network_get(net_id)
         self._invoke_device_plugins(self._func_name(), [tenant_id, net_id,
                                                      port_id,
                                                      remote_interface_id])
@@ -260,7 +259,7 @@
         specified Virtual Network.
         """
         LOG.debug("unplug_interface() called\n")
-        network = db.network_get(net_id)
+        _network = db.network_get(net_id)
         self._invoke_device_plugins(self._func_name(), [tenant_id, net_id,
                                                      port_id])
         db.port_unset_attachment(net_id, port_id)
@@ -287,7 +286,7 @@
         LOG.debug("get_portprofile_details() called\n")
         try:
             portprofile = cdb.get_portprofile(tenant_id, profile_id)
-        except Exception, excp:
+        except Exception:
             raise cexc.PortProfileNotFound(tenant_id=tenant_id,
                                            portprofile_id=profile_id)
 
@@ -312,8 +311,8 @@
         """Delete portprofile"""
         LOG.debug("delete_portprofile() called\n")
         try:
-            portprofile = cdb.get_portprofile(tenant_id, profile_id)
-        except Exception, excp:
+            _portprofile = cdb.get_portprofile(tenant_id, profile_id)
+        except Exception:
             raise cexc.PortProfileNotFound(tenant_id=tenant_id,
                                            portprofile_id=profile_id)
 
@@ -328,8 +327,8 @@
         """Rename port profile"""
         LOG.debug("rename_portprofile() called\n")
         try:
-            portprofile = cdb.get_portprofile(tenant_id, profile_id)
-        except Exception, excp:
+            _portprofile = cdb.get_portprofile(tenant_id, profile_id)
+        except Exception:
             raise cexc.PortProfileNotFound(tenant_id=tenant_id,
                                            portprofile_id=profile_id)
         portprofile = cdb.update_portprofile(tenant_id, profile_id, new_name)
@@ -339,25 +338,25 @@
                                              portprofile[const.PPQOS])
         return new_pp
 
-    def associate_portprofile(self, tenant_id, net_id,
+    def associate_portprofile(self, tenant_id, _net_id,
                               port_id, portprofile_id):
         """Associate port profile"""
         LOG.debug("associate_portprofile() called\n")
         try:
-            portprofile = cdb.get_portprofile(tenant_id, portprofile_id)
-        except Exception, excp:
+            _portprofile = cdb.get_portprofile(tenant_id, portprofile_id)
+        except Exception:
             raise cexc.PortProfileNotFound(tenant_id=tenant_id,
                                            portprofile_id=portprofile_id)
 
         cdb.add_pp_binding(tenant_id, port_id, portprofile_id, False)
 
-    def disassociate_portprofile(self, tenant_id, net_id,
+    def disassociate_portprofile(self, tenant_id, _net_id,
                                  port_id, portprofile_id):
         """Disassociate port profile"""
         LOG.debug("disassociate_portprofile() called\n")
         try:
-            portprofile = cdb.get_portprofile(tenant_id, portprofile_id)
-        except Exception, excp:
+            _portprofile = cdb.get_portprofile(tenant_id, portprofile_id)
+        except Exception:
             raise cexc.PortProfileNotFound(tenant_id=tenant_id,
                                       portprofile_id=portprofile_id)
 
@@ -374,7 +373,7 @@
         LOG.debug("get_qos_details() called\n")
         try:
             qos_level = cdb.get_qos(tenant_id, qos_id)
-        except Exception, excp:
+        except Exception:
             raise cexc.QosNotFound(tenant_id=tenant_id,
                                    qos_id=qos_id)
         return qos_level
@@ -389,8 +388,8 @@
         """Delete a QoS level"""
         LOG.debug("delete_qos() called\n")
         try:
-            qos_level = cdb.get_qos(tenant_id, qos_id)
-        except Exception, excp:
+            _qos_level = cdb.get_qos(tenant_id, qos_id)
+        except Exception:
             raise cexc.QosNotFound(tenant_id=tenant_id,
                                    qos_id=qos_id)
         return cdb.remove_qos(tenant_id, qos_id)
@@ -399,8 +398,8 @@
         """Rename QoS level"""
         LOG.debug("rename_qos() called\n")
         try:
-            qos_level = cdb.get_qos(tenant_id, qos_id)
-        except Exception, excp:
+            _qos_level = cdb.get_qos(tenant_id, qos_id)
+        except Exception:
             raise cexc.QosNotFound(tenant_id=tenant_id,
                                    qos_id=qos_id)
         qos = cdb.update_qos(tenant_id, qos_id, new_name)
@@ -417,7 +416,7 @@
         LOG.debug("get_credential_details() called\n")
         try:
             credential = cdb.get_credential(tenant_id, credential_id)
-        except Exception, excp:
+        except Exception:
             raise cexc.CredentialNotFound(tenant_id=tenant_id,
                                           credential_id=credential_id)
         return credential
@@ -434,8 +433,8 @@
         """Delete a credential"""
         LOG.debug("delete_credential() called\n")
         try:
-            credential = cdb.get_credential(tenant_id, credential_id)
-        except Exception, excp:
+            _credential = cdb.get_credential(tenant_id, credential_id)
+        except Exception:
             raise cexc.CredentialNotFound(tenant_id=tenant_id,
                                           credential_id=credential_id)
         credential = cdb.remove_credential(tenant_id, credential_id)
@@ -445,8 +444,8 @@
         """Rename the particular credential resource"""
         LOG.debug("rename_credential() called\n")
         try:
-            credential = cdb.get_credential(tenant_id, credential_id)
-        except Exception, excp:
+            _credential = cdb.get_credential(tenant_id, credential_id)
+        except Exception:
             raise cexc.CredentialNotFound(tenant_id=tenant_id,
                                           credential_id=credential_id)
         credential = cdb.update_credential(tenant_id, credential_id, new_name)

=== modified file 'quantum/plugins/cisco/models/l2network_multi_blade.py'
--- quantum/plugins/cisco/models/l2network_multi_blade.py	2011-08-26 00:42:16 +0000
+++ quantum/plugins/cisco/models/l2network_multi_blade.py	2011-09-02 10:10:23 +0000
@@ -22,14 +22,11 @@
 from copy import deepcopy
 import inspect
 import logging as LOG
-import platform
 
-from quantum.common import exceptions as exc
 from quantum.common import utils
 from quantum.plugins.cisco.l2network_model_base import L2NetworkModelBase
 from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco.common import cisco_exceptions as cexc
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(__name__)

=== modified file 'quantum/plugins/cisco/models/l2network_single_blade.py'
--- quantum/plugins/cisco/models/l2network_single_blade.py	2011-08-26 00:42:16 +0000
+++ quantum/plugins/cisco/models/l2network_single_blade.py	2011-09-02 10:10:23 +0000
@@ -22,14 +22,11 @@
 from copy import deepcopy
 import inspect
 import logging as LOG
-import platform
 
-from quantum.common import exceptions as exc
 from quantum.common import utils
 from quantum.plugins.cisco.l2network_model_base import L2NetworkModelBase
 from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco.common import cisco_exceptions as cexc
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(__name__)

=== modified file 'quantum/plugins/cisco/run_tests.py'
--- quantum/plugins/cisco/run_tests.py	2011-08-17 19:37:22 +0000
+++ quantum/plugins/cisco/run_tests.py	2011-09-02 10:10:23 +0000
@@ -46,17 +46,14 @@
     python quantum/plugins/cisco/run_tests.py functional.test_stores
 """
 
-import gettext
-import logging
 import os
-import unittest
 import sys
 
 from nose import config
 
 sys.path.append(os.getcwd())
 
-from quantum.common.test_lib import run_tests, test_config
+from quantum.common.test_lib import run_tests
 
 if __name__ == '__main__':
     exit_status = False

=== modified file 'quantum/plugins/cisco/tests/unit/test_database.py'
--- quantum/plugins/cisco/tests/unit/test_database.py	2011-08-25 23:29:30 +0000
+++ quantum/plugins/cisco/tests/unit/test_database.py	2011-09-02 10:10:23 +0000
@@ -610,9 +610,9 @@
         net1 = self.quantum.create_network("t1", "netid1")
         port1 = self.quantum.create_port(net1["net-id"])
         port2 = self.quantum.create_port(net1["net-id"])
-        port_bind1 = self.dbtest.create_port_binding(port1["port-id"],
+        _port_bind1 = self.dbtest.create_port_binding(port1["port-id"],
                                 "vnic1", "pp1", "vlan1", 10, "qos1")
-        port_bind2 = self.dbtest.create_port_binding(port2["port-id"],
+        _port_bind2 = self.dbtest.create_port_binding(port2["port-id"],
                                 "vnic2", "pp2", "vlan2", 20, "qos2")
         port_bindings = self.dbtest.get_all_port_bindings()
         count = 0
@@ -627,7 +627,7 @@
         """delete port binding"""
         net1 = self.quantum.create_network("t1", "netid1")
         port1 = self.quantum.create_port(net1["net-id"])
-        port_bind1 = self.dbtest.create_port_binding(port1["port-id"],
+        _port_bind1 = self.dbtest.create_port_binding(port1["port-id"],
                                 "vnic1", "pp1", "vlan1", 10, "qos1")
         self.dbtest.delete_port_binding(port1["port-id"])
         port_bindings = self.dbtest.get_all_port_bindings()
@@ -643,9 +643,9 @@
         """update port binding"""
         net1 = self.quantum.create_network("t1", "netid1")
         port1 = self.quantum.create_port(net1["net-id"])
-        port_bind1 = self.dbtest.create_port_binding(port1["port-id"],
+        _port_bind1 = self.dbtest.create_port_binding(port1["port-id"],
                                 "vnic1", "pp1", "vlan1", 10, "qos1")
-        port_bind1 = self.dbtest.update_port_binding(port1["port-id"],
+        _port_bind1 = self.dbtest.update_port_binding(port1["port-id"],
                         "vnic1", "newpp1", "newvlan1", 11, "newqos1")
         port_bindings = self.dbtest.get_all_port_bindings()
         count = 0
@@ -697,8 +697,8 @@
 
     def testb_getall_nexusportbindings(self):
         """get all nexus port binding"""
-        binding1 = self.dbtest.create_nexusportbinding("port1", 10)
-        binding2 = self.dbtest.create_nexusportbinding("port2", 10)
+        _binding1 = self.dbtest.create_nexusportbinding("port1", 10)
+        _binding2 = self.dbtest.create_nexusportbinding("port2", 10)
         bindings = self.dbtest.get_all_nexusportbindings()
         count = 0
         for bind in bindings:
@@ -709,7 +709,7 @@
 
     def testc_delete_nexusportbinding(self):
         """delete nexus port binding"""
-        binding1 = self.dbtest.create_nexusportbinding("port1", 10)
+        _binding1 = self.dbtest.create_nexusportbinding("port1", 10)
         self.dbtest.delete_nexusportbinding(10)
         bindings = self.dbtest.get_all_nexusportbindings()
         count = 0
@@ -1055,7 +1055,7 @@
         self.assertTrue(port["net-id"] == net1["net-id"])
         ports = self.dbtest.get_all_ports(net1["net-id"])
         count = 0
-        for por in ports:
+        for _port in ports:
             count += 1
         self.assertTrue(count == 1)
         self.teardown_network_port()

=== modified file 'quantum/plugins/cisco/ucs/cisco_ucs_inventory.py'
--- quantum/plugins/cisco/ucs/cisco_ucs_inventory.py	2011-08-28 05:55:08 +0000
+++ quantum/plugins/cisco/ucs/cisco_ucs_inventory.py	2011-09-02 10:10:23 +0000
@@ -27,7 +27,6 @@
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_credentials as cred
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
-from quantum.plugins.cisco.common import cisco_utils as cutil
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import ucs_db as udb
 from quantum.plugins.cisco.ucs \
@@ -247,7 +246,7 @@
                     blade_data = ucsm[chassis_id][blade_id]
                     blade_intf_data = blade_data[const.BLADE_INTF_DATA]
                     for blade_intf in blade_intf_data.keys():
-                        tmp = deepcopy(blade_intf_data[blade_intf])
+                        _tmp = deepcopy(blade_intf_data[blade_intf])
                         if blade_intf_data[blade_intf]\
                            [const.BLADE_INTF_RESERVATION] == \
                            const.BLADE_INTF_RESERVED and \
@@ -489,7 +488,7 @@
                 reserved_nic_dict = {const.RESERVED_NIC_HOSTNAME: host_name,
                                    const.RESERVED_NIC_NAME: dev_eth_name,
                                    const.BLADE_INTF_DN: blade_intf}
-                port_binding = udb.add_portbinding(port_id, blade_intf, None,
+                _port_binding = udb.add_portbinding(port_id, blade_intf, None,
                                                    None, None, None)
                 udb.update_portbinding(port_id,
                                        tenant_id=blade_intf_data[blade_intf]\
@@ -504,8 +503,8 @@
     def unreserve_blade_interface(self, ucsm_ip, chassis_id, blade_id,
                                   interface_dn):
         """Unreserve a previously reserved interface on a blade"""
-        ucsm_username = cred.Store.getUsername(ucsm_ip)
-        ucsm_password = cred.Store.getPassword(ucsm_ip)
+        _ucsm_username = cred.Store.getUsername(ucsm_ip)
+        _ucsm_password = cred.Store.getPassword(ucsm_ip)
         self._inventory_state[ucsm_ip][chassis_id][blade_id] \
                 [const.BLADE_UNRESERVED_INTF_COUNT] += 1
         blade_intf = self._inventory_state[ucsm_ip][chassis_id]\

=== modified file 'quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py'
--- quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py	2011-08-26 02:54:08 +0000
+++ quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py	2011-09-02 10:10:23 +0000
@@ -27,9 +27,7 @@
 import logging as LOG
 from xml.etree import ElementTree as et
 
-from quantum.plugins.cisco.common import cisco_exceptions as cexc
 from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco.ucs import cisco_getvif as gvif
 
 
 LOG.basicConfig(level=LOG.WARN)

=== modified file 'quantum/plugins/cisco/ucs/cisco_ucs_plugin.py'
--- quantum/plugins/cisco/ucs/cisco_ucs_plugin.py	2011-08-26 02:54:08 +0000
+++ quantum/plugins/cisco/ucs/cisco_ucs_plugin.py	2011-09-02 10:10:23 +0000
@@ -21,7 +21,6 @@
 
 import logging as LOG
 
-from quantum.common import exceptions as exc
 from quantum.common import utils
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 from quantum.plugins.cisco.common import cisco_constants as const
@@ -167,7 +166,7 @@
                                                      conf.DEFAULT_VLAN_NAME,
                                                      conf.DEFAULT_VLAN_ID)
         profile_name = new_port_profile[const.PROFILE_NAME]
-        rsvd_nic_dict = ucs_inventory.\
+        _rsvd_nic_dict = ucs_inventory.\
                 reserve_blade_interface(self._ucsm_ip, chassis_id,
                                         blade_id, blade_data_dict,
                                         tenant_id, port_id,

=== modified file 'quantum/plugins/openvswitch/ovs_db.py'
--- quantum/plugins/openvswitch/ovs_db.py	2011-06-22 00:40:05 +0000
+++ quantum/plugins/openvswitch/ovs_db.py	2011-09-02 10:10:23 +0000
@@ -21,7 +21,6 @@
 from sqlalchemy.orm import exc
 
 import quantum.db.api as db
-import quantum.db.models as models
 import ovs_models
 
 

=== modified file 'quantum/plugins/openvswitch/ovs_models.py'
--- quantum/plugins/openvswitch/ovs_models.py	2011-06-22 00:40:05 +0000
+++ quantum/plugins/openvswitch/ovs_models.py	2011-09-02 10:10:23 +0000
@@ -18,11 +18,7 @@
 # @author: Dan Wendlandt, Nicira Networks, Inc.
 
 
-import uuid
-
-from sqlalchemy import Column, Integer, String, ForeignKey
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import relation
+from sqlalchemy import Column, Integer, String
 from quantum.db.models import BASE
 
 

=== modified file 'quantum/plugins/openvswitch/ovs_quantum_plugin.py'
--- quantum/plugins/openvswitch/ovs_quantum_plugin.py	2011-08-26 08:02:41 +0000
+++ quantum/plugins/openvswitch/ovs_quantum_plugin.py	2011-09-02 10:10:23 +0000
@@ -19,9 +19,7 @@
 
 import ConfigParser
 import logging as LOG
-from optparse import OptionParser
 import os
-import sys
 
 from quantum.common import exceptions as q_exc
 from quantum.quantum_plugin_base import QuantumPluginBase
@@ -36,7 +34,7 @@
 
 
 def find_config(basepath):
-    for root, dirs, files in os.walk(basepath):
+    for root, _dirs, files in os.walk(basepath):
         if CONF_FILE in files:
             return os.path.join(root, CONF_FILE)
     return None

=== modified file 'quantum/plugins/openvswitch/run_tests.py'
--- quantum/plugins/openvswitch/run_tests.py	2011-08-26 08:02:41 +0000
+++ quantum/plugins/openvswitch/run_tests.py	2011-09-02 10:10:23 +0000
@@ -45,10 +45,7 @@
     python quantum/plugins/openvswitch/run_tests.py functional.test_stores
 """
 
-import gettext
-import logging
 import os
-import unittest
 import sys
 
 from nose import config
@@ -56,7 +53,6 @@
 sys.path.append(os.getcwd())
 
 from quantum.common.test_lib import run_tests, test_config
-from quantum.plugins.openvswitch.tests.test_vlan_map import VlanMapTest
 
 if __name__ == '__main__':
     exit_status = False

=== modified file 'quantum/service.py'
--- quantum/service.py	2011-06-24 13:52:17 +0000
+++ quantum/service.py	2011-09-02 10:10:23 +0000
@@ -102,9 +102,9 @@
 
 def _run_wsgi(app_name, paste_conf, paste_config_file):
     LOG.info(_('Using paste.deploy config at: %s'), paste_config_file)
-    conf, app = config.load_paste_app(app_name,
-                                      {'config_file': paste_config_file},
-                                      None)
+    _conf, app = config.load_paste_app(app_name,
+                                       {'config_file': paste_config_file},
+                                       None)
     if not app:
         LOG.error(_('No known API applications configured in %s.'),
                       paste_config_file)

=== modified file 'quantum/utils.py'
--- quantum/utils.py	2011-05-31 17:15:00 +0000
+++ quantum/utils.py	2011-09-02 10:10:23 +0000
@@ -20,20 +20,9 @@
 
 """Utilities and helper functions."""
 
-import base64
 import datetime
-import functools
-import inspect
 import json
-import os
-import random
-import re
-import socket
-import string
-import struct
 import sys
-import time
-import types
 
 from common import exceptions as exception
 

=== modified file 'tests/unit/test_cli.py'
--- tests/unit/test_cli.py	2011-08-30 16:00:11 +0000
+++ tests/unit/test_cli.py	2011-09-02 10:10:23 +0000
@@ -49,7 +49,7 @@
         self.network_name_2 = "test_network_2"
         # Prepare client and plugin manager
         self.client = Client(tenant=self.tenant_id, format=FORMAT,
-                             testingStub=client_stubs.FakeHTTPConnection)
+                             testing_stub=client_stubs.FakeHTTPConnection)
         # Redirect stdout
         self.fake_stdout = client_stubs.FakeStdout()
         sys.stdout = self.fake_stdout