Merge trunk

Solving conflict in common/exceptions.py
Removing unused error code from client.py

diff --cc quantum/cli.py
Simple merge

diff --cc quantum/client.py
index 517ba6d6675d6950535f24e97b17c37c2138d4f6,2e55dfb3ecd71b2f7c680bfff0ac209b0c702098..6a58e641a298b8cf8af153f841a7effd44af6566
--- 1/quantum/client.py
--- 2/quantum/client.py
+++ b/quantum/client.py
@@@ -20,12 -20,26 +20,24 @@@ import httpli
  import socket
  import urllib
  from quantum.common.wsgi import Serializer
+ from quantum.common import exceptions
  
 -    422: exceptions.NetworkNameExists,
+ EXCEPTIONS = {
+     400: exceptions.BadInputError,
+     401: exceptions.NotAuthorized,
+     420: exceptions.NetworkNotFound,
+     421: exceptions.NetworkInUse,
 -    440: exceptions.AlreadyAttached,
 -    441: exceptions.AttachmentNotReady,
+     430: exceptions.PortNotFound,
+     431: exceptions.StateInvalid,
+     432: exceptions.PortInUse,
++    440: exceptions.AlreadyAttached
+ }
  
- class api_call(object):
+ 
+ class ApiCall(object):
      """A Decorator to add support for format and tenant overriding"""
-     def __init__(self, f):
-         self.f = f
+     def __init__(self, function):
+         self.function = function
  
      def __get__(self, instance, owner):
          def with_params(*args, **kwargs):

diff --cc tests/unit/test_api.py
Simple merge