Merge "Fix keystone domain searching"

shade/_tasks.py

@@ -609,7 +609,7 @@ class DomainCreate(task_manager.Task):
 
 class DomainList(task_manager.Task):
     def main(self, client):
-        return client.keystone_client.domains.list()
+        return client.keystone_client.domains.list(**self.args)
 
 
 class DomainGet(task_manager.Task):

shade/operatorcloud.py

@@ -1161,11 +1161,11 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
                                           .format(msg=str(e)))
         return domains
 
-    def search_domains(self, **filters):
-        """Seach Keystone domains.
+    def search_domains(self, filters=None):
+        """Search Keystone domains.
 
-        :param filters: a dict containing additional filters to use.
-                keys to search on are id, name, enabled and description.
+        :param dict filters: A dict containing additional filters to use.
+             Keys to search on are id, name, enabled and description.
 
         :returns: a list of dicts containing the domain description. Each dict
             contains the following attributes::

shade/tests/functional/test_domain.py

@@ -0,0 +1,65 @@
+# 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.
+
+"""
+test_domain
+----------------------------------
+
+Functional tests for `shade` keystone domain resource.
+"""
+
+import shade
+from shade.tests import base
+
+
+class TestDomain(base.TestCase):
+
+    def setUp(self):
+        super(TestDomain, self).setUp()
+        self.cloud = shade.operator_cloud(cloud='devstack-admin')
+        if self.cloud.cloud_config.get_api_version('identity') in ('2', '2.0'):
+            self.skipTest('Identity service does not support domains')
+        self.domain_prefix = self.getUniqueString('domain')
+        self.addCleanup(self._cleanup_domains)
+
+    def _cleanup_domains(self):
+        exception_list = list()
+        for domain in self.cloud.list_domains():
+            if domain['name'].startswith(self.domain_prefix):
+                try:
+                    self.cloud.delete_domain(domain['id'])
+                except Exception as e:
+                    exception_list.append(str(e))
+                    continue
+
+        if exception_list:
+            # Raise an error: we must make users aware that something went
+            # wrong
+            raise shade.OpenStackCloudException('\n'.join(exception_list))
+
+    def test_search_domains(self):
+        domain_name = self.domain_prefix + '_search'
+
+        # Shouldn't find any domain with this name yet
+        results = self.cloud.search_domains(filters=dict(name=domain_name))
+        self.assertEqual(0, len(results))
+
+        # Now create a new domain
+        domain = self.cloud.create_domain(domain_name)
+        self.assertEqual(domain_name, domain['name'])
+
+        # Now we should find only the new domain
+        results = self.cloud.search_domains(filters=dict(name=domain_name))
+        self.assertEqual(1, len(results))
+        self.assertEqual(domain_name, results[0]['name'])