commit 192e64e66bfd583ebd4db753997eb51061aeac71
author Jenkins <jenkins@review.openstack.org> Thu Apr 27 18:58:25 2017 +0000
committer Gerrit Code Review <review@openstack.org> Thu Apr 27 18:58:25 2017 +0000
tree cd9c64bb67c428aee2c3551cc99ef43c45b75579
parent e73d974df9f3426013e7ef1fff26bd368781a4a9
parent 8eb9098418eb708ba090d00ae971276cd1a9f860

Merge "Support testing nova-novncproxy on SSL"

tempest/common/compute.py

diff --git a/tempest/common/compute.py b/tempest/common/compute.py
index 9587ffe..9110c4a 100644
--- a/tempest/common/compute.py
+++ b/tempest/common/compute.py
@@ -15,6 +15,7 @@
 
 import base64
 import socket
+import ssl
 import struct
 import textwrap
 
@@ -236,7 +237,11 @@
 
 def create_websocket(url):
     url = urlparse.urlparse(url)
-    client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    if url.scheme == 'https':
+        client_socket = ssl.wrap_socket(socket.socket(socket.AF_INET,
+                                                      socket.SOCK_STREAM))
+    else:
+        client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     client_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     client_socket.connect((url.hostname, url.port))
     # Turn the Socket into a WebSocket to do the communication