openstack/magnum
Code Issues Proposed changes

Merge "Fix context is not set correctly"

Browse Source
This commit is contained in:
Jenkins
2014-12-30 23:13:50 +00:00
committed by Gerrit Code Review
parent 26d49b5d29 fa29190557
commit 2150bf8655
3 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
magnum/api/controllers/v1/bay.py
View File

@@ -26,9 +26,7 @@ from magnum.api.controllers import link
from magnum.api.controllers.v1 import collection from magnum.api.controllers.v1 import collection
from magnum.api.controllers.v1 import types from magnum.api.controllers.v1 import types
from magnum.api.controllers.v1 import utils as api_utils from magnum.api.controllers.v1 import utils as api_utils
from magnum.common import context
from magnum.common import exception from magnum.common import exception
from magnum.conductor import api
from magnum import objects from magnum import objects
@@ -88,7 +86,6 @@ class Bay(base.APIBase):
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(Bay, self).__init__() super(Bay, self).__init__()
self.backend_api = api.API(context=context.RequestContext())
self.fields = [] self.fields = []
fields = list(objects.Bay.fields) fields = list(objects.Bay.fields)
@@ -154,7 +151,6 @@ class BayCollection(collection.Collection):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self._type = 'bays' self._type = 'bays'
self.backend_api = api.API(context=context.RequestContext())
@staticmethod @staticmethod
def convert_with_links(rpc_bays, limit, url=None, expand=False, **kwargs): def convert_with_links(rpc_bays, limit, url=None, expand=False, **kwargs):
@@ -175,7 +171,6 @@ class BaysController(rest.RestController):
"""REST controller for Bays.""" """REST controller for Bays."""
def __init__(self): def __init__(self):
super(BaysController, self).__init__() super(BaysController, self).__init__()
self.backend_api = api.API(context=context.RequestContext())
from_bays = False from_bays = False
"""A flag to indicate if the requests to this controller are coming """A flag to indicate if the requests to this controller are coming
@@ -197,7 +192,7 @@ class BaysController(rest.RestController):
marker_obj = objects.Bay.get_by_uuid(pecan.request.context, marker_obj = objects.Bay.get_by_uuid(pecan.request.context,
marker) marker)
bays = self.backend_api.bay_list(pecan.request.context, limit, bays = pecan.request.rpcapi.bay_list(pecan.request.context, limit,
marker_obj, sort_key=sort_key, marker_obj, sort_key=sort_key,
sort_dir=sort_dir) sort_dir=sort_dir)
@@ -266,7 +261,7 @@ class BaysController(rest.RestController):
raise exception.OperationNotPermitted raise exception.OperationNotPermitted
new_bay = objects.Bay(pecan.request.context, **bay.as_dict()) new_bay = objects.Bay(pecan.request.context, **bay.as_dict())
res_bay = self.backend_api.bay_create(new_bay) res_bay = pecan.request.rpcapi.bay_create(new_bay)
# Set the HTTP Location Header # Set the HTTP Location Header
pecan.response.location = link.build_url('bays', res_bay.uuid) pecan.response.location = link.build_url('bays', res_bay.uuid)

11
magnum/api/controllers/v1/pod.py
View File

@@ -24,9 +24,7 @@ from magnum.api.controllers import link
from magnum.api.controllers.v1 import collection from magnum.api.controllers.v1 import collection
from magnum.api.controllers.v1 import types from magnum.api.controllers.v1 import types
from magnum.api.controllers.v1 import utils as api_utils from magnum.api.controllers.v1 import utils as api_utils
from magnum.common import context
from magnum.common import exception from magnum.common import exception
from magnum.conductor import api
from magnum import objects from magnum import objects
@@ -98,7 +96,6 @@ class Pod(base.APIBase):
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(Pod, self).__init__() super(Pod, self).__init__()
self.backend_api = api.API(context=context.RequestContext())
self.fields = [] self.fields = []
fields = list(objects.Pod.fields) fields = list(objects.Pod.fields)
@@ -166,7 +163,6 @@ class PodCollection(collection.Collection):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self._type = 'pods' self._type = 'pods'
self.backend_api = api.API(context=context.RequestContext())
@staticmethod @staticmethod
def convert_with_links(rpc_pods, limit, url=None, expand=False, **kwargs): def convert_with_links(rpc_pods, limit, url=None, expand=False, **kwargs):
@@ -188,7 +184,6 @@ class PodsController(rest.RestController):
def __init__(self): def __init__(self):
super(PodsController, self).__init__() super(PodsController, self).__init__()
self.backend_api = api.API(context=context.RequestContext())
from_pods = False from_pods = False
"""A flag to indicate if the requests to this controller are coming """A flag to indicate if the requests to this controller are coming
@@ -210,7 +205,7 @@ class PodsController(rest.RestController):
marker_obj = objects.Pod.get_by_uuid(pecan.request.context, marker_obj = objects.Pod.get_by_uuid(pecan.request.context,
marker) marker)
pods = self.backend_api.pod_list(pecan.request.context, limit, pods = pecan.request.rpcapi.pod_list(pecan.request.context, limit,
marker_obj, sort_key=sort_key, marker_obj, sort_key=sort_key,
sort_dir=sort_dir) sort_dir=sort_dir)
@@ -280,7 +275,7 @@ class PodsController(rest.RestController):
pod_obj = objects.Pod(pecan.request.context, pod_obj = objects.Pod(pecan.request.context,
**pod.as_dict()) **pod.as_dict())
new_pod = self.backend_api.pod_create(pod_obj) new_pod = pecan.request.rpcapi.pod_create(pod_obj)
# Set the HTTP Location Header # Set the HTTP Location Header
pecan.response.location = link.build_url('pods', new_pod.uuid) pecan.response.location = link.build_url('pods', new_pod.uuid)
return Pod.convert_with_links(new_pod) return Pod.convert_with_links(new_pod)
@@ -337,4 +332,4 @@ class PodsController(rest.RestController):
rpc_pod = objects.Pod.get_by_uuid(pecan.request.context, rpc_pod = objects.Pod.get_by_uuid(pecan.request.context,
pod_uuid) pod_uuid)
self.backend_api.pod_delete(rpc_pod) pecan.request.rpcapi.pod_delete(rpc_pod)

12
magnum/api/controllers/v1/service.py
View File

@@ -23,9 +23,7 @@ from magnum.api.controllers import link
from magnum.api.controllers.v1 import collection from magnum.api.controllers.v1 import collection
from magnum.api.controllers.v1 import types from magnum.api.controllers.v1 import types
from magnum.api.controllers.v1 import utils as api_utils from magnum.api.controllers.v1 import utils as api_utils
from magnum.common import context
from magnum.common import exception from magnum.common import exception
from magnum.conductor import api
from magnum import objects from magnum import objects
@@ -86,7 +84,6 @@ class Service(base.APIBase):
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(Service, self).__init__() super(Service, self).__init__()
self.backend_api = api.API(context=context.RequestContext())
self.fields = [] self.fields = []
fields = list(objects.Service.fields) fields = list(objects.Service.fields)
@@ -145,7 +142,6 @@ class ServiceCollection(collection.Collection):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self._type = 'services' self._type = 'services'
self.backend_api = api.API(context=context.RequestContext())
@staticmethod @staticmethod
def convert_with_links(rpc_services, limit, url=None, def convert_with_links(rpc_services, limit, url=None,
@@ -168,7 +164,6 @@ class ServicesController(rest.RestController):
def __init__(self): def __init__(self):
super(ServicesController, self).__init__() super(ServicesController, self).__init__()
self.backend_api = api.API(context=context.RequestContext())
from_services = False from_services = False
"""A flag to indicate if the requests to this controller are coming """A flag to indicate if the requests to this controller are coming
@@ -190,7 +185,7 @@ class ServicesController(rest.RestController):
marker_obj = objects.Service.get_by_uuid(pecan.request.context, marker_obj = objects.Service.get_by_uuid(pecan.request.context,
marker) marker)
services = self.backend_api.service_list(pecan.request.context, services = pecan.request.rpcapi.service_list(pecan.request.context,
limit, limit,
marker_obj, marker_obj,
sort_key=sort_key, sort_key=sort_key,
@@ -261,9 +256,10 @@ class ServicesController(rest.RestController):
""" """
if self.from_services: if self.from_services:
raise exception.OperationNotPermitted raise exception.OperationNotPermitted
service_obj = objects.Service(pecan.request.context, service_obj = objects.Service(pecan.request.context,
**service.as_dict()) **service.as_dict())
new_service = self.backend_api.service_create(service_obj) new_service = pecan.request.rpcapi.service_create(service_obj)
# Set the HTTP Location Header # Set the HTTP Location Header
pecan.response.location = link.build_url('services', new_service.uuid) pecan.response.location = link.build_url('services', new_service.uuid)
return Service.convert_with_links(new_service) return Service.convert_with_links(new_service)
@@ -318,4 +314,4 @@ class ServicesController(rest.RestController):
rpc_service = objects.Service.get_by_uuid(pecan.request.context, rpc_service = objects.Service.get_by_uuid(pecan.request.context,
service_uuid) service_uuid)
self.backend_api.service_delete(rpc_service) pecan.request.rpcapi.service_delete(rpc_service)