From 8793800fa5c7e3bfe8c56c491eba22c749053c5a Mon Sep 17 00:00:00 2001 From: Everett Toews Date: Thu, 28 May 2015 16:29:38 -0500 Subject: [PATCH] Rename messaging module to message Looking at the project names [1] it's clear that the official names don't end in 'ing' (the only exception being Networking). The SDK follows the official names as our module naming convention. Hence we should not append 'ing' to module names whether they have an official name in that list or not. We need to rename the messaging module to message. [1] https://wiki.openstack.org/wiki/Documentation/Conventions Change-Id: I2a433cb72341e2660e33cd3f946e2f22eed19622 --- openstack/{messaging => message}/__init__.py | 0 .../messaging_service.py => message/message_service.py} | 8 ++++---- openstack/{messaging => message}/v1/__init__.py | 0 openstack/{messaging => message}/v1/_proxy.py | 6 +++--- openstack/{messaging => message}/v1/queue.py | 4 ++-- openstack/{messaging => message}/version.py | 6 +++--- openstack/profile.py | 4 ++-- openstack/tests/unit/{messaging => message}/__init__.py | 0 .../test_message_service.py} | 6 +++--- .../tests/unit/{messaging => message}/test_version.py | 2 +- .../tests/unit/{messaging => message}/v1/__init__.py | 0 .../tests/unit/{messaging => message}/v1/test_proxy.py | 8 ++++---- .../tests/unit/{messaging => message}/v1/test_queue.py | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) rename openstack/{messaging => message}/__init__.py (100%) rename openstack/{messaging/messaging_service.py => message/message_service.py} (81%) rename openstack/{messaging => message}/v1/__init__.py (100%) rename openstack/{messaging => message}/v1/_proxy.py (84%) rename openstack/{messaging => message}/v1/queue.py (91%) rename openstack/{messaging => message}/version.py (83%) rename openstack/tests/unit/{messaging => message}/__init__.py (100%) rename openstack/tests/unit/{messaging/test_messaging_service.py => message/test_message_service.py} (86%) rename openstack/tests/unit/{messaging => message}/test_version.py (97%) rename openstack/tests/unit/{messaging => message}/v1/__init__.py (100%) rename openstack/tests/unit/{messaging => message}/v1/test_proxy.py (84%) rename openstack/tests/unit/{messaging => message}/v1/test_queue.py (95%) diff --git a/openstack/messaging/__init__.py b/openstack/message/__init__.py similarity index 100% rename from openstack/messaging/__init__.py rename to openstack/message/__init__.py diff --git a/openstack/messaging/messaging_service.py b/openstack/message/message_service.py similarity index 81% rename from openstack/messaging/messaging_service.py rename to openstack/message/message_service.py index a42306e8..fe0e8c51 100644 --- a/openstack/messaging/messaging_service.py +++ b/openstack/message/message_service.py @@ -13,14 +13,14 @@ from openstack.auth import service_filter -class MessagingService(service_filter.ServiceFilter): - """The messaging service.""" +class MessageService(service_filter.ServiceFilter): + """The message service.""" valid_versions = [service_filter.ValidVersion('v1')] def __init__(self, version=None): - """Create an messaging service.""" - super(MessagingService, self).__init__( + """Create a message service.""" + super(MessageService, self).__init__( service_type='messaging', version=version ) diff --git a/openstack/messaging/v1/__init__.py b/openstack/message/v1/__init__.py similarity index 100% rename from openstack/messaging/v1/__init__.py rename to openstack/message/v1/__init__.py diff --git a/openstack/messaging/v1/_proxy.py b/openstack/message/v1/_proxy.py similarity index 84% rename from openstack/messaging/v1/_proxy.py rename to openstack/message/v1/_proxy.py index 1d72970e..3fcbc518 100644 --- a/openstack/messaging/v1/_proxy.py +++ b/openstack/message/v1/_proxy.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.messaging.v1 import queue +from openstack.message.v1 import queue from openstack import proxy @@ -20,10 +20,10 @@ class Proxy(proxy.BaseProxy): """Create a new queue from attributes :param dict attrs: Keyword arguments which will be used to create - a :class:`~openstack.messaging.v1.queue.Queue`, + a :class:`~openstack.message.v1.queue.Queue`, comprised of the properties on the Queue class. :returns: The results of queue creation - :rtype: :class:`~openstack.messaging.v1.queue.Queue` + :rtype: :class:`~openstack.message.v1.queue.Queue` """ return self._create(queue.Queue, **attrs) diff --git a/openstack/messaging/v1/queue.py b/openstack/message/v1/queue.py similarity index 91% rename from openstack/messaging/v1/queue.py rename to openstack/message/v1/queue.py index 7ea67775..1d99aff7 100644 --- a/openstack/messaging/v1/queue.py +++ b/openstack/message/v1/queue.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.messaging import messaging_service +from openstack.message import message_service from openstack import resource @@ -18,7 +18,7 @@ class Queue(resource.Resource): id_attribute = 'name' resources_key = 'queues' base_path = '/queues' - service = messaging_service.MessagingService() + service = message_service.MessageService() # capabilities allow_create = True diff --git a/openstack/messaging/version.py b/openstack/message/version.py similarity index 83% rename from openstack/messaging/version.py rename to openstack/message/version.py index b43c0f0a..431fd239 100644 --- a/openstack/messaging/version.py +++ b/openstack/message/version.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.messaging import messaging_service +from openstack.message import message_service from openstack import resource @@ -18,8 +18,8 @@ class Version(resource.Resource): resource_key = 'version' resources_key = 'versions' base_path = '/' - service = messaging_service.MessagingService( - version=messaging_service.MessagingService.UNVERSIONED + service = message_service.MessageService( + version=message_service.MessageService.UNVERSIONED ) # capabilities diff --git a/openstack/profile.py b/openstack/profile.py index 34dd6d79..e24891ed 100644 --- a/openstack/profile.py +++ b/openstack/profile.py @@ -59,7 +59,7 @@ from openstack import exceptions from openstack.identity import identity_service from openstack.image import image_service from openstack.keystore import keystore_service -from openstack.messaging import messaging_service +from openstack.message import message_service from openstack.metric import metric_service from openstack.network import network_service from openstack.object_store import object_store_service @@ -121,7 +121,7 @@ class Profile(object): serv = volume_service.VolumeService() serv.set_visibility(None) self._services[serv.service_type] = serv - serv = messaging_service.MessagingService() + serv = message_service.MessageService() serv.set_visibility(None) self._services[serv.service_type] = serv diff --git a/openstack/tests/unit/messaging/__init__.py b/openstack/tests/unit/message/__init__.py similarity index 100% rename from openstack/tests/unit/messaging/__init__.py rename to openstack/tests/unit/message/__init__.py diff --git a/openstack/tests/unit/messaging/test_messaging_service.py b/openstack/tests/unit/message/test_message_service.py similarity index 86% rename from openstack/tests/unit/messaging/test_messaging_service.py rename to openstack/tests/unit/message/test_message_service.py index 76e3a404..5408eea7 100644 --- a/openstack/tests/unit/messaging/test_messaging_service.py +++ b/openstack/tests/unit/message/test_message_service.py @@ -12,13 +12,13 @@ import testtools -from openstack.messaging import messaging_service +from openstack.message import message_service -class TestOrchestrationService(testtools.TestCase): +class TestMessageService(testtools.TestCase): def test_service(self): - sot = messaging_service.MessagingService() + sot = message_service.MessageService() self.assertEqual('messaging', sot.service_type) self.assertEqual('public', sot.visibility) self.assertIsNone(sot.region) diff --git a/openstack/tests/unit/messaging/test_version.py b/openstack/tests/unit/message/test_version.py similarity index 97% rename from openstack/tests/unit/messaging/test_version.py rename to openstack/tests/unit/message/test_version.py index 777d4483..bf9662e1 100644 --- a/openstack/tests/unit/messaging/test_version.py +++ b/openstack/tests/unit/message/test_version.py @@ -12,7 +12,7 @@ import testtools -from openstack.messaging import version +from openstack.message import version IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/messaging/v1/__init__.py b/openstack/tests/unit/message/v1/__init__.py similarity index 100% rename from openstack/tests/unit/messaging/v1/__init__.py rename to openstack/tests/unit/message/v1/__init__.py diff --git a/openstack/tests/unit/messaging/v1/test_proxy.py b/openstack/tests/unit/message/v1/test_proxy.py similarity index 84% rename from openstack/tests/unit/messaging/v1/test_proxy.py rename to openstack/tests/unit/message/v1/test_proxy.py index 0b4315ec..58a5982a 100644 --- a/openstack/tests/unit/messaging/v1/test_proxy.py +++ b/openstack/tests/unit/message/v1/test_proxy.py @@ -10,14 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.messaging.v1 import _proxy -from openstack.messaging.v1 import queue +from openstack.message.v1 import _proxy +from openstack.message.v1 import queue from openstack.tests.unit import test_proxy_base -class TestMessagingProxy(test_proxy_base.TestProxyBase): +class TestMessageProxy(test_proxy_base.TestProxyBase): def setUp(self): - super(TestMessagingProxy, self).setUp() + super(TestMessageProxy, self).setUp() self.proxy = _proxy.Proxy(self.session) def test_queue_create_attrs(self): diff --git a/openstack/tests/unit/messaging/v1/test_queue.py b/openstack/tests/unit/message/v1/test_queue.py similarity index 95% rename from openstack/tests/unit/messaging/v1/test_queue.py rename to openstack/tests/unit/message/v1/test_queue.py index 2b0095a2..46ac0d4b 100644 --- a/openstack/tests/unit/messaging/v1/test_queue.py +++ b/openstack/tests/unit/message/v1/test_queue.py @@ -13,7 +13,7 @@ import mock import testtools -from openstack.messaging.v1 import queue +from openstack.message.v1 import queue FAKE_NAME = 'test_queue' @@ -22,7 +22,7 @@ FAKE = { } -class TestStack(testtools.TestCase): +class TestQueue(testtools.TestCase): def test_basic(self): sot = queue.Queue()