From c9e90509b1c02f8ced85633804f92911e4264265 Mon Sep 17 00:00:00 2001 From: Helen Walsh Date: Wed, 10 May 2017 02:08:49 +0100 Subject: [PATCH] VMAX driver - Close ecom connections Every secure connection to the ECOM was not being closed after use. This fix closes each connection after use. Due to not being able to mock pywbem there is no unit test for this fix. Change-Id: I0730c709b9fdc20410de06ca3f9705c9ea77d098 Closes-Bug: #1689760 (cherry picked from commit 430e8c9fd81a75d7a7053b049a93313013fd8e9b) --- cinder/volume/drivers/dell_emc/vmax/https.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cinder/volume/drivers/dell_emc/vmax/https.py b/cinder/volume/drivers/dell_emc/vmax/https.py index aa9584f47..8a800d642 100644 --- a/cinder/volume/drivers/dell_emc/vmax/https.py +++ b/cinder/volume/drivers/dell_emc/vmax/https.py @@ -284,14 +284,13 @@ def wbem_request(url, data, creds, headers=None, debug=0, x509=None, elif no_verification: ca_certs = None - if use_ssl: - h = HTTPSConnection( - host, - port=port, - key_file=key_file, - cert_file=cert_file, - ca_certs=ca_certs, - no_verification=no_verification) + h = HTTPSConnection( + host, + port=port, + key_file=key_file, + cert_file=cert_file, + ca_certs=ca_certs, + no_verification=no_verification) locallogin = None while numTries < tryLimit: @@ -325,6 +324,7 @@ def wbem_request(url, data, creds, headers=None, debug=0, x509=None, response = h.getresponse() body = response.read() + h.close() if response.status != 200: raise pywbem.cim_http.Error('HTTP error')