openstack/zaqar
Code Issues Proposed changes

Rename Marconi to Zaqar

Browse Source 
This patch renames every package, file, match of Marconi in the codebase
to Zaqar *except* for the .gitreview file, which will have to be updated
*after* I8e587af588d9be0b5ebbab4b0f729b106a2ae537 lands.

Implements blueprint: project-rename

Change-Id: I63cf2c680cead4641f3e430af379452058bce5b3
This commit is contained in:
Flavio Percoco 2014-08-01 17:15:59 +02:00
parent ba998351c1
commit 36e63c9a45
212 changed files with 1377 additions and 1013 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.coveragerc
View File

@ -1,8 +1,8 @@
[run] [run]
branch = True branch = True
omit = *marconi/openstack* omit = *zaqar/openstack*
[report] [report]
exclude_lines = exclude_lines =
if __MARCONI_SETUP__: if _ZAQAR_SETUP__:
raise NotImplementedError raise NotImplementedError

10
HACKING.rst
View File

@ -1,9 +1,9 @@
Marconi Style Commandments Zaqar Style Commandments
========================== ========================
- Step 1: Read the OpenStack Style Commandments - Step 1: Read the OpenStack Style Commandments
http://docs.openstack.org/developer/hacking/ http://docs.openstack.org/developer/hacking/
- Step 2: Read on for Marconi specific commandments - Step 2: Read on for Zaqar specific commandments
General General
------- -------
@ -74,11 +74,11 @@ More Import Examples
**INCORRECT** :: **INCORRECT** ::
import marconi.queues.transport.wsgi as wsgi import zaqar.queues.transport.wsgi as wsgi
**CORRECT** :: **CORRECT** ::
from marconi.queues.transport import wsgi from zaqar.queues.transport import wsgi
Docstrings Docstrings
---------- ----------

38
README.rst
View File

@ -1,28 +1,28 @@
Marconi Zaqar
======= =====
Message queuing service for `OpenStack`_. Message queuing service for `OpenStack`_.
To find more information read our `wiki`_. To find more information read our `wiki`_.
Running a local Marconi server with MongoDB Running a local Zaqar server with MongoDB
------------------------------------------- -----------------------------------------
**Note:** These instructions are for running a local instance of Marconi and **Note:** These instructions are for running a local instance of Zaqar and
not all of these steps are required. It is assumed you have `MongoDB`_ not all of these steps are required. It is assumed you have `MongoDB`_
installed and running. installed and running.
1. From your home folder create the ``~/.marconi`` folder and clone the repo:: 1. From your home folder create the ``~/.zaqar`` folder and clone the repo::
$ cd $ cd
$ mkdir .marconi $ mkdir .zaqar
$ git clone https://github.com/openstack/marconi.git $ git clone https://github.com/openstack/zaqar.git
2. Copy the Marconi config files to the directory ``~/.marconi``:: 2. Copy the Zaqar config files to the directory ``~/.zaqar``::
$ cp marconi/etc/marconi.conf.sample ~/.marconi/marconi.conf $ cp zaqar/etc/zaqar.conf.sample ~/.zaqar/zaqar.conf
$ cp marconi/etc/logging.conf.sample ~/.marconi/logging.conf $ cp zaqar/etc/logging.conf.sample ~/.zaqar/logging.conf
3. Find ``[drivers]`` section in ``~/.marconi/marconi.conf`` 3. Find ``[drivers]`` section in ``~/.zaqar/zaqar.conf``
and specify to use mongodb storage:: and specify to use mongodb storage::
storage = mongodb storage = mongodb
@ -37,25 +37,25 @@ installed and running.
uri = mongodb://127.0.0.1:27017 uri = mongodb://127.0.0.1:27017
4. For logging, find the ``[DEFAULT]`` section in 4. For logging, find the ``[DEFAULT]`` section in
``~/.marconi/marconi.conf`` and modify as desired:: ``~/.zaqar/zaqar.conf`` and modify as desired::
log_file = server.log log_file = server.log
5. Change directories back to your local copy of the repo:: 5. Change directories back to your local copy of the repo::
$ cd marconi $ cd zaqar
6. Run the following so you can see the results of any changes you 6. Run the following so you can see the results of any changes you
make to the code without having to reinstall the package each time:: make to the code without having to reinstall the package each time::
$ pip install -e . $ pip install -e .
7. Start the Marconi server with logging level set to INFO so you can see 7. Start the Zaqar server with logging level set to INFO so you can see
the port on which the server is listening:: the port on which the server is listening::
$ marconi-server -v $ zaqar-server -v
8. Test out that Marconi is working by creating a queue:: 8. Test out that Zaqar is working by creating a queue::
$ curl -i -X PUT http://127.0.0.1:8888/v1/queues/samplequeue -H $ curl -i -X PUT http://127.0.0.1:8888/v1/queues/samplequeue -H
"Content-type: application/json" "Content-type: application/json"
@ -86,6 +86,6 @@ You can read more about running functional tests in separate `TESTS_README`_.
.. _`MongoDB` : http://docs.mongodb.org/manual/installation/ .. _`MongoDB` : http://docs.mongodb.org/manual/installation/
.. _`pyenv` : https://github.com/yyuu/pyenv/ .. _`pyenv` : https://github.com/yyuu/pyenv/
.. _`virtualenv` : https://pypi.python.org/pypi/virtualenv/ .. _`virtualenv` : https://pypi.python.org/pypi/virtualenv/
.. _`wiki` : https://wiki.openstack.org/wiki/Marconi .. _`wiki` : https://wiki.openstack.org/wiki/Zaqar
.. _`TESTS_README` : https://github.com/openstack/marconi/blob/master/tests/functional/README.rst .. _`TESTS_README` : https://github.com/openstack/zaqar/blob/master/tests/functional/README.rst

2
bench-requirements.txt
View File

@ -2,4 +2,4 @@ argparse>=1.2.1
gevent>=1.0.1 gevent>=1.0.1
marktime>=0.2.0 marktime>=0.2.0
psutil>=2.1.1 psutil>=2.1.1
python-marconiclient>=0.0.2 python-zaqarclient>=0.0.2

2
doc-test.conf
View File

@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
repo_name = marconi repo_name = zaqar
api_site=True api_site=True
file_exception = includewars.xml file_exception = includewars.xml

4
doc/pom.xml
View File

@ -7,8 +7,8 @@
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>marconi-api-ref</module> <module>zaqar-api-ref</module>
<module>marconi-get-started</module> <module>zaqar-get-started</module>
</modules> </modules>
<profiles> <profiles>
<profile> <profile>

16
doc/source/api.rst
View File

@ -11,20 +11,20 @@
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
Using Marconi's Public APIs Using Zaqar's Public APIs
=========================== =========================
Marconi fully implements version 1.0 of the OpenStack Messaging API by now. Zaqar fully implements version 1.0 of the OpenStack Messaging API by now.
Generally, you can use any HTTP client to talk with Marconi public REST API, Generally, you can use any HTTP client to talk with Zaqar public REST API,
though Marconi client is the recommended approach. though Zaqar client is the recommended approach.
Marconi Client Zaqar Client
############################################ ############################################
We can easily access the Marconi REST API via Marconi client. Below is an example We can easily access the Zaqar REST API via Zaqar client. Below is an example
to create a queue, post messages to it and finally delete it:: to create a queue, post messages to it and finally delete it::
from marconiclient.queues.v1 import client from zaqarclient.queues.v1 import client
URL = 'http://localhost:8888' URL = 'http://localhost:8888'
messages = [{'body': {'id': idx}, 'ttl': 360} for idx in range(20)] messages = [{'body': {'id': idx}, 'ttl': 360} for idx in range(20)]

12
doc/source/conf.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Marconi documentation build configuration file, created by # Zaqar documentation build configuration file, created by
# sphinx-quickstart on Sat May 1 15:17:47 2010. # sphinx-quickstart on Sat May 1 15:17:47 2010.
# #
# This file is execfile()d with the current directory set # This file is execfile()d with the current directory set
@ -63,14 +63,14 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = u'marconi' project = u'zaqar'
copyright = u'2010-present, OpenStack Foundation' copyright = u'2010-present, OpenStack Foundation'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
# built documents. # built documents.
# #
from marconi.version import version_info from zaqar.version import version_info
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version_info.release_string() release = version_info.release_string()
# The short X.Y version. # The short X.Y version.
@ -115,7 +115,7 @@ show_authors = False
pygments_style = 'sphinx' pygments_style = 'sphinx'
# A list of ignored prefixes for module index sorting. # A list of ignored prefixes for module index sorting.
modindex_common_prefix = ['marconi.'] modindex_common_prefix = ['zaqar.']
# -- Options for man page output ---------------------------------------------- # -- Options for man page output ----------------------------------------------
@ -196,7 +196,7 @@ html_last_updated_fmt = os.popen(git_cmd).read()
#html_file_suffix = '' #html_file_suffix = ''
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = 'marconidoc' htmlhelp_basename = 'zaqardoc'
# -- Options for LaTeX output ------------------------------------------------- # -- Options for LaTeX output -------------------------------------------------
@ -211,7 +211,7 @@ htmlhelp_basename = 'marconidoc'
# (source start file, target name, title, author, documentclass # (source start file, target name, title, author, documentclass
# [howto/manual]). # [howto/manual]).
latex_documents = [ latex_documents = [
('index', 'Marconi.tex', u'Marconi Documentation', ('index', 'Zaqar.tex', u'Zaqar Documentation',
u'Anso Labs, LLC', 'manual'), u'Anso Labs, LLC', 'manual'),
] ]

22
doc/source/index.rst
View File

@ -11,12 +11,12 @@
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
Welcome to Marconi's documentation! Welcome to Zaqar's documentation!
=================================== =================================
Marconi is an OpenStack project to provide "Messaging as a service". Zaqar is an OpenStack project to provide "Messaging as a service".
Marconi, as with all OpenStack projects, is written with the following design Zaqar, as with all OpenStack projects, is written with the following design
guidelines in mind: guidelines in mind:
* **Component based architecture**: Quickly add new behaviors * **Component based architecture**: Quickly add new behaviors
@ -26,7 +26,7 @@ guidelines in mind:
* **Open standards**: Be a reference implementation for a community-driven api * **Open standards**: Be a reference implementation for a community-driven api
This documentation is generated by the Sphinx toolkit and lives in the source This documentation is generated by the Sphinx toolkit and lives in the source
tree. Additional draft and project documentation on Marconi and other components of OpenStack can tree. Additional draft and project documentation on Zaqar and other components of OpenStack can
be found on the `OpenStack wiki`_. Cloud administrators, refer to `docs.openstack.org`_. be found on the `OpenStack wiki`_. Cloud administrators, refer to `docs.openstack.org`_.
.. _`OpenStack wiki`: http://wiki.openstack.org .. _`OpenStack wiki`: http://wiki.openstack.org
@ -40,24 +40,24 @@ Concepts
glossary glossary
Installing/Configuring Marconi Installing/Configuring Zaqar
============================== ============================
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
installing installing
Operating Marconi Operating Zaqar
================= ===============
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
ha ha
Using Marconi Using Zaqar
============= ===========
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1

30
doc/source/installing.rst
View File

@ -115,39 +115,39 @@ Install uwsgi on web servers::
web# yum -y install python-pip web# yum -y install python-pip
web# pip install uwsgi web# pip install uwsgi
Configure OpenStack Marconi Configure OpenStack Zaqar
########################### #########################
On the web servers run these commands:: On the web servers run these commands::
web# git clone https://github.com/openstack/marconi.git . web# git clone https://git.openstack.org/openstack/zaqar.git .
web# pip install . -r ./requirements.txt --upgrade --log /tmp/marconi-pip.log web# pip install . -r ./requirements.txt --upgrade --log /tmp/zaqar-pip.log
Create ``/srv/marconi`` folder to store related configuration files. Create ``/srv/zaqar`` folder to store related configuration files.
Create ``/srv/marconi/marconi_uwsgi.py`` with the following content:: Create ``/srv/zaqar/zaqar_uwsgi.py`` with the following content::
from keystoneclient.middleware import auth_token from keystoneclient.middleware import auth_token
from marconi.transport.wsgi import app from zaqar.transport.wsgi import app
app = auth_token.AuthProtocol(app.app, {}) app = auth_token.AuthProtocol(app.app, {})
Create ``/srv/marconi/uwsgi.ini`` file with the following content:: Create ``/srv/zaqar/uwsgi.ini`` file with the following content::
[uwsgi] [uwsgi]
http = 192.168.192.168:80 http = 192.168.192.168:80
daemonize = /var/log/marconi.log daemonize = /var/log/zaqar.log
pidfile = /var/run/marconi.pid pidfile = /var/run/zaqar.pid
gevent = 2000 gevent = 2000
gevent-monkey-patch = true gevent-monkey-patch = true
listen = 1024 listen = 1024
enable-threads = true enable-threads = true
module = marconi_uwsgi:app module = zaqar_uwsgi:app
workers = 4 workers = 4
The uwsgi configuration options above can be modified for different performance requirements. The uwsgi configuration options above can be modified for different performance requirements.
Create a Marconi configuration file ``/etc/marconi.conf`` with the following content:: Create a Zaqar configuration file ``/etc/zaqar.conf`` with the following content::
[DEFAULT] [DEFAULT]
# Show more verbose log output (sets INFO log level output) # Show more verbose log output (sets INFO log level output)
@ -161,7 +161,7 @@ Create a Marconi configuration file ``/etc/marconi.conf`` with the following con
admin_mode = True admin_mode = True
# Log to this file! # Log to this file!
log_file = /var/log/marconi-queues.log log_file = /var/log/zaqar-queues.log
debug = False debug = False
verbose = False verbose = False
@ -192,7 +192,7 @@ Create a Marconi configuration file ``/etc/marconi.conf`` with the following con
[drivers:storage:mongodb] [drivers:storage:mongodb]
uri = mongodb://mydb0,mydb1,mydb2:27017/?replicaSet=catalog&w=2&readPreference=secondaryPreferred uri = mongodb://mydb0,mydb1,mydb2:27017/?replicaSet=catalog&w=2&readPreference=secondaryPreferred
database = marconi database = zaqar
partitions = 8 partitions = 8
# Maximum number of times to retry a failed operation. Currently # Maximum number of times to retry a failed operation. Currently
@ -236,7 +236,7 @@ Create a Marconi configuration file ``/etc/marconi.conf`` with the following con
Start the queuing service:: Start the queuing service::
#/usr/bin/uwsgi --ini /srv/marconi/uwsgi.ini #/usr/bin/uwsgi --ini /srv/zaqar/uwsgi.ini
Configure Pools Configure Pools

2
doc/wadl/os-marconi-apiRef.wadl → doc/wadl/os-zaqar-apiRef.wadl
View File

@ -23,7 +23,7 @@
<resources base="https://queues.api.openstack.org/" <resources base="https://queues.api.openstack.org/"
xml:id="os-marconi-v1"> xml:id="os-zaqar-v1">
<resource id="version" path="{version}"> <resource id="version" path="{version}">
<!-- <remark> Project ID is now in a header, not in the URI. </remark> <!-- <remark> Project ID is now in a header, not in the URI. </remark>
<resource id="projectID" path="{projectId}"> <resource id="projectID" path="{projectId}">

20
doc/marconi-api-ref/os-marconi-apiRef.xml → doc/zaqar-api-ref/os-zaqar-apiRef.xml
View File

@ -5,7 +5,7 @@
xmlns:svg="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"
xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:m="http://www.w3.org/1998/Math/MathML"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
version="5.0" xml:id="os-marconi-apiRef"> version="5.0" xml:id="os-zaqar-apiRef">
<title>Message Queuing API v1 Reference</title> <title>Message Queuing API v1 Reference</title>
<titleabbrev>Message Queuing API Reference</titleabbrev> <titleabbrev>Message Queuing API Reference</titleabbrev>
@ -1641,7 +1641,7 @@ Content-Type: application/json
OpenStack and may change.</para> OpenStack and may change.</para>
</note> </note>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"> <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#version"> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#version">
<wadl:method href="getHomeDocument"/> <wadl:method href="getHomeDocument"/>
</wadl:resource> </wadl:resource>
</wadl:resources> </wadl:resources>
@ -1651,12 +1651,12 @@ Content-Type: application/json
<para>This section describes queue operations that are supported by the Message Queuing <para>This section describes queue operations that are supported by the Message Queuing
API.</para> API.</para>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"> <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#queues"> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#queues">
<wadl:method href="listQueues"/> <wadl:method href="listQueues"/>
</wadl:resource> </wadl:resource>
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#queue"/> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#queue"/>
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#metadata"/> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#metadata"/>
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#stats"/> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#stats"/>
</wadl:resources> </wadl:resources>
</section> </section>
<section xml:id="message-operations-dle001"> <section xml:id="message-operations-dle001">
@ -1671,8 +1671,8 @@ Content-Type: application/json
Client-ID in <xref linkend="commonHeaders"/>.</para> Client-ID in <xref linkend="commonHeaders"/>.</para>
</note> </note>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"> <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#messages"/> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#messages"/>
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#message"/> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#message"/>
</wadl:resources> </wadl:resources>
</section> </section>
<section xml:id="claims-operations-dle001"> <section xml:id="claims-operations-dle001">
@ -1680,8 +1680,8 @@ Content-Type: application/json
<para>This section describes claim operations that are supported by the Message Queuing <para>This section describes claim operations that are supported by the Message Queuing
API.</para> API.</para>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"> <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#claims"/> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#claims"/>
<wadl:resource href="../wadl/os-marconi-apiRef.wadl#claim"/> <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#claim"/>
</wadl:resources> </wadl:resources>
</section> </section>
</chapter> </chapter>

10
doc/marconi-api-ref/pom.xml → doc/zaqar-api-ref/pom.xml
View File

@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>marconi-api-ref</artifactId> <artifactId>zaqar-api-ref</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Message Queuing API v1 Reference</name> <name>Message Queuing API v1 Reference</name>
<properties> <properties>
@ -30,7 +30,7 @@
</goals> </goals>
<phase>generate-sources</phase> <phase>generate-sources</phase>
<configuration> <configuration>
<includes> os-marconi-apiRef.xml </includes> <includes> os-zaqar-apiRef.xml </includes>
<generateToc> appendix toc,title <generateToc> appendix toc,title
article/appendix nop article/appendix nop
article toc,title article toc,title
@ -42,8 +42,8 @@
qandaset toc qandaset toc
reference toc,title reference toc,title
set toc,title </generateToc> set toc,title </generateToc>
<webhelpDirname>marconi-api-ref</webhelpDirname> <webhelpDirname>zaqar-api-ref</webhelpDirname>
<pdfFilenameBase>marconi-api-ref</pdfFilenameBase> <pdfFilenameBase>zaqar-api-ref</pdfFilenameBase>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -59,7 +59,7 @@
<highlightSource>false</highlightSource> <highlightSource>false</highlightSource>
<xincludeSupported>true</xincludeSupported> <xincludeSupported>true</xincludeSupported>
<sourceDirectory>.</sourceDirectory> <sourceDirectory>.</sourceDirectory>
<canonicalUrlBase>http://docs.openstack.org/marconi-api-ref/content/</canonicalUrlBase> <canonicalUrlBase>http://docs.openstack.org/zaqar-api-ref/content/</canonicalUrlBase>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

8
doc/marconi-get-started/os-marconi-apiGettingStarted.xml → doc/zaqar-get-started/os-zaqar-apiGettingStarted.xml
View File

@ -95,7 +95,7 @@
them as the tasks are needed and performed.</para> them as the tasks are needed and performed.</para>
<para>Message Queuing handles the distribution of tasks, but it does not necessarily manage <para>Message Queuing handles the distribution of tasks, but it does not necessarily manage
the order of the tasks. Applications handle the workflow at a higher level.</para> the order of the tasks. Applications handle the workflow at a higher level.</para>
<para>Message Queuing is based on the OpenStack Marconi project.</para> <para>Message Queuing is based on the OpenStack Zaqar project.</para>
<para>This guide explains how to access and start using the API so that you can begin to use <para>This guide explains how to access and start using the API so that you can begin to use
Message Queuing for your applications. Instructions are given for how to properly enter Message Queuing for your applications. Instructions are given for how to properly enter
the necessary URLs, using cURL, to set up and use a basic set of Message Queuing the necessary URLs, using cURL, to set up and use a basic set of Message Queuing
@ -987,10 +987,10 @@ X-Project-Id: <emphasis role="bold">your_project_ID</emphasis>
<para>For more information about using the API, see the <citetitle>Message Queuing API v1 <para>For more information about using the API, see the <citetitle>Message Queuing API v1
Reference</citetitle>. All you need to get started with Message Queuing is the Reference</citetitle>. All you need to get started with Message Queuing is the
getting started guide, the reference, and your Cloud account.</para> getting started guide, the reference, and your Cloud account.</para>
<para>For information about the OpenStack Marconi API, see <para>For information about the OpenStack Zaqar API, see
<link <link
xlink:href="https://wiki.openstack.org/wiki/Marconi/specs/api/v1" xlink:href="https://wiki.openstack.org/wiki/Zaqar/specs/api/v1"
>wiki.openstack.org/wiki/Marconi/specs/api/v1</link>.</para> >wiki.openstack.org/wiki/Zaqar/specs/api/v1</link>.</para>
<para>This API uses standard HTTP 1.1 response codes as <para>This API uses standard HTTP 1.1 response codes as
documented at <link documented at <link
xlink:href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html" xlink:href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html"

10
doc/marconi-get-started/pom.xml → doc/zaqar-get-started/pom.xml
View File

@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>marconi-get-started</artifactId> <artifactId>zaqar-get-started</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Message Queuing API v1 Getting Started</name> <name>Message Queuing API v1 Getting Started</name>
<properties> <properties>
@ -31,7 +31,7 @@
<phase>generate-sources</phase> <phase>generate-sources</phase>
<configuration> <configuration>
<includes> <includes>
os-marconi-apiGettingStarted.xml </includes> os-zaqar-apiGettingStarted.xml </includes>
<generateToc> appendix toc,title <generateToc> appendix toc,title
article/appendix nop article/appendix nop
article toc,title article toc,title
@ -43,8 +43,8 @@
qandaset to qandaset to
reference toc,title reference toc,title
set toc,title </generateToc> set toc,title </generateToc>
<webhelpDirname>marconi-get-started</webhelpDirname> <webhelpDirname>zaqar-get-started</webhelpDirname>
<pdfFilenameBase>marconi-get-started</pdfFilenameBase> <pdfFilenameBase>zaqar-get-started</pdfFilenameBase>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -60,7 +60,7 @@
<highlightSource>false</highlightSource> <highlightSource>false</highlightSource>
<xincludeSupported>true</xincludeSupported> <xincludeSupported>true</xincludeSupported>
<sourceDirectory>.</sourceDirectory> <sourceDirectory>.</sourceDirectory>
<canonicalUrlBase>http://docs.openstack.org/marconi-getting-started/content/</canonicalUrlBase> <canonicalUrlBase>http://docs.openstack.org/zaqar-getting-started/content/</canonicalUrlBase>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

6
etc/logging.conf.sample
View File

@ -14,12 +14,12 @@ handlers=devel
[logger_server] [logger_server]
level=DEBUG level=DEBUG
handlers=devel handlers=devel
qualname=marconi-server qualname=zaqar-server
[logger_combined] [logger_combined]
level=DEBUG level=DEBUG
handlers=devel handlers=devel
qualname=marconi-combined qualname=zaqar-combined
[handler_production] [handler_production]
class=handlers.SysLogHandler class=handlers.SysLogHandler
@ -31,7 +31,7 @@ args=(('localhost', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER)
class=FileHandler class=FileHandler
level=DEBUG level=DEBUG
formatter=normal_with_name formatter=normal_with_name
args=('marconi.log', 'w') args=('zaqar.log', 'w')
[handler_devel] [handler_devel]
class=StreamHandler class=StreamHandler

18
etc/marconi.conf.sample
View File

@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
# #
# Options defined in marconi.transport.base # Options defined in zaqar.transport.base
# #
# Backend to use for authentication. For no auth, keep it # Backend to use for authentication. For no auth, keep it
@ -11,7 +11,7 @@
# #
# Options defined in marconi.bootstrap # Options defined in zaqar.bootstrap
# #
# Enable pooling across multiple storage backends. If # Enable pooling across multiple storage backends. If
@ -25,7 +25,7 @@
# #
# Options defined in marconi.openstack.common.lockutils # Options defined in zaqar.openstack.common.lockutils
# #
# Whether to disable inter-process locks (boolean value) # Whether to disable inter-process locks (boolean value)
@ -36,7 +36,7 @@
# #
# Options defined in marconi.openstack.common.log # Options defined in zaqar.openstack.common.log
# #
# Print debugging output (set logging level to DEBUG instead # Print debugging output (set logging level to DEBUG instead
@ -130,7 +130,7 @@
[drivers] [drivers]
# #
# Options defined in marconi.bootstrap # Options defined in zaqar.bootstrap
# #
# Transport driver to use. (string value) # Transport driver to use. (string value)
@ -143,7 +143,7 @@
[drivers:storage:mongodb] [drivers:storage:mongodb]
# #
# Options defined in marconi.storage.mongodb # Options defined in zaqar.storage.mongodb
# #
# Mongodb Connection URI. If ssl connection enabled, # Mongodb Connection URI. If ssl connection enabled,
@ -177,7 +177,7 @@
#ssl_ca_certs=<None> #ssl_ca_certs=<None>
# Database name. (string value) # Database name. (string value)
#database=marconi #database=zaqar
# Number of databases across which to partition message data, # Number of databases across which to partition message data,
# in order to reduce writer lock %. DO NOT change this setting # in order to reduce writer lock %. DO NOT change this setting
@ -216,7 +216,7 @@
[drivers:storage:sqlalchemy] [drivers:storage:sqlalchemy]
# #
# Options defined in marconi.storage.sqlalchemy # Options defined in zaqar.storage.sqlalchemy
# #
# An sqlalchemy URL (string value) # An sqlalchemy URL (string value)
@ -357,7 +357,7 @@
[pooling:catalog] [pooling:catalog]
# #
# Options defined in marconi.storage.pooling # Options defined in zaqar.storage.pooling
# #
# Catalog storage driver. (integer value) # Catalog storage driver. (integer value)

363
etc/zaqar.conf.sample Normal file
View File

@ -0,0 +1,363 @@
[DEFAULT]
#
# Options defined in zaqar.transport.base
#
# Backend to use for authentication. For no auth, keep it
# empty. Existing strategies: keystone. See also the
# keystone_authtoken section below (string value)
#auth_strategy=
#
# Options defined in zaqar.bootstrap
#
# Enable pooling across multiple storage backends. If
# pooling is enabled, the storage driver configuration is
# used to determine where the catalogue/control plane data
# is kept. (boolean value)
#pooling=false
# Activate endpoints to manage pool registry. (boolean value)
#admin_mode=false
#
# Options defined in zaqar.openstack.common.lockutils
#
# Whether to disable inter-process locks (boolean value)
#disable_process_locking=false
# Directory to use for lock files. (string value)
#lock_path=<None>
#
# Options defined in zaqar.openstack.common.log
#
# Print debugging output (set logging level to DEBUG instead
# of default WARNING level). (boolean value)
#debug=false
# Print more verbose output (set logging level to INFO instead
# of default WARNING level). (boolean value)
#verbose=false
# Log output to standard error (boolean value)
#use_stderr=true
# Format string to use for log messages with context (string
# value)
#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
# Format string to use for log messages without context
# (string value)
#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
# Data to append to log format when level is DEBUG (string
# value)
#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d
# Prefix each line of exception output with this format
# (string value)
#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
# List of logger=LEVEL pairs (list value)
#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN
# Publish error events (boolean value)
#publish_errors=false
# Make deprecations fatal (boolean value)
#fatal_deprecations=false
# If an instance is passed with the log message, format it
# like this (string value)
#instance_format="[instance: %(uuid)s] "
# If an instance UUID is passed with the log message, format
# it like this (string value)
#instance_uuid_format="[instance: %(uuid)s] "
# The name of logging configuration file. It does not disable
# existing loggers, but just appends specified logging
# configuration to any other existing logging options. Please
# see the Python logging module documentation for details on
# logging configuration files. (string value)
# Deprecated group/name - [DEFAULT]/log_config
#log_config_append=<None>
# DEPRECATED. A logging.Formatter log message format string
# which may use any of the available logging.LogRecord
# attributes. This option is deprecated. Please use
# logging_context_format_string and
# logging_default_format_string instead. (string value)
#log_format=<None>
# Format string for %%(asctime)s in log records. Default:
# %(default)s (string value)
#log_date_format=%Y-%m-%d %H:%M:%S
# (Optional) Name of log file to output to. If no default is
# set, logging will go to stdout. (string value)
# Deprecated group/name - [DEFAULT]/logfile
#log_file=<None>
# (Optional) The base directory used for relative --log-file
# paths (string value)
# Deprecated group/name - [DEFAULT]/logdir
#log_dir=<None>
# Use syslog for logging. Existing syslog format is DEPRECATED
# during I, and then will be changed in J to honor RFC5424
# (boolean value)
#use_syslog=false
# (Optional) Use syslog rfc5424 format for logging. If
# enabled, will add APP-NAME (RFC5424) before the MSG part of
# the syslog message. The old format without APP-NAME is
# deprecated in I, and will be removed in J. (boolean value)
#use_syslog_rfc_format=false
# Syslog facility to receive log lines (string value)
#syslog_log_facility=LOG_USER
[drivers]
#
# Options defined in zaqar.bootstrap
#
# Transport driver to use. (string value)
#transport=wsgi
# Storage driver to use. (string value)
#storage=sqlite
[drivers:storage:mongodb]
#
# Options defined in zaqar.storage.mongodb
#
# Mongodb Connection URI. If ssl connection enabled,
# then the following 'ssl_keyfile', 'ssl_certfile',
# 'ssl_cert_reqs', 'ssl_ca_certs' need to be set accordingly.
# (string value)
#uri=<None>
# The private keyfile used to identify the local connection
# against mongod. If included with the 'certifle' then only
# the ssl_certfile is needed. (string value)
#ssl_keyfile=<None>
# The certificate file used to identify the local connection
# against mongod. (string value)
#ssl_certfile=<None>
# Specifies whether a certificate is required from the other
# side of the connection, and whether it will be validated
# if provided. It must be one of the three values 'CERT_NONE'
# (certificates ignored), 'CERT_OPTIONAL'(not required, but
# validated if provided), or 'CERT_REQUIRED'(required and validated).
# If the value of this parameter is not 'CERT_NONE', then the
# 'ssl_ca_certs' parameter must point to a file of CA certificates.
# (string value)
#ssl_cert_reqs=CERT_REQUIRED
# The ca_certs file contains a set of concatenated certification
# authority certificates, which are used to validate certificates
# passed from the other end of the connection. (string value)
#ssl_ca_certs=<None>
# Database name. (string value)
#database=zaqar
# Number of databases across which to partition message data,
# in order to reduce writer lock %. DO NOT change this setting
# after initial deployment. It MUST remain static. Also, you
# should not need a large number of partitions to improve
# performance, esp. if deploying MongoDB on SSD storage.
# (integer value)
#partitions=2
# Maximum number of times to retry a failed operation.
# Currently only used for retrying a message post. (integer
# value)
#max_attempts=1000
# Maximum sleep interval between retries (actual sleep time
# increases linearly according to number of attempts
# performed). (floating point value)
#max_retry_sleep=0.1
# Maximum jitter interval, to be added to the sleep interval,
# in order to decrease probability that parallel requests will
# retry at the same instant. (floating point value)
#max_retry_jitter=0.005
# Maximum number of times to retry an operation that failed
# due to a primary node failover. (integer value)
#max_reconnect_attempts=10
# Base sleep interval between attempts to reconnect after a
# primary node failover. The actual sleep time increases
# exponentially (power of 2) each time the operation is
# retried. (floating point value)
#reconnect_sleep=0.02
[drivers:storage:sqlalchemy]
#
# Options defined in zaqar.storage.sqlalchemy
#
# An sqlalchemy URL (string value)
#uri=sqlite:///:memory:
[keystone_authtoken]
#
# Options defined in keystoneclient.middleware.auth_token
#
# Prefix to prepend at the beginning of the path (string
# value)
#auth_admin_prefix=
# Host providing the admin Identity API endpoint (string
# value)
#auth_host=127.0.0.1
# Port of the admin Identity API endpoint (integer value)
#auth_port=35357
# Protocol of the admin Identity API endpoint(http or https)
# (string value)
#auth_protocol=https
# Complete public Identity API endpoint (string value)
#auth_uri=<None>
# API version of the admin Identity API endpoint (string
# value)
#auth_version=<None>
# Do not handle authorization requests within the middleware,
# but delegate the authorization decision to downstream WSGI
# components (boolean value)
#delay_auth_decision=false
# Request timeout value for communicating with Identity API
# server. (boolean value)
#http_connect_timeout=<None>
# How many times are we trying to reconnect when communicating
# with Identity API Server. (integer value)
#http_request_max_retries=3
# Allows to pass in the name of a fake http_handler callback
# function used instead of httplib.HTTPConnection or
# httplib.HTTPSConnection. Useful for unit testing where
# network is not available. (string value)
#http_handler=<None>
# Single shared secret with the Keystone configuration used
# for bootstrapping a Keystone installation, or otherwise
# bypassing the normal authentication process. (string value)
#admin_token=<None>
# Keystone account username (string value)
#admin_user=<None>
# Keystone account password (string value)
#admin_password=<None>
# Keystone service account tenant name to validate user tokens
# (string value)
#admin_tenant_name=admin
# Env key for the swift cache (string value)
#cache=<None>
# Required if Keystone server requires client certificate
# (string value)
#certfile=<None>
# Required if Keystone server requires client certificate
# (string value)
#keyfile=<None>
# A PEM encoded Certificate Authority to use when verifying
# HTTPs connections. Defaults to system CAs. (string value)
#cafile=<None>
# Verify HTTPS connections. (boolean value)
#insecure=false
# Directory used to cache files related to PKI tokens (string
# value)
#signing_dir=<None>
# If defined, the memcache server(s) to use for caching (list
# value)
# Deprecated group/name - [DEFAULT]/memcache_servers
#memcached_servers=<None>
# In order to prevent excessive requests and validations, the
# middleware uses an in-memory cache for the tokens the
# Keystone API returns. This is only valid if memcache_servers
# is defined. Set to -1 to disable caching completely.
# (integer value)
#token_cache_time=300
# Value only used for unit testing (integer value)
#revocation_cache_time=1
# (optional) if defined, indicate whether token data should be
# authenticated or authenticated and encrypted. Acceptable
# values are MAC or ENCRYPT. If MAC, token data is
# authenticated (with HMAC) in the cache. If ENCRYPT, token
# data is encrypted and authenticated in the cache. If the
# value is not one of these options or empty, auth_token will
# raise an exception on initialization. (string value)
#memcache_security_strategy=<None>
# (optional, mandatory if memcache_security_strategy is
# defined) this string is used for key derivation. (string
# value)
#memcache_secret_key=<None>
# (optional) indicate whether to set the X-Service-Catalog
# header. If False, middleware will not ask for service
# catalog on token validation and will not set the X-Service-
# Catalog header. (boolean value)
#include_service_catalog=true
# Used to control the use and type of token binding. Can be
# set to: "disabled" to not check token binding. "permissive"
# (default) to validate binding information if the bind type
# is of a form known to the server and ignore it if not.
# "strict" like "permissive" but if the bind type is unknown
# the token will be rejected. "required" any form of token
# binding is needed to be allowed. Finally the name of a
# binding method that must be present in tokens. (string
# value)
#enforce_token_bind=permissive
[pooling:catalog]
#
# Options defined in zaqar.storage.pooling
#
# Catalog storage driver. (integer value)

2
openstack-common.conf
View File

@ -14,4 +14,4 @@ module=timeutils
module=version module=version
# Base module # Base module
base=marconi base=zaqar

71
setup.cfg
View File

@ -1,5 +1,5 @@
[metadata] [metadata]
name = marconi name = zaqar
# Juno # Juno
version = 2014.2 version = 2014.2
@ -23,7 +23,7 @@ classifier =
[files] [files]
packages = packages =
marconi zaqar
[build_sphinx] [build_sphinx]
all_files = 1 all_files = 1
@ -32,41 +32,42 @@ source-dir = doc/source
[entry_points] [entry_points]
console_scripts = console_scripts =
marconi-bench-pc = marconi.bench.conductor:main zaqar-bench-pc = zaqar.bench.conductor:main
marconi-server = marconi.cmd.server:run zaqar-server = zaqar.cmd.server:run
marconi-server = zaqar.cmd.server:run
marconi.queues.data.storage = zaqar.queues.data.storage =
# NOTE(flaper87): sqlite points to sqla for backwards compatibility # NOTE(flaper87): sqlite points to sqla for backwards compatibility
sqlite = marconi.queues.storage.sqlalchemy.driver:DataDriver sqlite = zaqar.queues.storage.sqlalchemy.driver:DataDriver
sqlalchemy = marconi.queues.storage.sqlalchemy.driver:DataDriver sqlalchemy = zaqar.queues.storage.sqlalchemy.driver:DataDriver
mongodb = marconi.queues.storage.mongodb.driver:DataDriver mongodb = zaqar.queues.storage.mongodb.driver:DataDriver
faulty = marconi.tests.faulty_storage:DataDriver faulty = zaqar.tests.faulty_storage:DataDriver
marconi.queues.control.storage = zaqar.queues.control.storage =
sqlite = marconi.queues.storage.sqlalchemy.driver:ControlDriver sqlite = zaqar.queues.storage.sqlalchemy.driver:ControlDriver
sqlalchemy = marconi.queues.storage.sqlalchemy.driver:ControlDriver sqlalchemy = zaqar.queues.storage.sqlalchemy.driver:ControlDriver
mongodb = marconi.queues.storage.mongodb.driver:ControlDriver mongodb = zaqar.queues.storage.mongodb.driver:ControlDriver
faulty = marconi.tests.faulty_storage:ControlDriver faulty = zaqar.tests.faulty_storage:ControlDriver
marconi.queues.transport = zaqar.queues.transport =
wsgi = marconi.queues.transport.wsgi.driver:Driver wsgi = zaqar.queues.transport.wsgi.driver:Driver
marconi.openstack.common.cache.backends = zaqar.openstack.common.cache.backends =
memory = marconi.openstack.common.cache._backends.memory:MemoryBackend memory = zaqar.openstack.common.cache._backends.memory:MemoryBackend
oslo.config.opts = oslo.config.opts =
marconi.bootstrap = marconi.queues.bootstrap:_config_options zaqar.bootstrap = zaqar.queues.bootstrap:_config_options
marconi.storage.base = marconi.queues.storage.base:_config_options zaqar.storage.base = zaqar.queues.storage.base:_config_options
marconi.storage.pipeline = marconi.queues.storage.pipeline:_config_options zaqar.storage.pipeline = zaqar.queues.storage.pipeline:_config_options
marconi.storage.pooling = marconi.queues.storage.pooling:_config_options zaqar.storage.pooling = zaqar.queues.storage.pooling:_config_options
marconi.storage.mongodb = marconi.queues.storage.mongodb.options:_config_options zaqar.storage.mongodb = zaqar.queues.storage.mongodb.options:_config_options
# NOTE(flaper87): sqlite points to sqla for backwards compatibility # NOTE(flaper87): sqlite points to sqla for backwards compatibility
marconi.storage.sqlite = marconi.queues.storage.sqlalchemy.options:_config_options zaqar.storage.sqlite = zaqar.queues.storage.sqlalchemy.options:_config_options
marconi.storage.sqlalchemy = marconi.queues.storage.sqlalchemy.options:_config_options zaqar.storage.sqlalchemy = zaqar.queues.storage.sqlalchemy.options:_config_options
marconi.transport.wsgi = marconi.queues.transport.wsgi.v1_0.driver:_config_options zaqar.transport.wsgi = zaqar.queues.transport.wsgi.v1_0.driver:_config_options
marconi.transport.base = marconi.queues.transport.base:_config_options zaqar.transport.base = zaqar.queues.transport.base:_config_options
marconi.transport.validation = marconi.queues.transport.validation:_config_options zaqar.transport.validation = zaqar.queues.transport.validation:_config_options
[nosetests] [nosetests]
where=tests where=tests
@ -74,7 +75,7 @@ verbosity=2
with-doctest = true with-doctest = true
cover-package = marconi cover-package = zaqar
cover-html = true cover-html = true
cover-erase = true cover-erase = true
cover-inclusive = true cover-inclusive = true
@ -93,15 +94,15 @@ cover-inclusive = true
warnerrors = True warnerrors = True
[compile_catalog] [compile_catalog]
directory = marconi/locale directory = zaqar/locale
domain = marconi domain = zaqar
[update_catalog] [update_catalog]
domain = marconi domain = zaqar
output_dir = marconi/locale output_dir = zaqar/locale
input_file = marconi/locale/marconi.pot input_file = zaqar/locale/zaqar.pot
[extract_messages] [extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg mapping_file = babel.cfg
output_file = marconi/locale/marconi.pot output_file = zaqar/locale/zaqar.pot

6
tests/__init__.py
View File

@ -17,7 +17,7 @@ import os
tests_dir = os.path.abspath(os.path.dirname(__file__)) tests_dir = os.path.abspath(os.path.dirname(__file__))
os.environ.setdefault("MARCONI_TESTS_DIR", tests_dir) os.environ.setdefault("ZAQAR_TESTS_DIR", tests_dir)
if "MARCONI_TESTS_CONFIGS_DIR" not in os.environ: if "ZAQAR_TESTS_CONFIGS_DIR" not in os.environ:
os.environ["MARCONI_TESTS_CONFIGS_DIR"] = os.path.join(tests_dir, "etc") os.environ["ZAQAR_TESTS_CONFIGS_DIR"] = os.path.join(tests_dir, "etc")

4
tests/etc/functional-tests.conf
View File

@ -7,10 +7,10 @@
# username = None # username = None
# password = None # password = None
[marconi] [zaqar]
# run_server = True # run_server = True
# url = http://0.0.0.0:8888 # url = http://0.0.0.0:8888
# config = functional-marconi.conf # config = functional-zaqar.conf
[headers] [headers]
# useragent = FunctionalTests # useragent = FunctionalTests

2
tests/etc/functional-marconi.conf → tests/etc/functional-zaqar.conf
View File

@ -6,7 +6,7 @@ verbose = True
debug = True debug = True
# Log to this file! # Log to this file!
; log_file = /var/log/marconi/server.log ; log_file = /var/log/zaqar/server.log
;auth_strategy = ;auth_strategy =

2
tests/etc/wsgi_mongodb.conf
View File

@ -11,6 +11,6 @@ port = 8888
[drivers:storage:mongodb] [drivers:storage:mongodb]
uri = mongodb://127.0.0.1:27017 uri = mongodb://127.0.0.1:27017
database = marconi_test database = zaqar_test
max_reconnect_attempts = 3 max_reconnect_attempts = 3
reconnect_sleep = 0.001 reconnect_sleep = 0.001

2
tests/etc/wsgi_mongodb_pooled.conf
View File

@ -7,4 +7,4 @@ storage = mongodb
[drivers:storage:mongodb] [drivers:storage:mongodb]
uri = mongodb://127.0.0.1:27017 uri = mongodb://127.0.0.1:27017
database = marconi_test database = zaqar_test

18
tests/functional/README.rst
View File

@ -1,7 +1,7 @@
Marconi Functional Tests Zaqar Functional Tests
==================== ======================
Marconi's functional tests treat Marconi as a black box. In other Zaqar's functional tests treat Zaqar as a black box. In other
words, the API calls attempt to simulate an actual user. Unlike unit tests, words, the API calls attempt to simulate an actual user. Unlike unit tests,
the functional tests do not use mockendpoints. the functional tests do not use mockendpoints.
@ -9,10 +9,10 @@ the functional tests do not use mockendpoints.
Running functional tests (With Tox) Running functional tests (With Tox)
----------------------------------- -----------------------------------
#. Setup a Marconi server. Refer to the Marconi `README`_ on #. Setup a Zaqar server. Refer to the Zaqar `README`_ on
how to run Marconi locally, or simply use an existing server. how to run Zaqar locally, or simply use an existing server.
#. Change `$MARCONI_TESTS_CONFIGS_DIR/functional-tests.conf` and #. Change `$ZAQAR_TESTS_CONFIGS_DIR/functional-tests.conf` and
set `run_tests` to True. set `run_tests` to True.
#. Run tests. :: #. Run tests. ::
@ -30,8 +30,8 @@ Running functional tests (With Tox)
Running the Functional Tests (Without Tox) Running the Functional Tests (Without Tox)
------------------------------------------ ------------------------------------------
#. Setup a Marconi server. Refer to the Marconi `README`_ on #. Setup a Zaqar server. Refer to the Zaqar `README`_ on
how to run Marconi locally, or simply use an existing server. how to run Zaqar locally, or simply use an existing server.
#. Install functional tests dependencies. :: #. Install functional tests dependencies. ::
@ -58,5 +58,5 @@ Adding New Tests
messages/test_messages.py messages/test_messages.py
claim/test_claims.py claim/test_claims.py
.. _README : https://github.com/openstack/marconi/blob/master/README.rst .. _README : https://github.com/openstack/zaqar/blob/master/README.rst
.. _requests : https://pypi.python.org/pypi/requests .. _requests : https://pypi.python.org/pypi/requests

20
tests/functional/wsgi/v1/test_claims.py
View File

@ -17,22 +17,22 @@ import uuid
import ddt import ddt
from marconi.tests.functional import base from zaqar.tests.functional import base
from marconi.tests.functional import helpers from zaqar.tests.functional import helpers
@ddt.ddt @ddt.ddt
class TestClaims(base.V1FunctionalTestBase): class TestClaims(base.V1FunctionalTestBase):
"""Tests for Claims.""" """Tests for Claims."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestClaims, self).setUp() super(TestClaims, self).setUp()
self.queue = uuid.uuid1() self.queue = uuid.uuid1()
self.queue_url = ("{url}/{version}/queues/{queue}".format( self.queue_url = ("{url}/{version}/queues/{queue}".format(
url=self.cfg.marconi.url, url=self.cfg.zaqar.url,
version="v1", version="v1",
queue=self.queue)) queue=self.queue))
@ -81,7 +81,7 @@ class TestClaims(base.V1FunctionalTestBase):
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -93,7 +93,7 @@ class TestClaims(base.V1FunctionalTestBase):
def test_claim_more_than_allowed(self): def test_claim_more_than_allowed(self):
"""Claim more than max allowed per request. """Claim more than max allowed per request.
Marconi allows a maximum of 20 messages per claim by default. Zaqar allows a maximum of 20 messages per claim by default.
""" """
params = {"limit": self.limits.max_messages_per_claim_or_pop + 1} params = {"limit": self.limits.max_messages_per_claim_or_pop + 1}
doc = {"ttl": 300, "grace": 100} doc = {"ttl": 300, "grace": 100}
@ -113,7 +113,7 @@ class TestClaims(base.V1FunctionalTestBase):
# Patch Claim # Patch Claim
claim_location = result.headers['Location'] claim_location = result.headers['Location']
url = self.cfg.marconi.url + claim_location url = self.cfg.zaqar.url + claim_location
doc_updated = {"ttl": 300} doc_updated = {"ttl": 300}
result = self.client.patch(url, data=doc_updated) result = self.client.patch(url, data=doc_updated)
@ -137,7 +137,7 @@ class TestClaims(base.V1FunctionalTestBase):
# Delete Claimed Messages # Delete Claimed Messages
for rst in result.json(): for rst in result.json():
href = rst['href'] href = rst['href']
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -152,7 +152,7 @@ class TestClaims(base.V1FunctionalTestBase):
# Extract claim location and construct the claim URL. # Extract claim location and construct the claim URL.
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
# Release Claim. # Release Claim.
result = self.client.delete(url) result = self.client.delete(url)
@ -219,7 +219,7 @@ class TestClaims(base.V1FunctionalTestBase):
# Extract claim location and construct the claim URL. # Extract claim location and construct the claim URL.
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
# Patch Claim. # Patch Claim.
doc = {"ttl": ttl} doc = {"ttl": ttl}

24
tests/functional/wsgi/v1/test_messages.py
View File

@ -19,8 +19,8 @@ import uuid
import ddt import ddt
from marconi.tests.functional import base from zaqar.tests.functional import base
from marconi.tests.functional import helpers from zaqar.tests.functional import helpers
@ddt.ddt @ddt.ddt
@ -28,14 +28,14 @@ class TestMessages(base.V1FunctionalTestBase):
"""Tests for Messages.""" """Tests for Messages."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestMessages, self).setUp() super(TestMessages, self).setUp()
self.queue = uuid.uuid1() self.queue = uuid.uuid1()
self.queue_url = ("{url}/{version}/queues/{queue}".format( self.queue_url = ("{url}/{version}/queues/{queue}".format(
url=self.cfg.marconi.url, url=self.cfg.zaqar.url,
version="v1", version="v1",
queue=self.queue)) queue=self.queue))
@ -76,7 +76,7 @@ class TestMessages(base.V1FunctionalTestBase):
# GET on posted message # GET on posted message
href = result.json()['resources'][0] href = result.json()['resources'][0]
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -116,7 +116,7 @@ class TestMessages(base.V1FunctionalTestBase):
# GET on posted messages # GET on posted messages
location = result.headers['location'] location = result.headers['location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -168,7 +168,7 @@ class TestMessages(base.V1FunctionalTestBase):
self.assertSchema(result.json(), 'message_list') self.assertSchema(result.json(), 'message_list')
href = result.json()['links'][0]['href'] href = result.json()['links'][0]['href']
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -183,7 +183,7 @@ class TestMessages(base.V1FunctionalTestBase):
# Delete posted message # Delete posted message
href = result.json()['resources'][0] href = result.json()['resources'][0]
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -202,7 +202,7 @@ class TestMessages(base.V1FunctionalTestBase):
# Delete posted messages # Delete posted messages
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -229,7 +229,7 @@ class TestMessages(base.V1FunctionalTestBase):
# Delete posted message # Delete posted message
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
url += ',nonexisting' url += ',nonexisting'
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -245,7 +245,7 @@ class TestMessages(base.V1FunctionalTestBase):
# Get posted message and a nonexisting message # Get posted message and a nonexisting message
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
url += ',nonexisting' url += ',nonexisting'
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -343,7 +343,7 @@ class TestMessages(base.V1FunctionalTestBase):
"""Get messages with invalid client id.""" """Get messages with invalid client id."""
url = self.message_url url = self.message_url
header = helpers.create_marconi_headers(self.cfg) header = helpers.create_zaqar_headers(self.cfg)
header['Client-ID'] = client_id header['Client-ID'] = client_id
result = self.client.get(url, headers=header) result = self.client.get(url, headers=header)

28
tests/functional/wsgi/v1/test_queues.py
View File

@ -19,8 +19,8 @@ import uuid
import ddt import ddt
import six import six
from marconi.tests.functional import base # noqa from zaqar.tests.functional import base # noqa
from marconi.tests.functional import helpers from zaqar.tests.functional import helpers
class NamedBinaryStr(six.binary_type): class NamedBinaryStr(six.binary_type):
@ -72,17 +72,17 @@ class TestInsertQueue(base.V1FunctionalTestBase):
"""Tests for Insert queue.""" """Tests for Insert queue."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestInsertQueue, self).setUp() super(TestInsertQueue, self).setUp()
self.base_url = '{0}/{1}'.format(self.cfg.marconi.url, self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url,
"v1") "v1")
self.header = helpers.create_marconi_headers(self.cfg) self.header = helpers.create_zaqar_headers(self.cfg)
self.headers_response_empty = set(['location']) self.headers_response_empty = set(['location'])
self.client.set_base_url(self.base_url) self.client.set_base_url(self.base_url)
self.header = helpers.create_marconi_headers(self.cfg) self.header = helpers.create_zaqar_headers(self.cfg)
@ddt.data('qtestqueue', 'TESTqueue', 'hyphen-name', '_undersore', @ddt.data('qtestqueue', 'TESTqueue', 'hyphen-name', '_undersore',
annotated('test_insert_queue_long_name', 'i' * 64)) annotated('test_insert_queue_long_name', 'i' * 64))
@ -193,12 +193,12 @@ class TestQueueMetaData(base.V1FunctionalTestBase):
"""Tests for queue metadata.""" """Tests for queue metadata."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestQueueMetaData, self).setUp() super(TestQueueMetaData, self).setUp()
self.base_url = '{0}/{1}'.format(self.cfg.marconi.url, self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url,
"v1") "v1")
self.queue_url = self.base_url + '/queues/{0}'.format(uuid.uuid1()) self.queue_url = self.base_url + '/queues/{0}'.format(uuid.uuid1())
@ -256,12 +256,12 @@ class TestQueueMetaData(base.V1FunctionalTestBase):
@ddt.ddt @ddt.ddt
class TestQueueMisc(base.V1FunctionalTestBase): class TestQueueMisc(base.V1FunctionalTestBase):
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestQueueMisc, self).setUp() super(TestQueueMisc, self).setUp()
self.base_url = self.cfg.marconi.url self.base_url = self.cfg.zaqar.url
self.client.set_base_url(self.base_url) self.client.set_base_url(self.base_url)
self.queue_url = (self.base_url + '/{0}/queues/{1}' self.queue_url = (self.base_url + '/{0}/queues/{1}'
@ -409,19 +409,19 @@ class TestQueueNonExisting(base.V1FunctionalTestBase):
"""Test Actions on non existing queue.""" """Test Actions on non existing queue."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestQueueNonExisting, self).setUp() super(TestQueueNonExisting, self).setUp()
self.base_url = '{0}/{1}'.format(self.cfg.marconi.url, "v1") self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url, "v1")
self.queue_url = (self.base_url + self.queue_url = (self.base_url +
'/queues/0a5b1b85-4263-11e3-b034-28cfe91478b9') '/queues/0a5b1b85-4263-11e3-b034-28cfe91478b9')
self.client.set_base_url(self.queue_url) self.client.set_base_url(self.queue_url)
self.header = helpers.create_marconi_headers(self.cfg) self.header = helpers.create_zaqar_headers(self.cfg)
self.headers_response_empty = set(['location']) self.headers_response_empty = set(['location'])
self.header = helpers.create_marconi_headers(self.cfg) self.header = helpers.create_zaqar_headers(self.cfg)
def test_get_queue(self): def test_get_queue(self):
"""Get non existing Queue.""" """Get non existing Queue."""

24
tests/functional/wsgi/v1_1/test_claims.py
View File

@ -17,25 +17,25 @@ import uuid
import ddt import ddt
from marconi.tests.functional import base from zaqar.tests.functional import base
from marconi.tests.functional import helpers from zaqar.tests.functional import helpers
@ddt.ddt @ddt.ddt
class TestClaims(base.V1_1FunctionalTestBase): class TestClaims(base.V1_1FunctionalTestBase):
"""Tests for Claims.""" """Tests for Claims."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestClaims, self).setUp() super(TestClaims, self).setUp()
self.headers = helpers.create_marconi_headers(self.cfg) self.headers = helpers.create_zaqar_headers(self.cfg)
self.client.headers = self.headers self.client.headers = self.headers
self.queue = uuid.uuid1() self.queue = uuid.uuid1()
self.queue_url = ("{url}/{version}/queues/{queue}".format( self.queue_url = ("{url}/{version}/queues/{queue}".format(
url=self.cfg.marconi.url, url=self.cfg.zaqar.url,
version="v1.1", version="v1.1",
queue=self.queue)) queue=self.queue))
@ -79,7 +79,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
result = self.client.post(params=params, data=doc) result = self.client.post(params=params, data=doc)
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -96,7 +96,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -109,7 +109,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
def test_claim_more_than_allowed(self): def test_claim_more_than_allowed(self):
"""Claim more than max allowed per request. """Claim more than max allowed per request.
Marconi allows a maximum of 20 messages per claim by default. Zaqar allows a maximum of 20 messages per claim by default.
""" """
params = {"limit": self.limits.max_messages_per_claim_or_pop + 1} params = {"limit": self.limits.max_messages_per_claim_or_pop + 1}
doc = {"ttl": 300, "grace": 100} doc = {"ttl": 300, "grace": 100}
@ -129,7 +129,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
# Patch Claim # Patch Claim
claim_location = result.headers['Location'] claim_location = result.headers['Location']
url = self.cfg.marconi.url + claim_location url = self.cfg.zaqar.url + claim_location
doc_updated = {"ttl": 300} doc_updated = {"ttl": 300}
result = self.client.patch(url, data=doc_updated) result = self.client.patch(url, data=doc_updated)
@ -153,7 +153,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
# Delete Claimed Messages # Delete Claimed Messages
for rst in result.json(): for rst in result.json():
href = rst['href'] href = rst['href']
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -168,7 +168,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
# Extract claim location and construct the claim URL. # Extract claim location and construct the claim URL.
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
# Release Claim. # Release Claim.
result = self.client.delete(url) result = self.client.delete(url)
@ -235,7 +235,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
# Extract claim location and construct the claim URL. # Extract claim location and construct the claim URL.
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
# Patch Claim. # Patch Claim.
doc = {"ttl": ttl} doc = {"ttl": ttl}

30
tests/functional/wsgi/v1_1/test_messages.py
View File

@ -19,26 +19,26 @@ import uuid
import ddt import ddt
from marconi.tests.functional import base from zaqar.tests.functional import base
from marconi.tests.functional import helpers from zaqar.tests.functional import helpers
@ddt.ddt @ddt.ddt
class TestMessages(base.V1_1FunctionalTestBase): class TestMessages(base.V1_1FunctionalTestBase):
"""Message Tests Specific to V1.1.""" """Message Tests Specific to V1.1."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestMessages, self).setUp() super(TestMessages, self).setUp()
self.queue = uuid.uuid1() # Generate a random queue ID self.queue = uuid.uuid1() # Generate a random queue ID
self.queue_url = ("{url}/{version}/queues/{queue}".format( self.queue_url = ("{url}/{version}/queues/{queue}".format(
url=self.cfg.marconi.url, url=self.cfg.zaqar.url,
version="v1.1", version="v1.1",
queue=self.queue)) queue=self.queue))
self.headers = helpers.create_marconi_headers(self.cfg) self.headers = helpers.create_zaqar_headers(self.cfg)
self.client.headers = self.headers self.client.headers = self.headers
self.client.put(self.queue_url) # Create the queue self.client.put(self.queue_url) # Create the queue
@ -78,7 +78,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
# GET on posted message # GET on posted message
href = result.json()['resources'][0] href = result.json()['resources'][0]
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -118,7 +118,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
# GET on posted messages # GET on posted messages
location = result.headers['location'] location = result.headers['location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -151,7 +151,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
# GET on posted message # GET on posted message
href = result.json()['resources'][0] href = result.json()['resources'][0]
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -193,7 +193,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
self.assertMessageCount(actual_msg_count, expected_msg_count) self.assertMessageCount(actual_msg_count, expected_msg_count)
href = result.json()['links'][0]['href'] href = result.json()['links'][0]['href']
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -208,7 +208,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
# Delete posted message # Delete posted message
href = result.json()['resources'][0] href = result.json()['resources'][0]
url = self.cfg.marconi.url + href url = self.cfg.zaqar.url + href
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -227,7 +227,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
# Delete posted messages # Delete posted messages
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -254,7 +254,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
# Delete posted message # Delete posted message
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
url += ',nonexisting' url += ',nonexisting'
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 204) self.assertEqual(result.status_code, 204)
@ -319,7 +319,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
location = result.headers['Location'] location = result.headers['Location']
# Pop messages # Pop messages
url = self.cfg.marconi.url + location + '&pop=1' url = self.cfg.zaqar.url + location + '&pop=1'
result = self.client.delete(url) result = self.client.delete(url)
self.assertEqual(result.status_code, 400) self.assertEqual(result.status_code, 400)
@ -381,7 +381,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
# Get posted message and a nonexisting message # Get posted message and a nonexisting message
location = result.headers['Location'] location = result.headers['Location']
url = self.cfg.marconi.url + location url = self.cfg.zaqar.url + location
url += ',nonexisting' url += ',nonexisting'
result = self.client.get(url) result = self.client.get(url)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
@ -480,7 +480,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
"""Get messages with invalid client id.""" """Get messages with invalid client id."""
url = self.message_url url = self.message_url
header = helpers.create_marconi_headers(self.cfg) header = helpers.create_zaqar_headers(self.cfg)
header['Client-ID'] = client_id header['Client-ID'] = client_id
result = self.client.get(url, headers=header) result = self.client.get(url, headers=header)

12
tests/functional/wsgi/v1_1/test_pools.py
View File

@ -14,27 +14,27 @@
# limitations under the License. # limitations under the License.
import ddt import ddt
from marconi.tests.functional import base from zaqar.tests.functional import base
from marconi.tests.functional import helpers from zaqar.tests.functional import helpers
@ddt.ddt @ddt.ddt
class TestPools(base.V1_1FunctionalTestBase): class TestPools(base.V1_1FunctionalTestBase):
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestPools, self).setUp() super(TestPools, self).setUp()
self.pool_url = ("{url}/{version}/pools".format( self.pool_url = ("{url}/{version}/pools".format(
url=self.cfg.marconi.url, url=self.cfg.zaqar.url,
version="v1.1" version="v1.1"
)) ))
self.cfg.marconi.version = "v1.1" self.cfg.zaqar.version = "v1.1"
self.skipTest("NOT IMPLEMENTED") self.skipTest("NOT IMPLEMENTED")
self.headers = helpers.create_marconi_headers(self.cfg) self.headers = helpers.create_zaqar_headers(self.cfg)
self.client.headers = self.headers self.client.headers = self.headers
self.client.set_base_url(self.pool_url) self.client.set_base_url(self.pool_url)

22
tests/functional/wsgi/v1_1/test_queues.py
View File

@ -19,8 +19,8 @@ import uuid
import ddt import ddt
import six import six
from marconi.tests.functional import base # noqa from zaqar.tests.functional import base # noqa
from marconi.tests.functional import helpers from zaqar.tests.functional import helpers
class NamedBinaryStr(six.binary_type): class NamedBinaryStr(six.binary_type):
@ -72,14 +72,14 @@ class TestInsertQueue(base.V1_1FunctionalTestBase):
"""Tests for Insert queue.""" """Tests for Insert queue."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestInsertQueue, self).setUp() super(TestInsertQueue, self).setUp()
self.base_url = '{0}/{1}'.format(self.cfg.marconi.url, self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url,
"v1.1") "v1.1")
self.header = helpers.create_marconi_headers(self.cfg) self.header = helpers.create_zaqar_headers(self.cfg)
self.headers_response_empty = set(['location']) self.headers_response_empty = set(['location'])
self.client.set_base_url(self.base_url) self.client.set_base_url(self.base_url)
self.client.headers = self.header self.client.headers = self.header
@ -182,11 +182,11 @@ class TestInsertQueue(base.V1_1FunctionalTestBase):
@ddt.ddt @ddt.ddt
class TestQueueMisc(base.V1_1FunctionalTestBase): class TestQueueMisc(base.V1_1FunctionalTestBase):
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestQueueMisc, self).setUp() super(TestQueueMisc, self).setUp()
self.base_url = self.cfg.marconi.url self.base_url = self.cfg.zaqar.url
self.client.set_base_url(self.base_url) self.client.set_base_url(self.base_url)
self.queue_url = self.base_url + ('/{0}/queues/{1}' self.queue_url = self.base_url + ('/{0}/queues/{1}'
@ -324,22 +324,22 @@ class TestQueueNonExisting(base.V1_1FunctionalTestBase):
"""Test Actions on non existing queue.""" """Test Actions on non existing queue."""
server_class = base.MarconiServer server_class = base.ZaqarServer
def setUp(self): def setUp(self):
super(TestQueueNonExisting, self).setUp() super(TestQueueNonExisting, self).setUp()
if self.cfg.version != "v1": if self.cfg.version != "v1":
self.skipTest("Not Supported") self.skipTest("Not Supported")
self.base_url = '{0}/{1}'.format(self.cfg.marconi.url, self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url,
"v1.1") "v1.1")
self.queue_url = (self.base_url + self.queue_url = (self.base_url +
'/queues/0a5b1b85-4263-11e3-b034-28cfe91478b9') '/queues/0a5b1b85-4263-11e3-b034-28cfe91478b9')
self.client.set_base_url(self.queue_url) self.client.set_base_url(self.queue_url)
self.header = helpers.create_marconi_headers(self.cfg) self.header = helpers.create_zaqar_headers(self.cfg)
self.headers_response_empty = set(['location']) self.headers_response_empty = set(['location'])
self.header = helpers.create_marconi_headers(self.cfg) self.header = helpers.create_zaqar_headers(self.cfg)
def test_get_stats(self): def test_get_stats(self):
"""Get stats on non existing Queue.""" """Get stats on non existing Queue."""

2
tests/unit/common/storage/test_select.py
View File

@ -15,7 +15,7 @@
import testtools import testtools
from marconi.common.storage import select from zaqar.common.storage import select
class TestSelect(testtools.TestCase): class TestSelect(testtools.TestCase):

4
tests/unit/common/storage/test_utils.py
View File

@ -15,8 +15,8 @@
import ddt import ddt
from marconi.queues.storage import utils from zaqar.queues.storage import utils
from marconi import tests as testing from zaqar import tests as testing
@ddt.ddt @ddt.ddt

6
tests/unit/common/test_api.py
View File

@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from marconi.common import api from zaqar.common import api
from marconi.common import errors from zaqar.common import errors
from marconi.tests import base from zaqar.tests import base
class FakeApi(api.Api): class FakeApi(api.Api):

6
tests/unit/common/test_decorators.py
View File

@ -16,9 +16,9 @@
import msgpack import msgpack
from oslo.config import cfg from oslo.config import cfg
from marconi.common import decorators from zaqar.common import decorators
from marconi.openstack.common.cache import cache as oslo_cache from zaqar.openstack.common.cache import cache as oslo_cache
from marconi.tests import base from zaqar.tests import base
class TestDecorators(base.TestBase): class TestDecorators(base.TestBase):

4
tests/unit/common/test_pipeline.py
View File

@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from marconi.common import pipeline from zaqar.common import pipeline
from marconi.tests import base from zaqar.tests import base
class FirstClass(object): class FirstClass(object):

4
tests/unit/common/test_request.py
View File

@ -15,8 +15,8 @@
# limitations under the License. # limitations under the License.
from marconi.common import request from zaqar.common import request
from marconi.tests import base from zaqar.tests import base
class TestRequest(base.TestBase): class TestRequest(base.TestBase):

24
tests/unit/queues/storage/test_impl_mongodb.py
View File

@ -24,17 +24,17 @@ import pymongo.errors
import six import six
from testtools import matchers from testtools import matchers
from marconi.openstack.common.cache import cache as oslo_cache from zaqar.openstack.common.cache import cache as oslo_cache
from marconi.openstack.common import timeutils from zaqar.openstack.common import timeutils
from marconi.queues import storage from zaqar.queues import storage
from marconi.queues.storage import errors from zaqar.queues.storage import errors
from marconi.queues.storage import mongodb from zaqar.queues.storage import mongodb
from marconi.queues.storage.mongodb import controllers from zaqar.queues.storage.mongodb import controllers
from marconi.queues.storage.mongodb import options from zaqar.queues.storage.mongodb import options
from marconi.queues.storage.mongodb import utils from zaqar.queues.storage.mongodb import utils
from marconi.queues.storage import pooling from zaqar.queues.storage import pooling
from marconi import tests as testing from zaqar import tests as testing
from marconi.tests.queues.storage import base from zaqar.tests.queues.storage import base
class MongodbSetupMixin(object): class MongodbSetupMixin(object):
@ -258,7 +258,7 @@ class MongodbMessageTests(MongodbSetupMixin, base.MessageControllerTest):
self.assertIsNone(unchanged) self.assertIsNone(unchanged)
now = timeutils.utcnow() + datetime.timedelta(seconds=10) now = timeutils.utcnow() + datetime.timedelta(seconds=10)
timeutils_utcnow = 'marconi.openstack.common.timeutils.utcnow' timeutils_utcnow = 'zaqar.openstack.common.timeutils.utcnow'
with mock.patch(timeutils_utcnow) as mock_utcnow: with mock.patch(timeutils_utcnow) as mock_utcnow:
mock_utcnow.return_value = now mock_utcnow.return_value = now
changed = self.queue_controller._inc_counter(queue_name, changed = self.queue_controller._inc_counter(queue_name,

16
tests/unit/queues/storage/test_impl_sqlalchemy.py
View File

@ -16,13 +16,13 @@ import datetime
import sqlalchemy as sa import sqlalchemy as sa
from marconi.queues.storage import pooling from zaqar.queues.storage import pooling
from marconi.queues.storage import sqlalchemy from zaqar.queues.storage import sqlalchemy
from marconi.queues.storage.sqlalchemy import controllers from zaqar.queues.storage.sqlalchemy import controllers
from marconi.queues.storage.sqlalchemy import tables from zaqar.queues.storage.sqlalchemy import tables
from marconi.queues.storage.sqlalchemy import utils from zaqar.queues.storage.sqlalchemy import utils
from marconi import tests as testing from zaqar import tests as testing
from marconi.tests.queues.storage import base from zaqar.tests.queues.storage import base
class SqlalchemyTableTests(testing.TestBase): class SqlalchemyTableTests(testing.TestBase):
@ -34,7 +34,7 @@ class SqlalchemyTableTests(testing.TestBase):
def test_table_queries(self): def test_table_queries(self):
self.engine.execute(tables.Queues.insert(), id=1, project='test', self.engine.execute(tables.Queues.insert(), id=1, project='test',
name='marconi', metadata=utils.json_encode('aaaa')) name='zaqar', metadata=utils.json_encode('aaaa'))
self.engine.execute(tables.Messages.insert(), id=1, qid=1, ttl=10, self.engine.execute(tables.Messages.insert(), id=1, qid=1, ttl=10,
body=utils.json_encode('bbbb'), client='a', body=utils.json_encode('bbbb'), client='a',
created=datetime.datetime.now()) created=datetime.datetime.now())

10
tests/unit/queues/storage/test_pool_catalog.py
View File

@ -16,11 +16,11 @@ import uuid
from oslo.config import cfg from oslo.config import cfg
from marconi.openstack.common.cache import cache as oslo_cache from zaqar.openstack.common.cache import cache as oslo_cache
from marconi.queues.storage import pooling from zaqar.queues.storage import pooling
from marconi.queues.storage import sqlalchemy from zaqar.queues.storage import sqlalchemy
from marconi.queues.storage import utils from zaqar.queues.storage import utils
from marconi import tests as testing from zaqar import tests as testing
# TODO(cpp-cabrera): it would be wonderful to refactor this unit test # TODO(cpp-cabrera): it would be wonderful to refactor this unit test

8
tests/unit/queues/storage/test_pool_queues.py
View File

@ -18,10 +18,10 @@ import uuid
from oslo.config import cfg from oslo.config import cfg
import six import six
from marconi.openstack.common.cache import cache as oslo_cache from zaqar.openstack.common.cache import cache as oslo_cache
from marconi.queues.storage import pooling from zaqar.queues.storage import pooling
from marconi.queues.storage import utils from zaqar.queues.storage import utils
from marconi import tests as testing from zaqar import tests as testing
@testing.requires_mongodb @testing.requires_mongodb

4
tests/unit/queues/transport/test_auth.py
View File

@ -17,8 +17,8 @@
from oslo.config import cfg from oslo.config import cfg
from marconi.queues.transport import auth from zaqar.queues.transport import auth
from marconi import tests as testing from zaqar import tests as testing
class TestTransportAuth(testing.TestBase): class TestTransportAuth(testing.TestBase):

2
tests/unit/queues/transport/wsgi/test_utils.py
View File

@ -19,7 +19,7 @@ import falcon
import six import six
import testtools import testtools
from marconi.queues.transport.wsgi import utils from zaqar.queues.transport.wsgi import utils
class TestUtils(testtools.TestCase): class TestUtils(testtools.TestCase):

4
tests/unit/queues/transport/wsgi/test_v1_0.py
View File

@ -14,8 +14,8 @@
import falcon import falcon
from marconi.tests.queues.transport.wsgi import base from zaqar.tests.queues.transport.wsgi import base
from marconi.tests.queues.transport.wsgi import v1 from zaqar.tests.queues.transport.wsgi import v1
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------

6
tests/unit/queues/transport/wsgi/test_v1_1.py
View File

@ -16,9 +16,9 @@ import uuid
import ddt import ddt
import falcon import falcon
from marconi.openstack.common import jsonutils from zaqar.openstack.common import jsonutils
from marconi.tests.queues.transport.wsgi import base from zaqar.tests.queues.transport.wsgi import base
from marconi.tests.queues.transport.wsgi import v1_1 from zaqar.tests.queues.transport.wsgi import v1_1
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Identical or just minor variations across versions # Identical or just minor variations across versions

14
tests/unit/test_bootstrap.py
View File

@ -13,13 +13,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from marconi.common import errors from zaqar.common import errors
from marconi.queues import bootstrap from zaqar.queues import bootstrap
from marconi.queues.storage import pipeline from zaqar.queues.storage import pipeline
from marconi.queues.storage import pooling from zaqar.queues.storage import pooling
from marconi.queues.storage import sqlalchemy from zaqar.queues.storage import sqlalchemy
from marconi.queues.transport import wsgi from zaqar.queues.transport import wsgi
from marconi.tests import base from zaqar.tests import base
class TestBootstrap(base.TestBase): class TestBootstrap(base.TestBase):

8
tests/unit/test_version.py
View File

@ -14,8 +14,8 @@
import pbr.packaging import pbr.packaging
import marconi import zaqar
from marconi import tests as testing from zaqar import tests as testing
class TestVersion(testing.TestBase): class TestVersion(testing.TestBase):
@ -31,7 +31,7 @@ class TestVersion(testing.TestBase):
self.skipTest('The git version string does not contain a hash') self.skipTest('The git version string does not contain a hash')
sha_abbrev = commit[1:] sha_abbrev = commit[1:]
self.assertTrue(marconi.version.verify_sha(sha_abbrev)) self.assertTrue(zaqar.version.verify_sha(sha_abbrev))
sha_abbrev_bad = 'x' + sha_abbrev[1:] sha_abbrev_bad = 'x' + sha_abbrev[1:]
self.assertFalse(marconi.version.verify_sha(sha_abbrev_bad)) self.assertFalse(zaqar.version.verify_sha(sha_abbrev_bad))

2
tools/config/check_uptodate.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PROJECT_NAME=${PROJECT_NAME:-marconi} PROJECT_NAME=${PROJECT_NAME:-zaqar}
CFGFILE_NAME=${PROJECT_NAME}.conf.sample CFGFILE_NAME=${PROJECT_NAME}.conf.sample
if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then

2
tools/config/generate_sample.sh
View File

@ -107,7 +107,7 @@ export EVENTLET_NO_GREENDNS=yes
OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs) OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs)
[ "$OS_VARS" ] && eval "unset \$OS_VARS" [ "$OS_VARS" ] && eval "unset \$OS_VARS"
DEFAULT_MODULEPATH=marconi.openstack.common.config.generator DEFAULT_MODULEPATH=zaqar.openstack.common.config.generator
MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH} MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH}
OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample
python -m $MODULEPATH $MODULES $LIBRARIES $FILES > $OUTPUTFILE python -m $MODULEPATH $MODULES $LIBRARIES $FILES > $OUTPUTFILE

18
tools/config/oslo.config.generator.rc
View File

@ -1,11 +1,11 @@
export OSLO_CONFIG_GENERATOR_EXTRA_MODULES="keystoneclient.middleware.auth_token" export OSLO_CONFIG_GENERATOR_EXTRA_MODULES="keystoneclient.middleware.auth_token"
export OSLO_CONFIG_GENERATOR_EXTRA_LIBRARIES="marconi.bootstrap export OSLO_CONFIG_GENERATOR_EXTRA_LIBRARIES="zaqar.bootstrap
marconi.storage.base zaqar.storage.base
marconi.storage.pipeline zaqar.storage.pipeline
marconi.storage.pooling zaqar.storage.pooling
marconi.storage.mongodb zaqar.storage.mongodb
marconi.storage.sqlalchemy zaqar.storage.sqlalchemy
marconi.transport.wsgi zaqar.transport.wsgi
marconi.transport.base zaqar.transport.base
marconi.transport.validation" zaqar.transport.validation"

6
tox.ini
View File

@ -8,8 +8,8 @@ usedevelop = True
# Customize pip command, add -U to force updates. # Customize pip command, add -U to force updates.
install_command = pip install -U {opts} {packages} install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
MARCONI_TESTS_DIR={toxinidir}/tests ZAQAR_TESTS_DIR={toxinidir}/tests
MARCONI_TESTS_CONFIGS_DIR={toxinidir}/tests/etc/ ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/tests/etc/
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -42,5 +42,5 @@ commands = python setup.py build_sphinx
exclude = .venv*,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*.egg,.update-venv exclude = .venv*,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*.egg,.update-venv
[hacking] [hacking]
import_exceptions = marconi.openstack.common.gettextutils._,marconi.i18n._ import_exceptions = zaqar.openstack.common.gettextutils._,zaqar.i18n._

8
marconi/__init__.py → zaqar/__init__.py
View File

@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import marconi.queues.bootstrap import zaqar.queues.bootstrap
import marconi.version import zaqar.version
Bootstrap = marconi.queues.bootstrap.Bootstrap Bootstrap = zaqar.queues.bootstrap.Bootstrap
__version__ = marconi.version.version_info.cached_version_string() __version__ = zaqar.version.version_info.cached_version_string()

14
marconi/bench/README.rst → zaqar/bench/README.rst
View File

@ -1,4 +1,4 @@
Marconi Benchmarking Zaqar Benchmarking
==================== ====================
Structure Structure
@ -12,7 +12,7 @@ claiming and deleting them.
Need of the Benchmark Need of the Benchmark
--------------------- ---------------------
Marconi is a performance oriented API. Any changes made need to performance tested, and this tool Zaqar is a performance oriented API. Any changes made need to performance tested, and this tool
helps by a being quick way to test that. helps by a being quick way to test that.
Setup Setup
@ -21,16 +21,16 @@ Benchmark dependencies need to be pip installed::
pip install -r bench-requirements.txt pip install -r bench-requirements.txt
Make sure you have a running instance of Marconi after following `README`_ for Make sure you have a running instance of Zaqar after following `README`_ for
setting up Marconi running at port 8888:: setting up Zaqar running at port 8888::
Export an environment variable called MESSAGES_PATH and set it to the path of messages.json Export an environment variable called MESSAGES_PATH and set it to the path of messages.json
in marconi/bench in zaqar/bench
Note: This allows benchmarking with different set of messages rather than those specified in Note: This allows benchmarking with different set of messages rather than those specified in
messages.json messages.json
$ marconi-bench-pc -p {Number of Processes} -w {Number of Workers} -t {Duration in Seconds} $ zaqar-bench-pc -p {Number of Processes} -w {Number of Workers} -t {Duration in Seconds}
.. _`README` : https://github.com/openstack/marconi/blob/master/README.rst .. _`README` : https://github.com/openstack/zaqar/blob/master/README.rst

0
marconi/bench/__init__.py → zaqar/bench/__init__.py
View File

2
marconi/bench/cli_config.py → zaqar/bench/cli_config.py
View File

@ -30,4 +30,4 @@ _CLI_OPTIONS = (
cfg.IntOpt('time', short='t', default=3, help="time in seconds"), cfg.IntOpt('time', short='t', default=3, help="time in seconds"),
) )
conf.register_cli_opts(_CLI_OPTIONS) conf.register_cli_opts(_CLI_OPTIONS)
conf(project='marconi', prog='marconi-queues') conf(project='zaqar', prog='zaqar-queues')

4
marconi/bench/conductor.py → zaqar/bench/conductor.py
View File

@ -16,8 +16,8 @@ from __future__ import print_function
import multiprocessing as mp import multiprocessing as mp
from marconi.bench import consumer from zaqar.bench import consumer
from marconi.bench import producer from zaqar.bench import producer
def main(): def main():

6
marconi/bench/consumer.py → zaqar/bench/consumer.py
View File

@ -20,11 +20,11 @@ import time
from gevent import monkey as curious_george from gevent import monkey as curious_george
curious_george.patch_all(thread=False, select=False) curious_george.patch_all(thread=False, select=False)
import gevent import gevent
from marconiclient.queues.v1 import client
from marconiclient.transport.errors import TransportError
import marktime import marktime
from zaqarclient.queues.v1 import client
from zaqarclient.transport.errors import TransportError
from marconi.bench.cli_config import conf from zaqar.bench.cli_config import conf
URL = 'http://localhost:8888' URL = 'http://localhost:8888'
QUEUE_PREFIX = 'ogre-test-queue-' QUEUE_PREFIX = 'ogre-test-queue-'

0
marconi/bench/messages.json → zaqar/bench/messages.json
View File

6
marconi/bench/producer.py → zaqar/bench/producer.py
View File

@ -24,11 +24,11 @@ import time
from gevent import monkey as curious_george from gevent import monkey as curious_george
curious_george.patch_all(thread=False, select=False) curious_george.patch_all(thread=False, select=False)
import gevent import gevent
from marconiclient.queues.v1 import client
from marconiclient.transport.errors import TransportError
import marktime import marktime
from zaqarclient.queues.v1 import client
from zaqarclient.transport.errors import TransportError
from marconi.bench.cli_config import conf from zaqar.bench.cli_config import conf
# TODO(TheSriram): Make configurable # TODO(TheSriram): Make configurable

0
marconi/cmd/__init__.py → zaqar/cmd/__init__.py
View File

14
marconi/cmd/server.py → zaqar/cmd/server.py
View File

@ -16,8 +16,8 @@ import os
from oslo.config import cfg from oslo.config import cfg
from marconi.common import cli from zaqar.common import cli
from marconi.queues import bootstrap from zaqar.queues import bootstrap
@cli.runnable @cli.runnable
@ -26,17 +26,17 @@ def run():
# to pick up common options from openstack.common.log, since # to pick up common options from openstack.common.log, since
# that module uses the global CONF instance exclusively. # that module uses the global CONF instance exclusively.
conf = cfg.CONF conf = cfg.CONF
conf(project='marconi', prog='marconi-queues') conf(project='zaqar', prog='zaqar-queues')
server = bootstrap.Bootstrap(conf) server = bootstrap.Bootstrap(conf)
# The following code is to daemonize marconi-server to avoid # The following code is to daemonize zaqar-server to avoid
# an issue with wsgiref writing to stdout/stderr when we don't # an issue with wsgiref writing to stdout/stderr when we don't
# want it to. This is specifically needed to allow marconi to # want it to. This is specifically needed to allow zaqar to
# run under devstack, but it may also be useful for other scenarios. # run under devstack, but it may also be useful for other scenarios.
# Open /dev/zero and /dev/null for redirection. # Open /dev/zero and /dev/null for redirection.
# Daemonizing marconi-server is needed *just* when running under devstack # Daemonizing zaqar-server is needed *just* when running under devstack
# and when marconi is invoked with `daemon` command line option. # and when zaqar is invoked with `daemon` command line option.
if conf.daemon: if conf.daemon:
zerofd = os.open('/dev/zero', os.O_RDONLY) zerofd = os.open('/dev/zero', os.O_RDONLY)
nullfd = os.open('/dev/null', os.O_WRONLY) nullfd = os.open('/dev/null', os.O_WRONLY)

4
marconi/common/__init__.py → zaqar/common/__init__.py
View File

@ -11,8 +11,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
"""Code common to Marconi""" """Code common to Zaqar"""
from marconi.common import pipeline from zaqar.common import pipeline
Pipeline = pipeline.Pipeline Pipeline = pipeline.Pipeline

0
marconi/common/access.py → zaqar/common/access.py
View File

6
marconi/common/api.py → zaqar/common/api.py
View File

@ -16,9 +16,9 @@
import jsonschema import jsonschema
from jsonschema import validators from jsonschema import validators
from marconi.common import errors from zaqar.common import errors
from marconi.i18n import _ from zaqar.i18n import _
from marconi.openstack.common import log from zaqar.openstack.common import log
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

6
marconi/common/cli.py → zaqar/common/cli.py
View File

@ -16,8 +16,8 @@ from __future__ import print_function
import functools import functools
import sys import sys
from marconi.i18n import _ from zaqar.i18n import _
from marconi.openstack.common import log as logging from zaqar.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -44,7 +44,7 @@ def runnable(func):
@functools.wraps(func) @functools.wraps(func)
def _wrapper(): def _wrapper():
try: try:
logging.setup('marconi') logging.setup('zaqar')
func() func()
except KeyboardInterrupt: except KeyboardInterrupt:
LOG.info(_(u'Terminating')) LOG.info(_(u'Terminating'))

2
marconi/common/decorators.py → zaqar/common/decorators.py
View File

@ -17,7 +17,7 @@ import functools
import msgpack import msgpack
import marconi.openstack.common.log as logging import zaqar.openstack.common.log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

0
marconi/common/errors.py → zaqar/common/errors.py
View File

6
marconi/common/pipeline.py → zaqar/common/pipeline.py
View File

@ -33,9 +33,9 @@ import contextlib
import six import six
from marconi.common import decorators from zaqar.common import decorators
from marconi.i18n import _ from zaqar.i18n import _
import marconi.openstack.common.log as logging import zaqar.openstack.common.log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

4
marconi/common/request.py → zaqar/common/request.py
View File

@ -16,11 +16,11 @@
import json import json
from marconi.common import decorators from zaqar.common import decorators
class Request(object): class Request(object):
"""General data for a Marconi request """General data for a Zaqar request
Transport will generate a request object and send to this the API to be Transport will generate a request object and send to this the API to be
processed. processed.

6
marconi/common/response.py → zaqar/common/response.py
View File

@ -15,14 +15,14 @@
class Response(object): class Response(object):
"""Common response class for Marconi. """Common response class for Zaqar.
All `marconi.transport.base.Transport` implementations All `zaqar.transport.base.Transport` implementations
will return this to the higher level API which will then build will return this to the higher level API which will then build
an object out of it. an object out of it.
:param request: The request sent to the server. :param request: The request sent to the server.
:type: `marconi.transport.request.Request` :type: `zaqar.transport.request.Request`
:param content: Response's content :param content: Response's content
:type: `six.string_types` :type: `six.string_types`
:param headers: Optional headers returned in the response. :param headers: Optional headers returned in the response.

0
marconi/common/schemas/__init__.py → zaqar/common/schemas/__init__.py
View File

2
marconi/common/schemas/pools.py → zaqar/common/schemas/pools.py
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
"""pools: JSON schema for marconi-queues pools resources.""" """pools: JSON schema for zaqar-queues pools resources."""
# NOTE(cpp-cabrera): options can be anything. These will be unique to # NOTE(cpp-cabrera): options can be anything. These will be unique to
# each storage driver, so we don't perform any further validation at # each storage driver, so we don't perform any further validation at

0
marconi/common/storage/__init__.py → zaqar/common/storage/__init__.py
View File

0
marconi/common/storage/select.py → zaqar/common/storage/select.py
View File

0
marconi/common/transport/__init__.py → zaqar/common/transport/__init__.py
View File

0
marconi/common/transport/wsgi/__init__.py → zaqar/common/transport/wsgi/__init__.py
View File

6
marconi/common/transport/wsgi/helpers.py → zaqar/common/transport/wsgi/helpers.py
View File

@ -18,9 +18,9 @@
import falcon import falcon
import six import six
from marconi.i18n import _ from zaqar.i18n import _
import marconi.openstack.common.log as logging import zaqar.openstack.common.log as logging
from marconi.queues.transport import validation from zaqar.queues.transport import validation
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

6
marconi/common/transport/wsgi/utils.py → zaqar/common/transport/wsgi/utils.py
View File

@ -17,9 +17,9 @@
import jsonschema import jsonschema
from marconi.openstack.common import log from zaqar.openstack.common import log
from marconi.queues.transport import utils as json_utils from zaqar.queues.transport import utils as json_utils
from marconi.queues.transport.wsgi import errors as wsgi_errors from zaqar.queues.transport.wsgi import errors as wsgi_errors
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

0
marconi/common/utils.py → zaqar/common/utils.py
View File

2
marconi/i18n.py → zaqar/i18n.py
View File

@ -15,7 +15,7 @@
from oslo.i18n import * # noqa from oslo.i18n import * # noqa
_translators = TranslatorFactory(domain='marconi') _translators = TranslatorFactory(domain='zaqar')
# The primary translation function using the well-known name "_" # The primary translation function using the well-known name "_"
_ = _translators.primary _ = _translators.primary

4
marconi/locale/pt_BR/LC_MESSAGES/marconi-log-critical.po → zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-critical.po
View File

@ -6,13 +6,13 @@
# Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Marconi\n" "Project-Id-Version: Zaqar\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-17 06:07+0000\n" "POT-Creation-Date: 2014-07-17 06:07+0000\n"
"PO-Revision-Date: 2014-07-05 23:41+0000\n" "PO-Revision-Date: 2014-07-05 23:41+0000\n"
"Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n" "Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"marconi/language/pt_BR/)\n" "zaqar/language/pt_BR/)\n"
"Language: pt_BR\n" "Language: pt_BR\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"

14
marconi/locale/pt_BR/LC_MESSAGES/marconi-log-error.po → zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-error.po
View File

@ -1,18 +1,18 @@
# Translations template for marconi. # Translations template for zaqar.
# Copyright (C) 2014 ORGANIZATION # Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the marconi project. # This file is distributed under the same license as the zaqar project.
# #
# Translators: # Translators:
# Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Marconi\n" "Project-Id-Version: Zaqar\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-17 06:07+0000\n" "POT-Creation-Date: 2014-07-17 06:07+0000\n"
"PO-Revision-Date: 2014-07-05 23:52+0000\n" "PO-Revision-Date: 2014-07-05 23:52+0000\n"
"Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n" "Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"marconi/language/pt_BR/)\n" "zaqar/language/pt_BR/)\n"
"Language: pt_BR\n" "Language: pt_BR\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -20,17 +20,17 @@ msgstr ""
"Generated-By: Babel 1.3\n" "Generated-By: Babel 1.3\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: marconi/openstack/common/excutils.py:76 #: zaqar/openstack/common/excutils.py:76
#, python-format #, python-format
msgid "Original exception being dropped: %s" msgid "Original exception being dropped: %s"
msgstr "Exceção original sendo cancelada: %s" msgstr "Exceção original sendo cancelada: %s"
#: marconi/openstack/common/excutils.py:105 #: zaqar/openstack/common/excutils.py:105
#, python-format #, python-format
msgid "Unexpected exception occurred %d time(s)... retrying." msgid "Unexpected exception occurred %d time(s)... retrying."
msgstr "Exceção não esperada ocorreu %d vez(es)... tentando novamente." msgstr "Exceção não esperada ocorreu %d vez(es)... tentando novamente."
#: marconi/openstack/common/lockutils.py:120 #: zaqar/openstack/common/lockutils.py:120
#, python-format #, python-format
msgid "Could not release the acquired lock `%s`" msgid "Could not release the acquired lock `%s`"
msgstr "Não foi possível liberar o bloqueio `%s`" msgstr "Não foi possível liberar o bloqueio `%s`"

12
marconi/locale/pt_BR/LC_MESSAGES/marconi-log-info.po → zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-info.po
View File

@ -1,18 +1,18 @@
# Translations template for marconi. # Translations template for zaqar.
# Copyright (C) 2014 ORGANIZATION # Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the marconi project. # This file is distributed under the same license as the zaqar project.
# #
# Translators: # Translators:
# Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Marconi\n" "Project-Id-Version: Zaqar\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-17 06:07+0000\n" "POT-Creation-Date: 2014-07-17 06:07+0000\n"
"PO-Revision-Date: 2014-07-06 00:00+0000\n" "PO-Revision-Date: 2014-07-06 00:00+0000\n"
"Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n" "Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"marconi/language/pt_BR/)\n" "zaqar/language/pt_BR/)\n"
"Language: pt_BR\n" "Language: pt_BR\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -20,12 +20,12 @@ msgstr ""
"Generated-By: Babel 1.3\n" "Generated-By: Babel 1.3\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: marconi/openstack/common/lockutils.py:83 #: zaqar/openstack/common/lockutils.py:83
#, python-format #, python-format
msgid "Created lock path: %s" msgid "Created lock path: %s"
msgstr "Caminho do bloqueio criado: %s" msgstr "Caminho do bloqueio criado: %s"
#: marconi/openstack/common/lockutils.py:250 #: zaqar/openstack/common/lockutils.py:250
#, python-format #, python-format
msgid "Failed to remove file %(file)s" msgid "Failed to remove file %(file)s"
msgstr "Erro ao remover o arquivo %(file)s" msgstr "Erro ao remover o arquivo %(file)s"

4
marconi/locale/pt_BR/LC_MESSAGES/marconi-log-warning.po → zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-warning.po
View File

@ -6,13 +6,13 @@
# Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Marconi\n" "Project-Id-Version: Zaqar\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-17 06:07+0000\n" "POT-Creation-Date: 2014-07-17 06:07+0000\n"
"PO-Revision-Date: 2014-07-06 00:00+0000\n" "PO-Revision-Date: 2014-07-06 00:00+0000\n"
"Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n" "Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"marconi/language/pt_BR/)\n" "zaqar/language/pt_BR/)\n"
"Language: pt_BR\n" "Language: pt_BR\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"

198
marconi/locale/pt_BR/LC_MESSAGES/marconi.po → zaqar/locale/pt_BR/LC_MESSAGES/zaqar.po
View File

@ -1,43 +1,43 @@
# Portuguese (Brazil) translations for marconi. # Portuguese (Brazil) translations for zaqar.
# Copyright (C) 2014 ORGANIZATION # Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the marconi project. # This file is distributed under the same license as the zaqar project.
# #
# Translators: # Translators:
# Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Marconi\n" "Project-Id-Version: Zaqar\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-24 06:07+0000\n" "POT-Creation-Date: 2014-07-24 06:07+0000\n"
"PO-Revision-Date: 2014-07-24 02:21+0000\n" "PO-Revision-Date: 2014-07-24 02:21+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n" "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Portuguese (Brazil) " "Language-Team: Portuguese (Brazil) "
"(http://www.transifex.com/projects/p/marconi/language/pt_BR/)\n" "(http://www.transifex.com/projects/p/zaqar/language/pt_BR/)\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n" "Generated-By: Babel 1.3\n"
#: marconi/common/api.py:48 #: zaqar/common/api.py:48
msgid "{0} is not a valid operation" msgid "{0} is not a valid operation"
msgstr "{0} não é uma operação válida" msgstr "{0} não é uma operação válida"
#: marconi/common/cli.py:50 #: zaqar/common/cli.py:50
msgid "Terminating" msgid "Terminating"
msgstr "Finalizando" msgstr "Finalizando"
#: marconi/common/pipeline.py:94 #: zaqar/common/pipeline.py:94
#, python-format #, python-format
msgid "Stage %(stage)s does not implement %(method)s" msgid "Stage %(stage)s does not implement %(method)s"
msgstr "O estágio %(stage)s não implementa o método %(method)s" msgstr "O estágio %(stage)s não implementa o método %(method)s"
#: marconi/common/pipeline.py:108 #: zaqar/common/pipeline.py:108
#, python-format #, python-format
msgid "Method %s not found in any of the registered stages" msgid "Method %s not found in any of the registered stages"
msgstr "O método %s não foi encontrado em nenhum dos estágios registrados" msgstr "O método %s não foi encontrado em nenhum dos estágios registrados"
#: marconi/common/transport/wsgi/helpers.py:45 #: zaqar/common/transport/wsgi/helpers.py:45
msgid "" msgid ""
"\n" "\n"
"X-PROJECT-ID cannot be an empty string. Specify the right header X" "X-PROJECT-ID cannot be an empty string. Specify the right header X"
@ -49,21 +49,21 @@ msgstr ""
"-PROJECT-ID\n" "-PROJECT-ID\n"
"e tente novemente." "e tente novemente."
#: marconi/common/transport/wsgi/helpers.py:86 #: zaqar/common/transport/wsgi/helpers.py:86
msgid "Invalid queue identification" msgid "Invalid queue identification"
msgstr "Identificação de fila inválida" msgstr "Identificação de fila inválida"
#: marconi/common/transport/wsgi/helpers.py:87 #: zaqar/common/transport/wsgi/helpers.py:87
msgid "The format of the submitted queue name or project id is not valid." msgid "The format of the submitted queue name or project id is not valid."
msgstr "" msgstr ""
"O formato do nome da fila submetida ou o identificador do projeto não é " "O formato do nome da fila submetida ou o identificador do projeto não é "
"válido." "válido."
#: marconi/openstack/common/gettextutils.py:320 #: zaqar/openstack/common/gettextutils.py:320
msgid "Message objects do not support addition." msgid "Message objects do not support addition."
msgstr "Objetos mensagem não suportam adição." msgstr "Objetos mensagem não suportam adição."
#: marconi/openstack/common/gettextutils.py:330 #: zaqar/openstack/common/gettextutils.py:330
msgid "" msgid ""
"Message objects do not support str() because they may contain non-ascii " "Message objects do not support str() because they may contain non-ascii "
"characters. Please use unicode() or translate() instead." "characters. Please use unicode() or translate() instead."
@ -71,47 +71,47 @@ msgstr ""
"Objetos mensagem não suportam str() pois podem conter carácteres " "Objetos mensagem não suportam str() pois podem conter carácteres "
"não-ascii. Use unicode() ou translate()." "não-ascii. Use unicode() ou translate()."
#: marconi/openstack/common/lockutils.py:102 #: zaqar/openstack/common/lockutils.py:102
#, python-format #, python-format
msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s" msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s"
msgstr "Não foi possível bloquear o arquivo ` %(filename)s` devido a %(exception)s" msgstr "Não foi possível bloquear o arquivo ` %(filename)s` devido a %(exception)s"
#: marconi/openstack/common/log.py:327 #: zaqar/openstack/common/log.py:327
#, python-format #, python-format
msgid "Deprecated: %s" msgid "Deprecated: %s"
msgstr "Obsoleto: %s" msgstr "Obsoleto: %s"
#: marconi/openstack/common/log.py:436 #: zaqar/openstack/common/log.py:436
#, python-format #, python-format
msgid "Error loading logging config %(log_config)s: %(err_msg)s" msgid "Error loading logging config %(log_config)s: %(err_msg)s"
msgstr "Erro ao carregar configuração %(log_config)s: %(err_msg)s" msgstr "Erro ao carregar configuração %(log_config)s: %(err_msg)s"
#: marconi/openstack/common/log.py:487 #: zaqar/openstack/common/log.py:487
#, python-format #, python-format
msgid "syslog facility must be one of: %s" msgid "syslog facility must be one of: %s"
msgstr "O recurso de syslog deve ser um dos seguintes: %s" msgstr "O recurso de syslog deve ser um dos seguintes: %s"
#: marconi/openstack/common/log.py:725 #: zaqar/openstack/common/log.py:725
#, python-format #, python-format
msgid "Fatal call to deprecated config: %(msg)s" msgid "Fatal call to deprecated config: %(msg)s"
msgstr "Chamada fatal de configuração obsoleta: %(msg)s" msgstr "Chamada fatal de configuração obsoleta: %(msg)s"
#: marconi/openstack/common/strutils.py:92 #: zaqar/openstack/common/strutils.py:92
#, python-format #, python-format
msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
msgstr "Valor não reconhecido '%(val)s', os valores aceitáveis são: %(acceptable)s" msgstr "Valor não reconhecido '%(val)s', os valores aceitáveis são: %(acceptable)s"
#: marconi/openstack/common/strutils.py:197 #: zaqar/openstack/common/strutils.py:197
#, python-format #, python-format
msgid "Invalid unit system: \"%s\"" msgid "Invalid unit system: \"%s\""
msgstr "Unidade inválida do sistema: \"%s\"" msgstr "Unidade inválida do sistema: \"%s\""
#: marconi/openstack/common/strutils.py:206 #: zaqar/openstack/common/strutils.py:206
#, python-format #, python-format
msgid "Invalid string format: %s" msgid "Invalid string format: %s"
msgstr "Formato de string inválido: %s" msgstr "Formato de string inválido: %s"
#: marconi/queues/storage/pipeline.py:30 #: zaqar/queues/storage/pipeline.py:30
msgid "" msgid ""
"Pipeline to use for processing {0} operations. This pipeline will be " "Pipeline to use for processing {0} operations. This pipeline will be "
"consumed before calling the storage driver's controller methods, which " "consumed before calling the storage driver's controller methods, which "
@ -121,12 +121,12 @@ msgstr ""
" antes de chamar os métodos de controle do driver de armazenamento, que " " antes de chamar os métodos de controle do driver de armazenamento, que "
"sempre será adicionado a essa pipeline." "sempre será adicionado a essa pipeline."
#: marconi/queues/storage/pipeline.py:78 #: zaqar/queues/storage/pipeline.py:78
#, python-format #, python-format
msgid "Stage %(stage)d could not be imported: %(ex)s" msgid "Stage %(stage)d could not be imported: %(ex)s"
msgstr "O estágio %(stage)d não pode ser importado: %(ex)s" msgstr "O estágio %(stage)d não pode ser importado: %(ex)s"
#: marconi/queues/storage/mongodb/messages.py:546 #: zaqar/queues/storage/mongodb/messages.py:546
#, python-format #, python-format
msgid "" msgid ""
"%(attempts)d attempt(s) required to post %(num_messages)d messages to " "%(attempts)d attempt(s) required to post %(num_messages)d messages to "
@ -135,7 +135,7 @@ msgstr ""
"%(attempts)d tentativa(s) necessária(s) para enviar %(num_messages)d " "%(attempts)d tentativa(s) necessária(s) para enviar %(num_messages)d "
"mensagens para a fila \"%(queue)s\" do projeto %(project)s" "mensagens para a fila \"%(queue)s\" do projeto %(project)s"
#: marconi/queues/storage/mongodb/messages.py:590 #: zaqar/queues/storage/mongodb/messages.py:590
#, python-format #, python-format
msgid "" msgid ""
"First attempt failed while adding messages to queue \"%(queue)s\" under " "First attempt failed while adding messages to queue \"%(queue)s\" under "
@ -144,7 +144,7 @@ msgstr ""
"Primeira tentativa falhou durante a adição de mensagens à fila " "Primeira tentativa falhou durante a adição de mensagens à fila "
"\"%(queue)s\" do projeto %(project)s" "\"%(queue)s\" do projeto %(project)s"
#: marconi/queues/storage/mongodb/messages.py:604 #: zaqar/queues/storage/mongodb/messages.py:604
#, python-format #, python-format
msgid "" msgid ""
"Exceeded maximum retry duration for queue \"%(queue)s\" under project " "Exceeded maximum retry duration for queue \"%(queue)s\" under project "
@ -153,7 +153,7 @@ msgstr ""
"Excedido o tempo máximo de tentativas para a fila \"%(queue)s\" do " "Excedido o tempo máximo de tentativas para a fila \"%(queue)s\" do "
"projeto %(project)s" "projeto %(project)s"
#: marconi/queues/storage/mongodb/messages.py:664 #: zaqar/queues/storage/mongodb/messages.py:664
#, python-format #, python-format
msgid "" msgid ""
"Hit maximum number of attempts (%(max)s) for queue \"%(queue)s\" under " "Hit maximum number of attempts (%(max)s) for queue \"%(queue)s\" under "
@ -162,7 +162,7 @@ msgstr ""
"Excedido o número máximo de tentativas (%(max)s) para a fila " "Excedido o número máximo de tentativas (%(max)s) para a fila "
"\"%(queue)s\" do projeto %(project)s" "\"%(queue)s\" do projeto %(project)s"
#: marconi/queues/storage/mongodb/queues.py:177 #: zaqar/queues/storage/mongodb/queues.py:177
#, python-format #, python-format
msgid "" msgid ""
"Failed to increment the message counter for queue %(name)s and project " "Failed to increment the message counter for queue %(name)s and project "
@ -171,25 +171,25 @@ msgstr ""
"Falha ao incrementar o contador de mensagens para a fila %(name)s e " "Falha ao incrementar o contador de mensagens para a fila %(name)s e "
"projeto %(project)s" "projeto %(project)s"
#: marconi/queues/storage/mongodb/utils.py:290 #: zaqar/queues/storage/mongodb/utils.py:290
msgid "Caught AutoReconnect, retrying the call to {0}" msgid "Caught AutoReconnect, retrying the call to {0}"
msgstr "Exceção AutoReconnect capturada, tentando chamar {0} novamente" msgstr "Exceção AutoReconnect capturada, tentando chamar {0} novamente"
#: marconi/queues/storage/mongodb/utils.py:296 #: zaqar/queues/storage/mongodb/utils.py:296
msgid "Caught AutoReconnect, maximum attempts to {0} exceeded." msgid "Caught AutoReconnect, maximum attempts to {0} exceeded."
msgstr "" msgstr ""
"Exceção AutoReconnect capturada, número máximo de tentativas para {0} " "Exceção AutoReconnect capturada, número máximo de tentativas para {0} "
"excedido." "excedido."
#: marconi/queues/transport/validation.py:97 #: zaqar/queues/transport/validation.py:97
msgid "Project ids may not be more than {0} characters long." msgid "Project ids may not be more than {0} characters long."
msgstr "Identificadores de projeto não devem ter mais de {0} carácteres." msgstr "Identificadores de projeto não devem ter mais de {0} carácteres."
#: marconi/queues/transport/validation.py:101 #: zaqar/queues/transport/validation.py:101
msgid "Queue names may not be more than {0} characters long." msgid "Queue names may not be more than {0} characters long."
msgstr "Nomes de filas não devem ter mais de {0} carácteres." msgstr "Nomes de filas não devem ter mais de {0} carácteres."
#: marconi/queues/transport/validation.py:106 #: zaqar/queues/transport/validation.py:106
msgid "" msgid ""
"Queue names may only contain ASCII letters, digits, underscores, and " "Queue names may only contain ASCII letters, digits, underscores, and "
"dashes." "dashes."
@ -197,23 +197,23 @@ msgstr ""
"O nome de uma fila deve conter apenas letras ASCII, números, subtraços e " "O nome de uma fila deve conter apenas letras ASCII, números, subtraços e "
"traços." "traços."
#: marconi/queues/transport/validation.py:119 #: zaqar/queues/transport/validation.py:119
msgid "Limit must be at least 1 and no greater than {0}." msgid "Limit must be at least 1 and no greater than {0}."
msgstr "O limite deve ser no mínimo 1 e não deve ser superior a {0}." msgstr "O limite deve ser no mínimo 1 e não deve ser superior a {0}."
#: marconi/queues/transport/validation.py:131 #: zaqar/queues/transport/validation.py:131
msgid "Queue metadata is too large. Max size: {0}" msgid "Queue metadata is too large. Max size: {0}"
msgstr "Os métadados da fila são muito grandes. Tamanho máximo: {0}" msgstr "Os métadados da fila são muito grandes. Tamanho máximo: {0}"
#: marconi/queues/transport/validation.py:143 #: zaqar/queues/transport/validation.py:143
msgid "No messages to enqueu." msgid "No messages to enqueu."
msgstr "Não foi possível adicionar mensagens à fila." msgstr "Não foi possível adicionar mensagens à fila."
#: marconi/queues/transport/validation.py:158 #: zaqar/queues/transport/validation.py:158
msgid "Message collection size is too large. Max size {0}" msgid "Message collection size is too large. Max size {0}"
msgstr "O tamanho da coleção de mensagens é muito grande. O tamnho máximo é {0}" msgstr "O tamanho da coleção de mensagens é muito grande. O tamnho máximo é {0}"
#: marconi/queues/transport/validation.py:167 #: zaqar/queues/transport/validation.py:167
msgid "" msgid ""
"The TTL for a message may not exceed {0} seconds, and must be at least " "The TTL for a message may not exceed {0} seconds, and must be at least "
"{1} seconds long." "{1} seconds long."
@ -221,30 +221,30 @@ msgstr ""
"O tempo de vida de uma mensagem não pode exceder {0} segundos e não deve " "O tempo de vida de uma mensagem não pode exceder {0} segundos e não deve "
"ser menor que {1} segundos." "ser menor que {1} segundos."
#: marconi/queues/transport/validation.py:183 #: zaqar/queues/transport/validation.py:183
#: marconi/queues/transport/validation.py:239 #: zaqar/queues/transport/validation.py:239
msgid "Limit must be at least 1 and may not be greater than {0}." msgid "Limit must be at least 1 and may not be greater than {0}."
msgstr "O limite deve ser de no mínimo 1 e não deve exceder {0}." msgstr "O limite deve ser de no mínimo 1 e não deve exceder {0}."
#: marconi/queues/transport/validation.py:201 #: zaqar/queues/transport/validation.py:201
msgid "pop and id params cannot be present together in the delete request." msgid "pop and id params cannot be present together in the delete request."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:207 #: zaqar/queues/transport/validation.py:207
msgid "" msgid ""
"The request should have either \"ids\" or \"pop\" parameter in the " "The request should have either \"ids\" or \"pop\" parameter in the "
"request, to be able to delete." "request, to be able to delete."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:214 #: zaqar/queues/transport/validation.py:214
msgid "Pop value must be at least 1 and may not be greater than {0}." msgid "Pop value must be at least 1 and may not be greater than {0}."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:221 #: zaqar/queues/transport/validation.py:221
msgid "ids parameter should have at least 1 and not greater than {0} values." msgid "ids parameter should have at least 1 and not greater than {0} values."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:248 #: zaqar/queues/transport/validation.py:248
msgid "" msgid ""
"The grace for a claim may not exceed {0} seconds, and must be at least " "The grace for a claim may not exceed {0} seconds, and must be at least "
"{1} seconds long." "{1} seconds long."
@ -252,7 +252,7 @@ msgstr ""
"O prazo de carência para um pedido não deve exceder {0} segundos e não " "O prazo de carência para um pedido não deve exceder {0} segundos e não "
"deve ser menor que {1} segundo." "deve ser menor que {1} segundo."
#: marconi/queues/transport/validation.py:264 #: zaqar/queues/transport/validation.py:264
msgid "" msgid ""
"The TTL for a claim may not exceed {0} seconds, and must be at least {1} " "The TTL for a claim may not exceed {0} seconds, and must be at least {1} "
"seconds long." "seconds long."
@ -260,158 +260,158 @@ msgstr ""
"O tempo de vida de um pedido não pode exceder {0} segundos e não deve ser" "O tempo de vida de um pedido não pode exceder {0} segundos e não deve ser"
" menor que {1} segundos." " menor que {1} segundos."
#: marconi/queues/transport/wsgi/driver.py:105 #: zaqar/queues/transport/wsgi/driver.py:105
#, python-format #, python-format
msgid "Serving on host %(bind)s:%(port)s" msgid "Serving on host %(bind)s:%(port)s"
msgstr "Servindo em %(bind)s:%(port)s" msgstr "Servindo em %(bind)s:%(port)s"
#: marconi/queues/transport/wsgi/errors.py:24 #: zaqar/queues/transport/wsgi/errors.py:24
msgid "Service temporarily unavailable" msgid "Service temporarily unavailable"
msgstr "Serviço temporariamente indisponível" msgstr "Serviço temporariamente indisponível"
#: marconi/queues/transport/wsgi/errors.py:25 #: zaqar/queues/transport/wsgi/errors.py:25
msgid "Please try again in a few seconds." msgid "Please try again in a few seconds."
msgstr "Tente novamente em alguns segundos." msgstr "Tente novamente em alguns segundos."
#: marconi/queues/transport/wsgi/errors.py:36 #: zaqar/queues/transport/wsgi/errors.py:36
msgid "Invalid API call" msgid "Invalid API call"
msgstr "Chamada de API inválida" msgstr "Chamada de API inválida"
#: marconi/queues/transport/wsgi/errors.py:45 #: zaqar/queues/transport/wsgi/errors.py:45
msgid "Invalid request body" msgid "Invalid request body"
msgstr "Corpo da requisição inválido" msgstr "Corpo da requisição inválido"
#: marconi/queues/transport/wsgi/errors.py:54 #: zaqar/queues/transport/wsgi/errors.py:54
msgid "Document type not supported." msgid "Document type not supported."
msgstr "Tipo de documento não suportado." msgstr "Tipo de documento não suportado."
#: marconi/queues/transport/wsgi/utils.py:50 #: zaqar/queues/transport/wsgi/utils.py:50
msgid "Request body can not be empty" msgid "Request body can not be empty"
msgstr "O corpo da requisição não pode ser vazio" msgstr "O corpo da requisição não pode ser vazio"
#: marconi/queues/transport/wsgi/utils.py:61 #: zaqar/queues/transport/wsgi/utils.py:61
msgid "Request body could not be parsed." msgid "Request body could not be parsed."
msgstr "Não foi possível analisar o corpo da requisição." msgstr "Não foi possível analisar o corpo da requisição."
#: marconi/queues/transport/wsgi/utils.py:66 #: zaqar/queues/transport/wsgi/utils.py:66
msgid "JSON contains integer that is too large." msgid "JSON contains integer that is too large."
msgstr "JSON possui um numero inteiro muito grande." msgstr "JSON possui um numero inteiro muito grande."
#: marconi/queues/transport/wsgi/utils.py:72 #: zaqar/queues/transport/wsgi/utils.py:72
msgid "Request body could not be read." msgid "Request body could not be read."
msgstr "O corpo da requisição não pode ser lido." msgstr "O corpo da requisição não pode ser lido."
#: marconi/queues/transport/wsgi/utils.py:168 #: zaqar/queues/transport/wsgi/utils.py:168
msgid "Missing \"{name}\" field." msgid "Missing \"{name}\" field."
msgstr "Faltando o campo \"{name}\"." msgstr "Faltando o campo \"{name}\"."
#: marconi/queues/transport/wsgi/utils.py:176 #: zaqar/queues/transport/wsgi/utils.py:176
msgid "The value of the \"{name}\" field must be a {vtype}." msgid "The value of the \"{name}\" field must be a {vtype}."
msgstr "O valor do campo \"{name}\" deve ser do tipo {vtype}." msgstr "O valor do campo \"{name}\" deve ser do tipo {vtype}."
#: marconi/queues/transport/wsgi/utils.py:194 #: zaqar/queues/transport/wsgi/utils.py:194
msgid "Malformed hexadecimal UUID." msgid "Malformed hexadecimal UUID."
msgstr "UUID hexadecimal inválido." msgstr "UUID hexadecimal inválido."
#: marconi/queues/transport/wsgi/v1_0/claims.py:77 #: zaqar/queues/transport/wsgi/v1_0/claims.py:77
#: marconi/queues/transport/wsgi/v1_1/claims.py:100 #: zaqar/queues/transport/wsgi/v1_1/claims.py:100
msgid "Claim could not be created." msgid "Claim could not be created."
msgstr "Não foi possível criar o pedido." msgstr "Não foi possível criar o pedido."
#: marconi/queues/transport/wsgi/v1_0/claims.py:125 #: zaqar/queues/transport/wsgi/v1_0/claims.py:125
#: marconi/queues/transport/wsgi/v1_1/claims.py:148 #: zaqar/queues/transport/wsgi/v1_1/claims.py:148
msgid "Claim could not be queried." msgid "Claim could not be queried."
msgstr "Não foi possível consultar o pedido." msgstr "Não foi possível consultar o pedido."
#: marconi/queues/transport/wsgi/v1_0/claims.py:173 #: zaqar/queues/transport/wsgi/v1_0/claims.py:173
#: marconi/queues/transport/wsgi/v1_1/claims.py:196 #: zaqar/queues/transport/wsgi/v1_1/claims.py:196
msgid "Claim could not be updated." msgid "Claim could not be updated."
msgstr "Não foi possível atualizar o pedido." msgstr "Não foi possível atualizar o pedido."
#: marconi/queues/transport/wsgi/v1_0/claims.py:191 #: zaqar/queues/transport/wsgi/v1_0/claims.py:191
#: marconi/queues/transport/wsgi/v1_1/claims.py:214 #: zaqar/queues/transport/wsgi/v1_1/claims.py:214
msgid "Claim could not be deleted." msgid "Claim could not be deleted."
msgstr "Não foi possível excluir o pedido." msgstr "Não foi possível excluir o pedido."
#: marconi/queues/transport/wsgi/v1_0/messages.py:60 #: zaqar/queues/transport/wsgi/v1_0/messages.py:60
#: marconi/queues/transport/wsgi/v1_0/messages.py:267 #: zaqar/queues/transport/wsgi/v1_0/messages.py:267
#: marconi/queues/transport/wsgi/v1_1/messages.py:73 #: zaqar/queues/transport/wsgi/v1_1/messages.py:73
#: marconi/queues/transport/wsgi/v1_1/messages.py:333 #: zaqar/queues/transport/wsgi/v1_1/messages.py:333
msgid "Message could not be retrieved." msgid "Message could not be retrieved."
msgstr "Não foi possível recuperar a mensagem." msgstr "Não foi possível recuperar a mensagem."
#: marconi/queues/transport/wsgi/v1_0/messages.py:108 #: zaqar/queues/transport/wsgi/v1_0/messages.py:108
#: marconi/queues/transport/wsgi/v1_1/messages.py:121 #: zaqar/queues/transport/wsgi/v1_1/messages.py:121
msgid "Messages could not be listed." msgid "Messages could not be listed."
msgstr "Não foi possível listar a mensagem." msgstr "Não foi possível listar a mensagem."
#: marconi/queues/transport/wsgi/v1_0/messages.py:181 #: zaqar/queues/transport/wsgi/v1_0/messages.py:181
#: marconi/queues/transport/wsgi/v1_1/messages.py:204 #: zaqar/queues/transport/wsgi/v1_1/messages.py:204
msgid "No messages could be enqueued." msgid "No messages could be enqueued."
msgstr "Nenhuma mensagem pode ser adicionada à fila." msgstr "Nenhuma mensagem pode ser adicionada à fila."
#: marconi/queues/transport/wsgi/v1_0/messages.py:186 #: zaqar/queues/transport/wsgi/v1_0/messages.py:186
#: marconi/queues/transport/wsgi/v1_1/messages.py:209 #: zaqar/queues/transport/wsgi/v1_1/messages.py:209
msgid "Messages could not be enqueued." msgid "Messages could not be enqueued."
msgstr "Não foi possível adicionar mensagens à fila." msgstr "Não foi possível adicionar mensagens à fila."
#: marconi/queues/transport/wsgi/v1_0/messages.py:236 #: zaqar/queues/transport/wsgi/v1_0/messages.py:236
#: marconi/queues/transport/wsgi/v1_1/messages.py:278 #: zaqar/queues/transport/wsgi/v1_1/messages.py:278
msgid "Messages could not be deleted." msgid "Messages could not be deleted."
msgstr "Não foi possível excluir as mensagens." msgstr "Não foi possível excluir as mensagens."
#: marconi/queues/transport/wsgi/v1_0/messages.py:293 #: zaqar/queues/transport/wsgi/v1_0/messages.py:293
#: marconi/queues/transport/wsgi/v1_1/messages.py:360 #: zaqar/queues/transport/wsgi/v1_1/messages.py:360
msgid "Unable to delete" msgid "Unable to delete"
msgstr "Impossível excluir" msgstr "Impossível excluir"
#: marconi/queues/transport/wsgi/v1_0/messages.py:294 #: zaqar/queues/transport/wsgi/v1_0/messages.py:294
#: marconi/queues/transport/wsgi/v1_1/messages.py:361 #: zaqar/queues/transport/wsgi/v1_1/messages.py:361
msgid "This message is claimed; it cannot be deleted without a valid claim_id." msgid "This message is claimed; it cannot be deleted without a valid claim_id."
msgstr "" msgstr ""
"Esta mensagem está sendo usada; não pode ser excluída sem um claim_id " "Esta mensagem está sendo usada; não pode ser excluída sem um claim_id "
"válido." "válido."
#: marconi/queues/transport/wsgi/v1_0/messages.py:300 #: zaqar/queues/transport/wsgi/v1_0/messages.py:300
#: marconi/queues/transport/wsgi/v1_1/messages.py:367 #: zaqar/queues/transport/wsgi/v1_1/messages.py:367
msgid "Message could not be deleted." msgid "Message could not be deleted."
msgstr "A mensagem não pode ser excluída." msgstr "A mensagem não pode ser excluída."
#: marconi/queues/transport/wsgi/v1_0/metadata.py:54 #: zaqar/queues/transport/wsgi/v1_0/metadata.py:54
#: marconi/queues/transport/wsgi/v1_1/metadata.py:54 #: zaqar/queues/transport/wsgi/v1_1/metadata.py:54
msgid "Queue metadata could not be retrieved." msgid "Queue metadata could not be retrieved."
msgstr "Não foi possível obter os metadados da fila." msgstr "Não foi possível obter os metadados da fila."
#: marconi/queues/transport/wsgi/v1_0/metadata.py:91 #: zaqar/queues/transport/wsgi/v1_0/metadata.py:91
#: marconi/queues/transport/wsgi/v1_1/metadata.py:91 #: zaqar/queues/transport/wsgi/v1_1/metadata.py:91
msgid "Metadata could not be updated." msgid "Metadata could not be updated."
msgstr "Não foi possível atualizar os metadados." msgstr "Não foi possível atualizar os metadados."
#: marconi/queues/transport/wsgi/v1_0/queues.py:48 #: zaqar/queues/transport/wsgi/v1_0/queues.py:48
#: marconi/queues/transport/wsgi/v1_1/queues.py:48 #: zaqar/queues/transport/wsgi/v1_1/queues.py:48
msgid "Queue could not be created." msgid "Queue could not be created."
msgstr "Não foi possível criar a fila." msgstr "Não foi possível criar a fila."
#: marconi/queues/transport/wsgi/v1_0/queues.py:77 #: zaqar/queues/transport/wsgi/v1_0/queues.py:77
#: marconi/queues/transport/wsgi/v1_1/queues.py:63 #: zaqar/queues/transport/wsgi/v1_1/queues.py:63
msgid "Queue could not be deleted." msgid "Queue could not be deleted."
msgstr "Não foi possível excluir a fila." msgstr "Não foi possível excluir a fila."
#: marconi/queues/transport/wsgi/v1_0/queues.py:113 #: zaqar/queues/transport/wsgi/v1_0/queues.py:113
#: marconi/queues/transport/wsgi/v1_1/queues.py:99 #: zaqar/queues/transport/wsgi/v1_1/queues.py:99
msgid "Queues could not be listed." msgid "Queues could not be listed."
msgstr "Não foi possível listar as filas." msgstr "Não foi possível listar as filas."
#: marconi/queues/transport/wsgi/v1_0/stats.py:63 #: zaqar/queues/transport/wsgi/v1_0/stats.py:63
#: marconi/queues/transport/wsgi/v1_1/stats.py:74 #: zaqar/queues/transport/wsgi/v1_1/stats.py:74
msgid "Queue stats could not be read." msgid "Queue stats could not be read."
msgstr "Não foi possível ler as estatísticas da fila." msgstr "Não foi possível ler as estatísticas da fila."
#: marconi/queues/transport/wsgi/v1_1/messages.py:166 #: zaqar/queues/transport/wsgi/v1_1/messages.py:166
msgid "No messages were found in the request body." msgid "No messages were found in the request body."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_1/messages.py:296 #: zaqar/queues/transport/wsgi/v1_1/messages.py:296
msgid "Messages could not be popped." msgid "Messages could not be popped."
msgstr "" msgstr ""

6
marconi/locale/marconi-log-warning.pot → zaqar/locale/zaqar-log-critical.pot
View File

@ -1,12 +1,12 @@
# Translations template for marconi. # Translations template for zaqar.
# Copyright (C) 2014 ORGANIZATION # Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the marconi project. # This file is distributed under the same license as the zaqar project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: marconi 2014.2.dev65.g57842ef\n" "Project-Id-Version: zaqar 2014.2.dev65.g57842ef\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-17 06:07+0000\n" "POT-Creation-Date: 2014-07-17 06:07+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

12
marconi/locale/marconi-log-error.pot → zaqar/locale/zaqar-log-error.pot
View File

@ -1,12 +1,12 @@
# Translations template for marconi. # Translations template for zaqar.
# Copyright (C) 2014 ORGANIZATION # Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the marconi project. # This file is distributed under the same license as the zaqar project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: marconi 2014.2.dev65.g57842ef\n" "Project-Id-Version: zaqar 2014.2.dev65.g57842ef\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-17 06:07+0000\n" "POT-Creation-Date: 2014-07-17 06:07+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@ -17,17 +17,17 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n" "Generated-By: Babel 1.3\n"
#: marconi/openstack/common/excutils.py:76 #: zaqar/openstack/common/excutils.py:76
#, python-format #, python-format
msgid "Original exception being dropped: %s" msgid "Original exception being dropped: %s"
msgstr "" msgstr ""
#: marconi/openstack/common/excutils.py:105 #: zaqar/openstack/common/excutils.py:105
#, python-format #, python-format
msgid "Unexpected exception occurred %d time(s)... retrying." msgid "Unexpected exception occurred %d time(s)... retrying."
msgstr "" msgstr ""
#: marconi/openstack/common/lockutils.py:120 #: zaqar/openstack/common/lockutils.py:120
#, python-format #, python-format
msgid "Could not release the acquired lock `%s`" msgid "Could not release the acquired lock `%s`"
msgstr "" msgstr ""

10
marconi/locale/marconi-log-info.pot → zaqar/locale/zaqar-log-info.pot
View File

@ -1,12 +1,12 @@
# Translations template for marconi. # Translations template for zaqar.
# Copyright (C) 2014 ORGANIZATION # Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the marconi project. # This file is distributed under the same license as the zaqar project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: marconi 2014.2.dev65.g57842ef\n" "Project-Id-Version: zaqar 2014.2.dev65.g57842ef\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-17 06:07+0000\n" "POT-Creation-Date: 2014-07-17 06:07+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@ -17,12 +17,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n" "Generated-By: Babel 1.3\n"
#: marconi/openstack/common/lockutils.py:83 #: zaqar/openstack/common/lockutils.py:83
#, python-format #, python-format
msgid "Created lock path: %s" msgid "Created lock path: %s"
msgstr "" msgstr ""
#: marconi/openstack/common/lockutils.py:250 #: zaqar/openstack/common/lockutils.py:250
#, python-format #, python-format
msgid "Failed to remove file %(file)s" msgid "Failed to remove file %(file)s"
msgstr "" msgstr ""

6
marconi/locale/marconi-log-critical.pot → zaqar/locale/zaqar-log-warning.pot
View File

@ -1,12 +1,12 @@
# Translations template for marconi. # Translations template for zaqar.
# Copyright (C) 2014 ORGANIZATION # Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the marconi project. # This file is distributed under the same license as the zaqar project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: marconi 2014.2.dev65.g57842ef\n" "Project-Id-Version: zaqar 2014.2.dev65.g57842ef\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-17 06:07+0000\n" "POT-Creation-Date: 2014-07-17 06:07+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

196
marconi/locale/marconi.pot → zaqar/locale/zaqar.pot
View File

@ -1,12 +1,12 @@
# Translations template for marconi. # Translations template for zaqar.
# Copyright (C) 2014 ORGANIZATION # Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the marconi project. # This file is distributed under the same license as the zaqar project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: marconi 2014.2.dev75.gb3f1b48\n" "Project-Id-Version: zaqar 2014.2.dev75.gb3f1b48\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-07-24 06:07+0000\n" "POT-Creation-Date: 2014-07-24 06:07+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@ -17,25 +17,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n" "Generated-By: Babel 1.3\n"
#: marconi/common/api.py:48 #: zaqar/common/api.py:48
msgid "{0} is not a valid operation" msgid "{0} is not a valid operation"
msgstr "" msgstr ""
#: marconi/common/cli.py:50 #: zaqar/common/cli.py:50
msgid "Terminating" msgid "Terminating"
msgstr "" msgstr ""
#: marconi/common/pipeline.py:94 #: zaqar/common/pipeline.py:94
#, python-format #, python-format
msgid "Stage %(stage)s does not implement %(method)s" msgid "Stage %(stage)s does not implement %(method)s"
msgstr "" msgstr ""
#: marconi/common/pipeline.py:108 #: zaqar/common/pipeline.py:108
#, python-format #, python-format
msgid "Method %s not found in any of the registered stages" msgid "Method %s not found in any of the registered stages"
msgstr "" msgstr ""
#: marconi/common/transport/wsgi/helpers.py:45 #: zaqar/common/transport/wsgi/helpers.py:45
msgid "" msgid ""
"\n" "\n"
"X-PROJECT-ID cannot be an empty string. Specify the right header X" "X-PROJECT-ID cannot be an empty string. Specify the right header X"
@ -43,340 +43,340 @@ msgid ""
"and retry." "and retry."
msgstr "" msgstr ""
#: marconi/common/transport/wsgi/helpers.py:86 #: zaqar/common/transport/wsgi/helpers.py:86
msgid "Invalid queue identification" msgid "Invalid queue identification"
msgstr "" msgstr ""
#: marconi/common/transport/wsgi/helpers.py:87 #: zaqar/common/transport/wsgi/helpers.py:87
msgid "The format of the submitted queue name or project id is not valid." msgid "The format of the submitted queue name or project id is not valid."
msgstr "" msgstr ""
#: marconi/openstack/common/gettextutils.py:320 #: zaqar/openstack/common/gettextutils.py:320
msgid "Message objects do not support addition." msgid "Message objects do not support addition."
msgstr "" msgstr ""
#: marconi/openstack/common/gettextutils.py:330 #: zaqar/openstack/common/gettextutils.py:330
msgid "" msgid ""
"Message objects do not support str() because they may contain non-ascii " "Message objects do not support str() because they may contain non-ascii "
"characters. Please use unicode() or translate() instead." "characters. Please use unicode() or translate() instead."
msgstr "" msgstr ""
#: marconi/openstack/common/lockutils.py:102 #: zaqar/openstack/common/lockutils.py:102
#, python-format #, python-format
msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s" msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s"
msgstr "" msgstr ""
#: marconi/openstack/common/log.py:327 #: zaqar/openstack/common/log.py:327
#, python-format #, python-format
msgid "Deprecated: %s" msgid "Deprecated: %s"
msgstr "" msgstr ""
#: marconi/openstack/common/log.py:436 #: zaqar/openstack/common/log.py:436
#, python-format #, python-format
msgid "Error loading logging config %(log_config)s: %(err_msg)s" msgid "Error loading logging config %(log_config)s: %(err_msg)s"
msgstr "" msgstr ""
#: marconi/openstack/common/log.py:487 #: zaqar/openstack/common/log.py:487
#, python-format #, python-format
msgid "syslog facility must be one of: %s" msgid "syslog facility must be one of: %s"
msgstr "" msgstr ""
#: marconi/openstack/common/log.py:725 #: zaqar/openstack/common/log.py:725
#, python-format #, python-format
msgid "Fatal call to deprecated config: %(msg)s" msgid "Fatal call to deprecated config: %(msg)s"
msgstr "" msgstr ""
#: marconi/openstack/common/strutils.py:92 #: zaqar/openstack/common/strutils.py:92
#, python-format #, python-format
msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
msgstr "" msgstr ""
#: marconi/openstack/common/strutils.py:197 #: zaqar/openstack/common/strutils.py:197
#, python-format #, python-format
msgid "Invalid unit system: \"%s\"" msgid "Invalid unit system: \"%s\""
msgstr "" msgstr ""
#: marconi/openstack/common/strutils.py:206 #: zaqar/openstack/common/strutils.py:206
#, python-format #, python-format
msgid "Invalid string format: %s" msgid "Invalid string format: %s"
msgstr "" msgstr ""
#: marconi/queues/storage/pipeline.py:30 #: zaqar/queues/storage/pipeline.py:30
msgid "" msgid ""
"Pipeline to use for processing {0} operations. This pipeline will be " "Pipeline to use for processing {0} operations. This pipeline will be "
"consumed before calling the storage driver's controller methods, which " "consumed before calling the storage driver's controller methods, which "
"will always be appended to this pipeline." "will always be appended to this pipeline."
msgstr "" msgstr ""
#: marconi/queues/storage/pipeline.py:78 #: zaqar/queues/storage/pipeline.py:78
#, python-format #, python-format
msgid "Stage %(stage)d could not be imported: %(ex)s" msgid "Stage %(stage)d could not be imported: %(ex)s"
msgstr "" msgstr ""
#: marconi/queues/storage/mongodb/messages.py:546 #: zaqar/queues/storage/mongodb/messages.py:546
#, python-format #, python-format
msgid "" msgid ""
"%(attempts)d attempt(s) required to post %(num_messages)d messages to " "%(attempts)d attempt(s) required to post %(num_messages)d messages to "
"queue \"%(queue)s\" under project %(project)s" "queue \"%(queue)s\" under project %(project)s"
msgstr "" msgstr ""
#: marconi/queues/storage/mongodb/messages.py:590 #: zaqar/queues/storage/mongodb/messages.py:590
#, python-format #, python-format
msgid "" msgid ""
"First attempt failed while adding messages to queue \"%(queue)s\" under " "First attempt failed while adding messages to queue \"%(queue)s\" under "
"project %(project)s" "project %(project)s"
msgstr "" msgstr ""
#: marconi/queues/storage/mongodb/messages.py:604 #: zaqar/queues/storage/mongodb/messages.py:604
#, python-format #, python-format
msgid "" msgid ""
"Exceeded maximum retry duration for queue \"%(queue)s\" under project " "Exceeded maximum retry duration for queue \"%(queue)s\" under project "
"%(project)s" "%(project)s"
msgstr "" msgstr ""
#: marconi/queues/storage/mongodb/messages.py:664 #: zaqar/queues/storage/mongodb/messages.py:664
#, python-format #, python-format
msgid "" msgid ""
"Hit maximum number of attempts (%(max)s) for queue \"%(queue)s\" under " "Hit maximum number of attempts (%(max)s) for queue \"%(queue)s\" under "
"project %(project)s" "project %(project)s"
msgstr "" msgstr ""
#: marconi/queues/storage/mongodb/queues.py:177 #: zaqar/queues/storage/mongodb/queues.py:177
#, python-format #, python-format
msgid "" msgid ""
"Failed to increment the message counter for queue %(name)s and project " "Failed to increment the message counter for queue %(name)s and project "
"%(project)s" "%(project)s"
msgstr "" msgstr ""
#: marconi/queues/storage/mongodb/utils.py:290 #: zaqar/queues/storage/mongodb/utils.py:290
msgid "Caught AutoReconnect, retrying the call to {0}" msgid "Caught AutoReconnect, retrying the call to {0}"
msgstr "" msgstr ""
#: marconi/queues/storage/mongodb/utils.py:296 #: zaqar/queues/storage/mongodb/utils.py:296
msgid "Caught AutoReconnect, maximum attempts to {0} exceeded." msgid "Caught AutoReconnect, maximum attempts to {0} exceeded."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:97 #: zaqar/queues/transport/validation.py:97
msgid "Project ids may not be more than {0} characters long." msgid "Project ids may not be more than {0} characters long."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:101 #: zaqar/queues/transport/validation.py:101
msgid "Queue names may not be more than {0} characters long." msgid "Queue names may not be more than {0} characters long."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:106 #: zaqar/queues/transport/validation.py:106
msgid "" msgid ""
"Queue names may only contain ASCII letters, digits, underscores, and " "Queue names may only contain ASCII letters, digits, underscores, and "
"dashes." "dashes."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:119 #: zaqar/queues/transport/validation.py:119
msgid "Limit must be at least 1 and no greater than {0}." msgid "Limit must be at least 1 and no greater than {0}."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:131 #: zaqar/queues/transport/validation.py:131
msgid "Queue metadata is too large. Max size: {0}" msgid "Queue metadata is too large. Max size: {0}"
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:143 #: zaqar/queues/transport/validation.py:143
msgid "No messages to enqueu." msgid "No messages to enqueu."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:158 #: zaqar/queues/transport/validation.py:158
msgid "Message collection size is too large. Max size {0}" msgid "Message collection size is too large. Max size {0}"
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:167 #: zaqar/queues/transport/validation.py:167
msgid "" msgid ""
"The TTL for a message may not exceed {0} seconds, and must be at least " "The TTL for a message may not exceed {0} seconds, and must be at least "
"{1} seconds long." "{1} seconds long."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:183 #: zaqar/queues/transport/validation.py:183
#: marconi/queues/transport/validation.py:239 #: zaqar/queues/transport/validation.py:239
msgid "Limit must be at least 1 and may not be greater than {0}." msgid "Limit must be at least 1 and may not be greater than {0}."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:201 #: zaqar/queues/transport/validation.py:201
msgid "pop and id params cannot be present together in the delete request." msgid "pop and id params cannot be present together in the delete request."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:207 #: zaqar/queues/transport/validation.py:207
msgid "" msgid ""
"The request should have either \"ids\" or \"pop\" parameter in the " "The request should have either \"ids\" or \"pop\" parameter in the "
"request, to be able to delete." "request, to be able to delete."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:214 #: zaqar/queues/transport/validation.py:214
msgid "Pop value must be at least 1 and may not be greater than {0}." msgid "Pop value must be at least 1 and may not be greater than {0}."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:221 #: zaqar/queues/transport/validation.py:221
msgid "ids parameter should have at least 1 and not greater than {0} values." msgid "ids parameter should have at least 1 and not greater than {0} values."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:248 #: zaqar/queues/transport/validation.py:248
msgid "" msgid ""
"The grace for a claim may not exceed {0} seconds, and must be at least " "The grace for a claim may not exceed {0} seconds, and must be at least "
"{1} seconds long." "{1} seconds long."
msgstr "" msgstr ""
#: marconi/queues/transport/validation.py:264 #: zaqar/queues/transport/validation.py:264
msgid "" msgid ""
"The TTL for a claim may not exceed {0} seconds, and must be at least {1} " "The TTL for a claim may not exceed {0} seconds, and must be at least {1} "
"seconds long." "seconds long."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/driver.py:105 #: zaqar/queues/transport/wsgi/driver.py:105
#, python-format #, python-format
msgid "Serving on host %(bind)s:%(port)s" msgid "Serving on host %(bind)s:%(port)s"
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/errors.py:24 #: zaqar/queues/transport/wsgi/errors.py:24
msgid "Service temporarily unavailable" msgid "Service temporarily unavailable"
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/errors.py:25 #: zaqar/queues/transport/wsgi/errors.py:25
msgid "Please try again in a few seconds." msgid "Please try again in a few seconds."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/errors.py:36 #: zaqar/queues/transport/wsgi/errors.py:36
msgid "Invalid API call" msgid "Invalid API call"
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/errors.py:45 #: zaqar/queues/transport/wsgi/errors.py:45
msgid "Invalid request body" msgid "Invalid request body"
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/errors.py:54 #: zaqar/queues/transport/wsgi/errors.py:54
msgid "Document type not supported." msgid "Document type not supported."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/utils.py:50 #: zaqar/queues/transport/wsgi/utils.py:50
msgid "Request body can not be empty" msgid "Request body can not be empty"
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/utils.py:61 #: zaqar/queues/transport/wsgi/utils.py:61
msgid "Request body could not be parsed." msgid "Request body could not be parsed."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/utils.py:66 #: zaqar/queues/transport/wsgi/utils.py:66
msgid "JSON contains integer that is too large." msgid "JSON contains integer that is too large."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/utils.py:72 #: zaqar/queues/transport/wsgi/utils.py:72
msgid "Request body could not be read." msgid "Request body could not be read."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/utils.py:168 #: zaqar/queues/transport/wsgi/utils.py:168
msgid "Missing \"{name}\" field." msgid "Missing \"{name}\" field."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/utils.py:176 #: zaqar/queues/transport/wsgi/utils.py:176
msgid "The value of the \"{name}\" field must be a {vtype}." msgid "The value of the \"{name}\" field must be a {vtype}."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/utils.py:194 #: zaqar/queues/transport/wsgi/utils.py:194
msgid "Malformed hexadecimal UUID." msgid "Malformed hexadecimal UUID."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/claims.py:77 #: zaqar/queues/transport/wsgi/v1_0/claims.py:77
#: marconi/queues/transport/wsgi/v1_1/claims.py:100 #: zaqar/queues/transport/wsgi/v1_1/claims.py:100
msgid "Claim could not be created." msgid "Claim could not be created."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/claims.py:125 #: zaqar/queues/transport/wsgi/v1_0/claims.py:125
#: marconi/queues/transport/wsgi/v1_1/claims.py:148 #: zaqar/queues/transport/wsgi/v1_1/claims.py:148
msgid "Claim could not be queried." msgid "Claim could not be queried."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/claims.py:173 #: zaqar/queues/transport/wsgi/v1_0/claims.py:173
#: marconi/queues/transport/wsgi/v1_1/claims.py:196 #: zaqar/queues/transport/wsgi/v1_1/claims.py:196
msgid "Claim could not be updated." msgid "Claim could not be updated."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/claims.py:191 #: zaqar/queues/transport/wsgi/v1_0/claims.py:191
#: marconi/queues/transport/wsgi/v1_1/claims.py:214 #: zaqar/queues/transport/wsgi/v1_1/claims.py:214
msgid "Claim could not be deleted." msgid "Claim could not be deleted."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/messages.py:60 #: zaqar/queues/transport/wsgi/v1_0/messages.py:60
#: marconi/queues/transport/wsgi/v1_0/messages.py:267 #: zaqar/queues/transport/wsgi/v1_0/messages.py:267
#: marconi/queues/transport/wsgi/v1_1/messages.py:73 #: zaqar/queues/transport/wsgi/v1_1/messages.py:73
#: marconi/queues/transport/wsgi/v1_1/messages.py:333 #: zaqar/queues/transport/wsgi/v1_1/messages.py:333
msgid "Message could not be retrieved." msgid "Message could not be retrieved."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/messages.py:108 #: zaqar/queues/transport/wsgi/v1_0/messages.py:108
#: marconi/queues/transport/wsgi/v1_1/messages.py:121 #: zaqar/queues/transport/wsgi/v1_1/messages.py:121
msgid "Messages could not be listed." msgid "Messages could not be listed."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/messages.py:181 #: zaqar/queues/transport/wsgi/v1_0/messages.py:181
#: marconi/queues/transport/wsgi/v1_1/messages.py:204 #: zaqar/queues/transport/wsgi/v1_1/messages.py:204
msgid "No messages could be enqueued." msgid "No messages could be enqueued."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/messages.py:186 #: zaqar/queues/transport/wsgi/v1_0/messages.py:186
#: marconi/queues/transport/wsgi/v1_1/messages.py:209 #: zaqar/queues/transport/wsgi/v1_1/messages.py:209
msgid "Messages could not be enqueued." msgid "Messages could not be enqueued."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/messages.py:236 #: zaqar/queues/transport/wsgi/v1_0/messages.py:236
#: marconi/queues/transport/wsgi/v1_1/messages.py:278 #: zaqar/queues/transport/wsgi/v1_1/messages.py:278
msgid "Messages could not be deleted." msgid "Messages could not be deleted."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/messages.py:293 #: zaqar/queues/transport/wsgi/v1_0/messages.py:293
#: marconi/queues/transport/wsgi/v1_1/messages.py:360 #: zaqar/queues/transport/wsgi/v1_1/messages.py:360
msgid "Unable to delete" msgid "Unable to delete"
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/messages.py:294 #: zaqar/queues/transport/wsgi/v1_0/messages.py:294
#: marconi/queues/transport/wsgi/v1_1/messages.py:361 #: zaqar/queues/transport/wsgi/v1_1/messages.py:361
msgid "This message is claimed; it cannot be deleted without a valid claim_id." msgid "This message is claimed; it cannot be deleted without a valid claim_id."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/messages.py:300 #: zaqar/queues/transport/wsgi/v1_0/messages.py:300
#: marconi/queues/transport/wsgi/v1_1/messages.py:367 #: zaqar/queues/transport/wsgi/v1_1/messages.py:367
msgid "Message could not be deleted." msgid "Message could not be deleted."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/metadata.py:54 #: zaqar/queues/transport/wsgi/v1_0/metadata.py:54
#: marconi/queues/transport/wsgi/v1_1/metadata.py:54 #: zaqar/queues/transport/wsgi/v1_1/metadata.py:54
msgid "Queue metadata could not be retrieved." msgid "Queue metadata could not be retrieved."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/metadata.py:91 #: zaqar/queues/transport/wsgi/v1_0/metadata.py:91
#: marconi/queues/transport/wsgi/v1_1/metadata.py:91 #: zaqar/queues/transport/wsgi/v1_1/metadata.py:91
msgid "Metadata could not be updated." msgid "Metadata could not be updated."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/queues.py:48 #: zaqar/queues/transport/wsgi/v1_0/queues.py:48
#: marconi/queues/transport/wsgi/v1_1/queues.py:48 #: zaqar/queues/transport/wsgi/v1_1/queues.py:48
msgid "Queue could not be created." msgid "Queue could not be created."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/queues.py:77 #: zaqar/queues/transport/wsgi/v1_0/queues.py:77
#: marconi/queues/transport/wsgi/v1_1/queues.py:63 #: zaqar/queues/transport/wsgi/v1_1/queues.py:63
msgid "Queue could not be deleted." msgid "Queue could not be deleted."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/queues.py:113 #: zaqar/queues/transport/wsgi/v1_0/queues.py:113
#: marconi/queues/transport/wsgi/v1_1/queues.py:99 #: zaqar/queues/transport/wsgi/v1_1/queues.py:99
msgid "Queues could not be listed." msgid "Queues could not be listed."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_0/stats.py:63 #: zaqar/queues/transport/wsgi/v1_0/stats.py:63
#: marconi/queues/transport/wsgi/v1_1/stats.py:74 #: zaqar/queues/transport/wsgi/v1_1/stats.py:74
msgid "Queue stats could not be read." msgid "Queue stats could not be read."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_1/messages.py:166 #: zaqar/queues/transport/wsgi/v1_1/messages.py:166
msgid "No messages were found in the request body." msgid "No messages were found in the request body."
msgstr "" msgstr ""
#: marconi/queues/transport/wsgi/v1_1/messages.py:296 #: zaqar/queues/transport/wsgi/v1_1/messages.py:296
msgid "Messages could not be popped." msgid "Messages could not be popped."
msgstr "" msgstr ""

0
marconi/openstack/__init__.py → zaqar/openstack/__init__.py
View File

0
marconi/openstack/common/__init__.py → zaqar/openstack/common/__init__.py
View File

0
marconi/openstack/common/cache/__init__.py → zaqar/openstack/common/cache/__init__.py vendored
View File

0
marconi/openstack/common/cache/_backends/__init__.py → zaqar/openstack/common/cache/_backends/__init__.py vendored
View File

6
marconi/openstack/common/cache/_backends/memory.py → zaqar/openstack/common/cache/_backends/memory.py vendored
View File

@ -14,9 +14,9 @@
import collections import collections
from marconi.openstack.common.cache import backends from zaqar.openstack.common.cache import backends
from marconi.openstack.common import lockutils from zaqar.openstack.common import lockutils
from marconi.openstack.common import timeutils from zaqar.openstack.common import timeutils
class MemoryBackend(backends.BaseCache): class MemoryBackend(backends.BaseCache):

0
marconi/openstack/common/cache/backends.py → zaqar/openstack/common/cache/backends.py vendored
View File

2
marconi/openstack/common/cache/cache.py → zaqar/openstack/common/cache/cache.py vendored
View File

@ -71,7 +71,7 @@ def get_cache(url='memory://'):
parameters = parse.parse_qsl(query) parameters = parse.parse_qsl(query)
kwargs = {'options': dict(parameters)} kwargs = {'options': dict(parameters)}
mgr = driver.DriverManager('marconi.openstack.common.cache.backends', backend, mgr = driver.DriverManager('zaqar.openstack.common.cache.backends', backend,
invoke_on_load=True, invoke_on_load=True,
invoke_args=[parsed], invoke_args=[parsed],
invoke_kwds=kwargs) invoke_kwds=kwargs)

0
marconi/openstack/common/config/__init__.py → zaqar/openstack/common/config/__init__.py
View File

Some files were not shown because too many files have changed in this diff Show More