From d721b7503941a1e7a7d86e94be64c41a9d4f74a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victoria=20Mart=C3=ADnez=20de=20la=20Cruz?= Date: Fri, 19 Sep 2014 17:21:56 -0300 Subject: [PATCH] Updates API name Zaqar is a messaging service which provides support for different messaging patterns and messaging related semantics. This fix changes the old API name -queuing- to a more accurate name, -messaging-. Change-Id: Icaf67607de962217819f8040abca7dd9b81aa1d4 --- setup.cfg | 4 ++-- zaqarclient/auth/keystone.py | 2 +- zaqarclient/queues/cli.py | 2 +- zaqarclient/queues/v1/cli.py | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4f157c26..1f103e27 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,7 +44,7 @@ zaqarclient.api = queues.v1 = zaqarclient.queues.v1.api:V1 queues.v1.1 = zaqarclient.queues.v1.api:V1_1 -openstack.queuing.v1 = +openstack.messaging.v1 = queue_list = zaqarclient.queues.v1.cli:ListQueues queue_create = zaqarclient.queues.v1.cli:CreateQueue queue_delete = zaqarclient.queues.v1.cli:DeleteQueue @@ -54,7 +54,7 @@ openstack.queuing.v1 = queue_stats = zaqarclient.queues.v1.cli:GetQueueStats openstack.cli.extension = - queuing = zaqarclient.queues.cli + messaging = zaqarclient.queues.cli [nosetests] where=tests diff --git a/zaqarclient/auth/keystone.py b/zaqarclient/auth/keystone.py index de257a46..55297597 100644 --- a/zaqarclient/auth/keystone.py +++ b/zaqarclient/auth/keystone.py @@ -87,7 +87,7 @@ class KeystoneAuth(base.AuthBackend): if not request.endpoint: extra = { 'service_type': self.conf.get('os_service_type', - 'queuing'), + 'messaging'), 'endpoint_type': self.conf.get('os_endpoint_type', 'publicURL'), } diff --git a/zaqarclient/queues/cli.py b/zaqarclient/queues/cli.py index 55b68225..f0171097 100644 --- a/zaqarclient/queues/cli.py +++ b/zaqarclient/queues/cli.py @@ -21,7 +21,7 @@ LOG = logging.getLogger(__name__) DEFAULT_QUEUES_API_VERSION = '1' API_VERSION_OPTION = 'os_queues_api_version' -API_NAME = "queuing" +API_NAME = "messaging" API_VERSIONS = { "1": "zaqarclient.queues.v1.client.Client", } diff --git a/zaqarclient/queues/v1/cli.py b/zaqarclient/queues/v1/cli.py index e450b040..b16109e2 100644 --- a/zaqarclient/queues/v1/cli.py +++ b/zaqarclient/queues/v1/cli.py @@ -63,7 +63,7 @@ class DeleteQueue(command.Command): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) - client = self.app.client_manager.queuing + client = self.app.client_manager.messaging queue_name = parsed_args.queue_name @@ -91,7 +91,7 @@ class ListQueues(lister.Lister): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) - client = self.app.client_manager.queuing + client = self.app.client_manager.messaging kwargs = {} if parsed_args.marker is not None: @@ -122,7 +122,7 @@ class CheckQueueExistence(show.ShowOne): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) - client = self.app.client_manager.queuing + client = self.app.client_manager.messaging queue_name = parsed_args.queue_name queue = client.queue(queue_name, auto_create=False) @@ -152,7 +152,7 @@ class SetQueueMetadata(command.Command): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) - client = self.app.client_manager.queuing + client = self.app.client_manager.messaging queue_name = parsed_args.queue_name queue_metadata = parsed_args.queue_metadata @@ -187,7 +187,7 @@ class GetQueueMetadata(show.ShowOne): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) - client = self.app.client_manager.queuing + client = self.app.client_manager.messaging queue_name = parsed_args.queue_name queue = client.queue(queue_name, auto_create=False) @@ -216,7 +216,7 @@ class GetQueueStats(show.ShowOne): def take_action(self, parsed_args): self.log.debug("take_action(%s)" % parsed_args) - client = self.app.client_manager.queuing + client = self.app.client_manager.messaging queue_name = parsed_args.queue_name queue = client.queue(queue_name, auto_create=False)