openstack
/
shade
Code Issues Proposed changes

Rename identity_domain to domain 

Since designate renamed domains to zones (or is going to), we can
just call keystone domains "domain" without a prefix of identity.

Change-Id: I2d9b56ac53c8bf0745ada16e4419c19d82353a7a
This commit is contained in:
Monty Taylor 2015-10-19 15:44:24 -04:00
parent 6afb7ad42f
commit f7afb98dfe
5 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shade/__init__.py
View File

@ -4900,7 +4900,7 @@ class OperatorCloud(OpenStackCloud):
msg=str(e)))
return True
def create_identity_domain(
def create_domain(
self, name, description=None, enabled=True):
"""Create a Keystone domain.
@ -4913,7 +4913,7 @@ class OperatorCloud(OpenStackCloud):
:raise OpenStackCloudException: if the domain cannot be created
"""
try:
domain = self.manager.submitTask(_tasks.IdentityDomainCreate(
domain = self.manager.submitTask(_tasks.DomainCreate(
name=name,
description=description,
enabled=enabled))
@ -4923,11 +4923,11 @@ class OperatorCloud(OpenStackCloud):
msg=str(e)))
return meta.obj_to_dict(domain)
def update_identity_domain(
def update_domain(
self, domain_id, name=None, description=None, enabled=None):
try:
return meta.obj_to_dict(
self.manager.submitTask(_tasks.IdentityDomainUpdate(
self.manager.submitTask(_tasks.DomainUpdate(
domain=domain_id, description=description,
enabled=enabled)))
except Exception as e:
@ -4935,7 +4935,7 @@ class OperatorCloud(OpenStackCloud):
"Error in updating domain {domain}: {message}".format(
domain=domain_id, message=str(e)))
def delete_identity_domain(self, domain_id):
def delete_domain(self, domain_id):
"""Delete a Keystone domain.
:param domain_id: ID of the domain to delete.
@ -4948,15 +4948,15 @@ class OperatorCloud(OpenStackCloud):
try:
# Deleting a domain is expensive, so disabling it first increases
# the changes of success
domain = self.update_identity_domain(domain_id, enabled=False)
self.manager.submitTask(_tasks.IdentityDomainDelete(
domain = self.update_domain(domain_id, enabled=False)
self.manager.submitTask(_tasks.DomainDelete(
domain=domain['id']))
except Exception as e:
raise OpenStackCloudException(
"Failed to delete domain {id}: {msg}".format(id=domain_id,
msg=str(e)))
def list_identity_domains(self):
def list_domains(self):
"""List Keystone domains.
:returns: a list of dicts containing the domain description.
@ -4965,13 +4965,13 @@ class OperatorCloud(OpenStackCloud):
the openstack API call.
"""
try:
domains = self.manager.submitTask(_tasks.IdentityDomainList())
domains = self.manager.submitTask(_tasks.DomainList())
except Exception as e:
raise OpenStackCloudException("Failed to list domains: {msg}"
.format(msg=str(e)))
return meta.obj_list_to_dict(domains)
def search_identity_domains(self, **filters):
def search_domains(self, **filters):
"""Seach Keystone domains.
:param filters: a dict containing additional filters to use.
@ -4988,13 +4988,13 @@ class OperatorCloud(OpenStackCloud):
"""
try:
domains = self.manager.submitTask(
_tasks.IdentityDomainList(**filters))
_tasks.DomainList(**filters))
except Exception as e:
raise OpenStackCloudException("Failed to list domains: {msg}"
.format(msg=str(e)))
return meta.obj_list_to_dict(domains)
def get_identity_domain(self, domain_id):
def get_domain(self, domain_id):
"""Get exactly one Keystone domain.
:param domain_id: domain id.
@ -5010,7 +5010,7 @@ class OperatorCloud(OpenStackCloud):
"""
try:
domain = self.manager.submitTask(
_tasks.IdentityDomainGet(domain=domain_id))
_tasks.DomainGet(domain=domain_id))
except Exception as e:
raise OpenStackCloudException(
"Failed to get domain {domain_id}: {msg}".format(

15
shade/_tasks.py
View File

@ -536,32 +536,27 @@ class EndpointDelete(task_manager.Task):
return client.keystone_client.endpoints.delete(**self.args)
# IdentityDomain and not Domain because Domain is a DNS concept
class IdentityDomainCreate(task_manager.Task):
class DomainCreate(task_manager.Task):
def main(self, client):
return client.keystone_client.domains.create(**self.args)
# IdentityDomain and not Domain because Domain is a DNS concept
class IdentityDomainList(task_manager.Task):
class DomainList(task_manager.Task):
def main(self, client):
return client.keystone_client.domains.list()
# IdentityDomain and not Domain because Domain is a DNS concept
class IdentityDomainGet(task_manager.Task):
class DomainGet(task_manager.Task):
def main(self, client):
return client.keystone_client.domains.get(**self.args)
# IdentityDomain and not Domain because Domain is a DNS concept
class IdentityDomainUpdate(task_manager.Task):
class DomainUpdate(task_manager.Task):
def main(self, client):
return client.keystone_client.domains.update(**self.args)
# IdentityDomain and not Domain because Domain is a DNS concept
class IdentityDomainDelete(task_manager.Task):
class DomainDelete(task_manager.Task):
def main(self, client):
return client.keystone_client.domains.delete(**self.args)

2
shade/tests/fakes.py
View File

@ -149,7 +149,7 @@ class FakeKeypair(object):
self.public_key = public_key
class FakeIdentityDomain(object):
class FakeDomain(object):
def __init__(self, id, name, description, enabled):
self.id = id
self.name = name

2
shade/tests/functional/test_users.py
View File

@ -52,7 +52,7 @@ class TestUsers(base.TestCase):
domain_id = None
identity_version = self.cloud.cloud_config.get_api_version('identity')
if identity_version not in ('2', '2.0'):
domain = self.cloud.get_identity_domain('default')
domain = self.cloud.get_domain('default')
domain_id = domain['id']
return self.cloud.create_user(domain_id=domain_id, **kwargs)

14
shade/tests/unit/test_identity_domains.py → shade/tests/unit/test_domains.py
View File

@ -20,7 +20,7 @@ from shade.tests.unit import base
from shade.tests import fakes
domain_obj = fakes.FakeIdentityDomain(
domain_obj = fakes.FakeDomain(
id='1',
name='a-domain',
description='A wonderful keystone domain',
@ -28,21 +28,21 @@ domain_obj = fakes.FakeIdentityDomain(
)
class TestIdentityDomains(base.TestCase):
class TestDomains(base.TestCase):
def setUp(self):
super(TestIdentityDomains, self).setUp()
super(TestDomains, self).setUp()
self.cloud = shade.operator_cloud(validate=False)
@mock.patch.object(shade.OpenStackCloud, 'keystone_client')
def test_list_identity_domains(self, mock_keystone):
self.cloud.list_identity_domains()
def test_list_domains(self, mock_keystone):
self.cloud.list_domains()
self.assertTrue(mock_keystone.domains.list.called)
@mock.patch.object(shade.OpenStackCloud, 'keystone_client')
def test_get_identity_domain(self, mock_keystone):
def test_get_domain(self, mock_keystone):
mock_keystone.domains.get.return_value = domain_obj
domain = self.cloud.get_identity_domain(domain_id='1234')
domain = self.cloud.get_domain(domain_id='1234')
self.assertFalse(mock_keystone.domains.list.called)
self.assertTrue(mock_keystone.domains.get.called)
self.assertEqual(domain['name'], 'a-domain')