Merge "Remove unused validate_ssl_version"

3 files changed, 0 insertions, 93 deletions

diff --git a/openstack/common/sslutils.py b/openstack/common/sslutils.py
index 2d6879ca..9ff8543a 100644
--- a/openstack/common/sslutils.py
+++ b/openstack/common/sslutils.py
@@ -79,27 +79,3 @@ def wrap(sock):
         ssl_kwargs['cert_reqs'] = ssl.CERT_REQUIRED
 
     return ssl.wrap_socket(sock, **ssl_kwargs)
-
-
-_SSL_PROTOCOLS = {
-    "tlsv1": ssl.PROTOCOL_TLSv1,
-    "sslv23": ssl.PROTOCOL_SSLv23,
-}
-
-try:
-    _SSL_PROTOCOLS["sslv2"] = ssl.PROTOCOL_SSLv2
-except AttributeError:
-    pass
-
-try:
-    _SSL_PROTOCOLS["sslv3"] = ssl.PROTOCOL_SSLv3
-except AttributeError:
-    pass
-
-
-def validate_ssl_version(version):
-    key = version.lower()
-    try:
-        return _SSL_PROTOCOLS[key]
-    except KeyError:
-        raise RuntimeError(_("Invalid SSL version : %s") % version)
diff --git a/tests/unit/test_sslutils.py b/tests/unit/test_sslutils.py
deleted file mode 100644
index 6d8eca31..00000000
--- a/tests/unit/test_sslutils.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2013 IBM Corp.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import ssl
-
-from oslotest import base as test_base
-
-from openstack.common import sslutils
-
-
-class SSLUtilsTest(test_base.BaseTestCase):
-    def test_valid_versions(self):
-        self.assertEqual(sslutils.validate_ssl_version("SSLv23"),
-                         ssl.PROTOCOL_SSLv23)
-        self.assertEqual(sslutils.validate_ssl_version("TLSv1"),
-                         ssl.PROTOCOL_TLSv1)
-        if hasattr(ssl, 'PROTOCOL_SSLv2'):
-            self.assertEqual(sslutils.validate_ssl_version("SSLv2"),
-                             ssl.PROTOCOL_SSLv2)
-        if hasattr(ssl, 'PROTOCOL_SSLv3'):
-            self.assertEqual(sslutils.validate_ssl_version("SSLv3"),
-                             ssl.PROTOCOL_SSLv3)
-
-    def test_lowercase_valid_versions(self):
-        self.assertEqual(sslutils.validate_ssl_version("sslv23"),
-                         ssl.PROTOCOL_SSLv23)
-        self.assertEqual(sslutils.validate_ssl_version("tlsv1"),
-                         ssl.PROTOCOL_TLSv1)
-        if hasattr(ssl, 'PROTOCOL_SSLv2'):
-            self.assertEqual(sslutils.validate_ssl_version("sslv2"),
-                             ssl.PROTOCOL_SSLv2)
-        if hasattr(ssl, 'PROTOCOL_SSLv3'):
-            self.assertEqual(sslutils.validate_ssl_version("sslv3"),
-                             ssl.PROTOCOL_SSLv3)
-
-    def test_invalid_version(self):
-        self.assertRaises(RuntimeError,
-                          sslutils.validate_ssl_version,
-                          "v3")
-
-        # Some distributions do not have SSLv2 enabled, make sure
-        # we throw a runtime error
-        try:
-            ssl.PROTOCOL_SSLv2
-        except AttributeError:
-            self.assertRaises(RuntimeError,
-                              sslutils.validate_ssl_version,
-                              "SSLv2")
-
-        # The same is now true of SSLv3
-        try:
-            ssl.PROTOCOL_SSLv3
-        except AttributeError:
-            self.assertRaises(RuntimeError,
-                              sslutils.validate_ssl_version,
-                              "SSLv3")
diff --git a/tox.ini b/tox.ini
index a749d461..56a696e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,7 +75,6 @@ commands =
             tests.unit.test_memorycache \
             tests.unit.test_periodic \
             tests.unit.test_quota \
-            tests.unit.test_sslutils \
             tests.unit.test_systemd \
             tests.unit.test_versionutils
 
@@ -105,7 +104,6 @@ commands =
             tests.unit.test_memorycache \
             tests.unit.test_periodic \
             tests.unit.test_quota \
-            tests.unit.test_sslutils \
             tests.unit.test_systemd \
             tests.unit.test_versionutils