From: Aaron Rosen <arosen@nicira.com>
Date: Mon, 5 Aug 2013 20:57:56 +0000 (-0700)
Subject: Change decorator to webob as doesn't need to be wsgi
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=45987edfbd9a264c1273e1b3489ccaeb6d3be2a8;p=openstack-build%2Fneutron-build.git

Change decorator to webob as doesn't need to be wsgi

This patch changes the decorates in the metadata agents to webob.Request
as they don't need to go through wsgi. Note: wsgi.Request's base class
is webob.Request.

Fixes bug: 1208907

Change-Id: I069635eb67812136d314fc260cebf65886a95597
---

diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py
index 9f32d1550..3ca20382f 100644
--- a/neutron/agent/metadata/agent.py
+++ b/neutron/agent/metadata/agent.py
@@ -86,7 +86,7 @@ class MetadataProxyHandler(object):
         )
         return qclient
 
-    @webob.dec.wsgify(RequestClass=wsgi.Request)
+    @webob.dec.wsgify(RequestClass=webob.Request)
     def __call__(self, req):
         try:
             LOG.debug(_("Request: %s"), req)
diff --git a/neutron/agent/metadata/namespace_proxy.py b/neutron/agent/metadata/namespace_proxy.py
index bca06b400..06a3a56f9 100644
--- a/neutron/agent/metadata/namespace_proxy.py
+++ b/neutron/agent/metadata/namespace_proxy.py
@@ -70,7 +70,7 @@ class NetworkMetadataProxyHandler(object):
             msg = _('network_id and router_id are None. One must be provided.')
             raise ValueError(msg)
 
-    @webob.dec.wsgify(RequestClass=wsgi.Request)
+    @webob.dec.wsgify(RequestClass=webob.Request)
     def __call__(self, req):
         LOG.debug(_("Request: %s"), req)
         try: