From d004c54bb25fe8cd49ce8e30466fdf0ffbe85532 Mon Sep 17 00:00:00 2001
From: Ahmad Musa <ahmad@cloudify.co>
Date: Thu, 12 Mar 2020 09:38:18 +0200
Subject: [PATCH] CY-2432-Keystone-v3-Validation

---
 CHANGELOG.txt           |  2 ++
 openstack_sdk/common.py | 13 ++++++-------
 plugin.yaml             |  4 ++--
 setup.py                |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 85208915..e0b86525 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,5 @@
+3.2.11:
+  - Keystone V3 validation to refer to docs URL in case of missing configuration.
 3.2.10:
   - Remove ID key from resource object if healing terminated VM.
 3.2.9
diff --git a/openstack_sdk/common.py b/openstack_sdk/common.py
index 5f948840..01295b32 100644
--- a/openstack_sdk/common.py
+++ b/openstack_sdk/common.py
@@ -59,13 +59,12 @@ def validate_keystone_v3(self):
                 if len(common) == 2:
                     break
             else:
-                message = 'Invalid domain combinations, they must be ' \
-                          'consistent with the following patterns: {0}'
-                pattern = ''
-                for item in self.domain_auth_sets:
-                    item = list(item)
-                    pattern = pattern + '({0}, {1}),'.format(item[0], item[1])
-                raise InvalidDomainException(message.format(pattern))
+                docs_url = 'https://docs.cloudify.co/5.0.5/working_with/'\
+                    'official_plugins/infrastructure/openstackv3/'\
+                    '#authentication-with-openstack'
+                message = 'Invalid client_config, ' \
+                          'Please refer to Openstack Plugin url : {0}'
+                raise InvalidDomainException(message.format(docs_url))
 
     def configure_ssl(self):
         self._configure_ca_cert()
diff --git a/plugin.yaml b/plugin.yaml
index da2c3c85..ed5347c8 100644
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -2,9 +2,9 @@ plugins:
 
   openstack:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-openstack-plugin/archive/3.2.10.zip
+    source: https://github.com/cloudify-cosmo/cloudify-openstack-plugin/archive/3.2.11.zip
     package_name: cloudify-openstack-plugin
-    package_version: '3.2.10'
+    package_version: '3.2.11'
 
 dsl_definitions:
 
diff --git a/setup.py b/setup.py
index 5d85ff68..adcd4e34 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
 
 setup(
     name='cloudify-openstack-plugin',
-    version='3.2.10',
+    version='3.2.11',
     author='Cloudify',
     author_email='info@cloudify.co',
     license='LICENSE',