Fixing bug #798261

diff --git a/quantum/api/faults.py b/quantum/api/faults.py
index 35f6c1073dac866dba285fa90fa4b2220f81b685..ef4d50bc6b27c59279257afb22927ebdb64bbe17 100644 (file)
--- a/quantum/api/faults.py
+++ b/quantum/api/faults.py
@@ -52,7 +52,7 @@ class Fault(webob.exc.HTTPException):
             fault_name: {
                 'code': code,
                 'message': self.wrapped_exc.explanation,
-                'detail': self.wrapped_exc.detail}}
+                'detail': str(self.wrapped_exc.detail)}}
         # 'code' is an attribute on the fault tag itself
         metadata = {'application/xml': {'attributes': {fault_name: 'code'}}}
         default_xmlns = common.XML_NS_V10

diff --git a/quantum/api/ports.py b/quantum/api/ports.py
index 2a066255dea20396b614c44772c614441fdd9a6a..729a7182d0e884d8f104ecb85baeaed3d409e6e6 100644 (file)
--- a/quantum/api/ports.py
+++ b/quantum/api/ports.py
@@ -42,7 +42,6 @@ class Controller(common.QuantumController):
             "attributes": {
                 "port": ["id", "state"], }, }, }
 
-
     def __init__(self, plugin_conf_file=None):
         self._resource_name = 'port'
         super(Controller, self).__init__()
@@ -142,7 +141,6 @@ class Controller(common.QuantumController):
         except exception.PortNotFound as e:
             return faults.Fault(faults.PortNotFound(e))
 
-
     def attach_resource(self, request, tenant_id, network_id, id):
         content_type = request.best_match_content_type()
         print "Content type:%s" % content_type

diff --git a/quantum/plugins/SamplePlugin.py b/quantum/plugins/SamplePlugin.py
index 32dc823f9989e6e2df744f4bb0addcadbb45a3dc..5964beffb99d1d81b879494e619449ef672c44ff 100644 (file)
--- a/quantum/plugins/SamplePlugin.py
+++ b/quantum/plugins/SamplePlugin.py
@@ -226,6 +226,7 @@ class DummyDataPlugin(object):
         """
         print("unplug_interface() called\n")
 
+
 class FakePlugin(object):
     """
     FakePlugin is a demo plugin that provides