From 082dc59b891b0e231bc82cb88a4b17646adbfac3 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 16 Dec 2019 11:11:37 +0000 Subject: [PATCH] trivial: Bump minimum version of websockify This includes a couple of fixes and removes the need for custom workarounds, like the removal of the 'address_string' helper at [1]. [1] https://github.com/novnc/websockify/commit/be9823bf Change-Id: I9b1d57fd513386e552afbbc8a59cf3a4c54b6908 Signed-off-by: Stephen Finucane --- lower-constraints.txt | 2 +- nova/console/websocketproxy.py | 16 +--------------- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 913076f87f65..8c52736d6824 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -165,7 +165,7 @@ vine==1.1.4 voluptuous==0.11.1 warlock==1.2.0 WebOb==1.8.2 -websockify==0.8.0 +websockify==0.9.0 wrapt==1.10.11 wsgi-intercept==1.7.0 zVMCloudConnector==1.3.0 diff --git a/nova/console/websocketproxy.py b/nova/console/websocketproxy.py index e13b3c0fe153..3619bb64e4ab 100644 --- a/nova/console/websocketproxy.py +++ b/nova/console/websocketproxy.py @@ -94,11 +94,6 @@ class TenantSock(object): class NovaProxyRequestHandlerBase(object): - def address_string(self): - # NOTE(rpodolyaka): override the superclass implementation here and - # explicitly disable the reverse DNS lookup, which might fail on some - # deployments due to DNS configuration and break VNC access completely - return str(self.client_address[0]) def verify_origin_proto(self, connect_info, origin_proto): if 'access_url_base' not in connect_info: @@ -294,16 +289,7 @@ class NovaProxyRequestHandler(NovaProxyRequestHandlerBase, return self._compute_rpcapi def socket(self, *args, **kwargs): - # TODO(melwitt): The try_import and if-else condition can be removed - # when we get to the point where we're requiring at least websockify - # v.0.9.0 in our lower-constraints. - if websockifyserver is not None: - # In websockify v0.9.0, the 'socket' method moved to the - # websockify.websockifyserver.WebSockifyServer class. - return websockifyserver.WebSockifyServer.socket(*args, **kwargs) - else: - # Fall back to the websockify <= v0.8.0 'socket' method location. - return websockify.WebSocketServer.socket(*args, **kwargs) + return websockifyserver.WebSockifyServer.socket(*args, **kwargs) class NovaWebSocketProxy(websockify.WebSocketProxy): diff --git a/requirements.txt b/requirements.txt index a0855a79cd52..52da5c2316f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ python-glanceclient>=2.8.0 # Apache-2.0 requests>=2.14.2 # Apache-2.0 six>=1.10.0 # MIT stevedore>=1.20.0 # Apache-2.0 -websockify>=0.8.0 # LGPLv3 +websockify>=0.9.0 # LGPLv3 oslo.cache>=1.26.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 oslo.config>=6.1.0 # Apache-2.0