openstack
/
zun
Code Issues Proposed changes

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
This commit is contained in:
Hongbin Lu 2018-05-01 03:59:40 +00:00
parent eb5608c1cc
commit caacd05670
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.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)