openstack/zun
Code Issues Proposed changes

Merge "Use versioned object instead of db_api"

Browse Source
This commit is contained in:
Zuul 2018-05-02 01:50:58 +00:00 committed by Gerrit Code Review
commit 9d982ae1bd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zun/websocket/websocketproxy.py
View File

@ -32,7 +32,7 @@ from zun.common import context
from zun.common import exception from zun.common import exception
from zun.common.i18n import _ from zun.common.i18n import _
import zun.conf import zun.conf
from zun.db import api as db_api from zun import objects
from zun.websocket.websocketclient import WebSocketClient from zun.websocket.websocketclient import WebSocketClient
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -190,13 +190,12 @@ class ZunProxyRequestHandlerBase(object):
token = urlparse.parse_qs(query).get("token", [""]).pop() token = urlparse.parse_qs(query).get("token", [""]).pop()
uuid = urlparse.parse_qs(query).get("uuid", [""]).pop() uuid = urlparse.parse_qs(query).get("uuid", [""]).pop()
dbapi = db_api._get_dbdriver_instance()
ctx = context.get_admin_context(all_projects=True) ctx = context.get_admin_context(all_projects=True)
if uuidutils.is_uuid_like(uuid): if uuidutils.is_uuid_like(uuid):
container = dbapi.get_container_by_uuid(ctx, uuid) container = objects.Container.get_by_uuid(ctx, uuid)
else: else:
container = dbapi.get_container_by_name(ctx, uuid) container = objects.Container.get_by_name(ctx, uuid)
if token != container.websocket_token: if token != container.websocket_token:
raise exception.InvalidWebsocketToken(token) raise exception.InvalidWebsocketToken(token)