Merge branch 'CY-1666-refactor-handling-insecure-and-ca-crt-for-3x'

Author: Mohammed AbuAisha

CHANGELOG.txt

@@ -36,6 +36,7 @@
     - Openstack Plugin v3: new plugin based on openstacksdk official library (instead of CLI package), new types, new examples, new tests.
 2.14.15:
     - Refactor handling ssl connection when connection Openstack API.
+    - Fix issue with agent installation
 2.14.14:
     - Fix bug with providing insecure and certificate when connecting to Openstack API.
 2.14.13:

openstack_plugin/decorators.py

@@ -25,7 +25,9 @@
 
 # Local imports
 from openstack_plugin.compat import Compat
-from openstack_sdk.common import (InvalidDomainException, QuotaException)
+from openstack_sdk.common import (InvalidDomainException,
+                                  QuotaException,
+                                  InvalidINSecureValue)
 from openstack_plugin.utils import (
     resolve_ctx,
     get_current_operation,
@@ -47,7 +49,8 @@
 )
 EXCEPTIONS = (exceptions.SDKException,
               InvalidDomainException,
-              QuotaException)
+              QuotaException,
+              InvalidINSecureValue)
 
 
 def with_openstack_resource(class_decl,

openstack_plugin/tests/test_compat.py

@@ -49,7 +49,8 @@ def openstack_config(self):
             'username': 'foo',
             'password': 'foo',
             'region_name': 'foo',
-            'project_name': 'foo'
+            'project_name': 'foo',
+            'insecure': False
         }
 
     @property

openstack_sdk/common.py

@@ -29,13 +29,17 @@ class InvalidDomainException(Exception):
     pass
 
 
+class InvalidINSecureValue(Exception):
+    pass
+
+
 class OpenstackResource(object):
     service_type = None
     resource_type = None
 
     def __init__(self, client_config, resource_config=None, logger=None):
         self.client_config = client_config
-        self.configure_ca_cert()
+        self.configure_ssl()
         self.logger = logger
         self.connection = openstack.connect(**client_config)
         self.config = resource_config or {}
@@ -63,10 +67,28 @@ def validate_keystone_v3(self):
                     pattern = pattern + '({0}, {1}),'.format(item[0], item[1])
                 raise InvalidDomainException(message.format(pattern))
 
-    def configure_ca_cert(self):
+    def configure_ssl(self):
+        self._configure_ca_cert()
+        self._configure_insecure()
+
+    def _configure_ca_cert(self):
         if self.client_config.get('ca_cert'):
             self.client_config['cacert'] = self.client_config.pop('ca_cert')
 
+    def _configure_insecure(self):
+        insecure = self.client_config.get('insecure', False)
+        bool_str = {
+            'True': True,
+            'False': False,
+        }
+        if isinstance(insecure, basestring):
+            insecure = bool_str.get(insecure.capitalize())
+        if not isinstance(insecure, bool):
+            raise InvalidINSecureValue(
+                'Invalid insecure value {0}.'
+                'It must be boolean'.format(insecure))
+        self.client_config['insecure'] = insecure
+
     def get_project_id_by_name(self, project_name=None):
         project_name = project_name or self.project_name
         project = self.connection.identity.find_project(project_name)