From caacd056701e21a713625c9a24c561466bef8103 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Tue, 1 May 2018 03:59:40 +0000 Subject: [PATCH] Use versioned object instead of db_api In websocket proxy module, it directly used db_api to retrieve the container. It is better to use versioned object instead since versioned object has several benenfits, such as support upgrade. Change-Id: Ic8697f4a3fe3ed522fea802225061004203952ad Closes-Bug: #1766132 --- zun/websocket/websocketproxy.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zun/websocket/websocketproxy.py b/zun/websocket/websocketproxy.py index b5b89e71d..4caddd082 100644 --- a/zun/websocket/websocketproxy.py +++ b/zun/websocket/websocketproxy.py @@ -32,7 +32,7 @@ from zun.common import context from zun.common import exception from zun.common.i18n import _ import zun.conf -from zun.db import api as db_api +from zun import objects from zun.websocket.websocketclient import WebSocketClient LOG = logging.getLogger(__name__) @@ -190,13 +190,12 @@ class ZunProxyRequestHandlerBase(object): token = urlparse.parse_qs(query).get("token", [""]).pop() uuid = urlparse.parse_qs(query).get("uuid", [""]).pop() - dbapi = db_api._get_dbdriver_instance() ctx = context.get_admin_context(all_projects=True) if uuidutils.is_uuid_like(uuid): - container = dbapi.get_container_by_uuid(ctx, uuid) + container = objects.Container.get_by_uuid(ctx, uuid) else: - container = dbapi.get_container_by_name(ctx, uuid) + container = objects.Container.get_by_name(ctx, uuid) if token != container.websocket_token: raise exception.InvalidWebsocketToken(token)