Fixing the assignment issue
This commit is contained in:
parent
6e25b4a25f
commit
d48e0e66d9
|
@ -21,7 +21,7 @@ import webob.exc
|
||||||
|
|
||||||
from reddwarf import rpc
|
from reddwarf import rpc
|
||||||
from reddwarf.common import config
|
from reddwarf.common import config
|
||||||
from reddwarf.common import context
|
from reddwarf.common import context as rd_context
|
||||||
from reddwarf.common import exception
|
from reddwarf.common import exception
|
||||||
from reddwarf.common import wsgi
|
from reddwarf.common import wsgi
|
||||||
from reddwarf.database import models
|
from reddwarf.database import models
|
||||||
|
@ -44,7 +44,7 @@ class InstanceController(BaseController):
|
||||||
def index(self, req, tenant_id):
|
def index(self, req, tenant_id):
|
||||||
"""Return all instances."""
|
"""Return all instances."""
|
||||||
# TODO(hub-cap): turn this into middleware
|
# TODO(hub-cap): turn this into middleware
|
||||||
context = context.ReddwarfContext(
|
context = rd_context.ReddwarfContext(
|
||||||
auth_tok=req.headers["X-Auth-Token"],
|
auth_tok=req.headers["X-Auth-Token"],
|
||||||
tenant=tenant_id)
|
tenant=tenant_id)
|
||||||
servers = models.Instances(context).data()
|
servers = models.Instances(context).data()
|
||||||
|
@ -54,7 +54,7 @@ class InstanceController(BaseController):
|
||||||
def show(self, req, tenant_id, id):
|
def show(self, req, tenant_id, id):
|
||||||
"""Return a single instance."""
|
"""Return a single instance."""
|
||||||
# TODO(hub-cap): turn this into middleware
|
# TODO(hub-cap): turn this into middleware
|
||||||
context = context.ReddwarfContext(
|
context = rd_context.ReddwarfContext(
|
||||||
auth_tok=req.headers["X-Auth-Token"],
|
auth_tok=req.headers["X-Auth-Token"],
|
||||||
tenant=tenant_id)
|
tenant=tenant_id)
|
||||||
server = models.Instance(context=context, uuid=id).data()
|
server = models.Instance(context=context, uuid=id).data()
|
||||||
|
@ -64,7 +64,7 @@ class InstanceController(BaseController):
|
||||||
def delete(self, req, tenant_id, id):
|
def delete(self, req, tenant_id, id):
|
||||||
"""Delete a single instance."""
|
"""Delete a single instance."""
|
||||||
# TODO(hub-cap): turn this into middleware
|
# TODO(hub-cap): turn this into middleware
|
||||||
context = context.ReddwarfContext(
|
context = rd_context.ReddwarfContext(
|
||||||
auth_tok=req.headers["X-Auth-Token"],
|
auth_tok=req.headers["X-Auth-Token"],
|
||||||
tenant=tenant_id)
|
tenant=tenant_id)
|
||||||
models.Instance.delete(context=context, uuid=id)
|
models.Instance.delete(context=context, uuid=id)
|
||||||
|
@ -87,7 +87,7 @@ class InstanceController(BaseController):
|
||||||
# code. Or maybe we shouldnt due to the nature of changing images.
|
# code. Or maybe we shouldnt due to the nature of changing images.
|
||||||
# This needs discussion.
|
# This needs discussion.
|
||||||
# TODO(hub-cap): turn this into middleware
|
# TODO(hub-cap): turn this into middleware
|
||||||
context = context.ReddwarfContext(
|
context = rd_context.ReddwarfContext(
|
||||||
auth_tok=req.headers["X-Auth-Token"],
|
auth_tok=req.headers["X-Auth-Token"],
|
||||||
tenant=tenant_id)
|
tenant=tenant_id)
|
||||||
database = models.ServiceImage.find_by(service_name="database")
|
database = models.ServiceImage.find_by(service_name="database")
|
||||||
|
|
Loading…
Reference in New Issue