From 166abfd30384df92114fbec840fb3b0ad0aaf5eb Mon Sep 17 00:00:00 2001 From: Fei Long Wang Date: Tue, 2 Dec 2014 23:04:53 +1300 Subject: [PATCH] Refactor code structure for notification Given we are going to implement notification, so the 'queues' package is not suitable for current scope of zaqar. This patch will remove the 'queues' package. Partially implements: blueprint notifications Change-Id: I6984f31f4bd1e646b585c45c088ed239b58587c4 --- HACKING.rst | 4 +- doc/source/api/autoindex.rst | 226 +++++++++++++----- doc/source/api/zaqar.api.v1.request.rst | 7 + doc/source/api/zaqar.api.v1.response.rst | 7 + ...otstrap.rst => zaqar.api.v1_1.request.rst} | 4 +- doc/source/api/zaqar.api.v1_1.response.rst | 7 + doc/source/api/zaqar.bootstrap.rst | 7 + doc/source/api/zaqar.context.rst | 7 + ...rst => zaqar.openstack.common.context.rst} | 4 +- ...zaqar.queues.storage.mongodb.catalogue.rst | 7 - .../zaqar.queues.storage.mongodb.claims.rst | 7 - ...qar.queues.storage.mongodb.controllers.rst | 7 - .../zaqar.queues.storage.mongodb.driver.rst | 7 - .../zaqar.queues.storage.mongodb.messages.rst | 7 - .../zaqar.queues.storage.mongodb.options.rst | 7 - .../zaqar.queues.storage.mongodb.queues.rst | 7 - ...zaqar.queues.storage.redis.controllers.rst | 7 - .../zaqar.queues.storage.redis.messages.rst | 7 - ...ar.queues.storage.sqlalchemy.catalogue.rst | 7 - ...zaqar.queues.storage.sqlalchemy.claims.rst | 7 - ....queues.storage.sqlalchemy.controllers.rst | 7 - ...zaqar.queues.storage.sqlalchemy.driver.rst | 7 - ...qar.queues.storage.sqlalchemy.messages.rst | 7 - ...aqar.queues.storage.sqlalchemy.options.rst | 7 - .../zaqar.queues.storage.sqlalchemy.pools.rst | 7 - ...zaqar.queues.storage.sqlalchemy.queues.rst | 7 - ...zaqar.queues.storage.sqlalchemy.tables.rst | 7 - .../zaqar.queues.storage.sqlalchemy.utils.rst | 7 - .../api/zaqar.queues.transport.validation.rst | 7 - .../zaqar.queues.transport.wsgi.errors.rst | 7 - .../api/zaqar.queues.transport.wsgi.utils.rst | 7 - ...aqar.queues.transport.wsgi.v1_0.claims.rst | 7 - ...aqar.queues.transport.wsgi.v1_0.health.rst | 7 - ...qar.queues.transport.wsgi.v1_0.homedoc.rst | 7 - ...ar.queues.transport.wsgi.v1_0.messages.rst | 7 - ...ar.queues.transport.wsgi.v1_0.metadata.rst | 7 - ...zaqar.queues.transport.wsgi.v1_0.pools.rst | 7 - ...aqar.queues.transport.wsgi.v1_0.queues.rst | 7 - ...zaqar.queues.transport.wsgi.v1_0.stats.rst | 7 - ...aqar.queues.transport.wsgi.v1_1.claims.rst | 7 - ...qar.queues.transport.wsgi.v1_1.flavors.rst | 7 - ...aqar.queues.transport.wsgi.v1_1.health.rst | 7 - ...qar.queues.transport.wsgi.v1_1.homedoc.rst | 7 - ...ar.queues.transport.wsgi.v1_1.messages.rst | 7 - .../zaqar.queues.transport.wsgi.v1_1.ping.rst | 7 - ...zaqar.queues.transport.wsgi.v1_1.pools.rst | 7 - ...aqar.queues.transport.wsgi.v1_1.queues.rst | 7 - ...zaqar.queues.transport.wsgi.v1_1.stats.rst | 7 - doc/source/api/zaqar.storage.base.rst | 7 + doc/source/api/zaqar.storage.errors.rst | 7 + ...st => zaqar.storage.mongodb.catalogue.rst} | 4 +- ...g.rst => zaqar.storage.mongodb.claims.rst} | 4 +- ... => zaqar.storage.mongodb.controllers.rst} | 4 +- ...e.rst => zaqar.storage.mongodb.driver.rst} | 4 +- ....rst => zaqar.storage.mongodb.flavors.rst} | 4 +- .../api/zaqar.storage.mongodb.messages.rst | 7 + ....rst => zaqar.storage.mongodb.options.rst} | 4 +- ...st.rst => zaqar.storage.mongodb.pools.rst} | 4 +- ...s.rst => zaqar.storage.mongodb.queues.rst} | 4 +- ...rs.rst => zaqar.storage.mongodb.utils.rst} | 4 +- doc/source/api/zaqar.storage.pipeline.rst | 7 + doc/source/api/zaqar.storage.pooling.rst | 7 + ...ils.rst => zaqar.storage.redis.claims.rst} | 4 +- .../api/zaqar.storage.redis.controllers.rst | 7 + doc/source/api/zaqar.storage.redis.driver.rst | 7 + .../api/zaqar.storage.redis.messages.rst | 7 + doc/source/api/zaqar.storage.redis.models.rst | 7 + ...th.rst => zaqar.storage.redis.options.rst} | 4 +- doc/source/api/zaqar.storage.redis.queues.rst | 7 + .../api/zaqar.storage.redis.scripting.rst | 7 + ...base.rst => zaqar.storage.redis.utils.rst} | 4 +- ...=> zaqar.storage.sqlalchemy.catalogue.rst} | 4 +- .../api/zaqar.storage.sqlalchemy.claims.rst | 7 + ... zaqar.storage.sqlalchemy.controllers.rst} | 4 +- .../api/zaqar.storage.sqlalchemy.driver.rst | 7 + ... => zaqar.storage.sqlalchemy.messages.rst} | 4 +- ...t => zaqar.storage.sqlalchemy.options.rst} | 4 +- .../api/zaqar.storage.sqlalchemy.pools.rst | 7 + .../api/zaqar.storage.sqlalchemy.queues.rst | 7 + .../api/zaqar.storage.sqlalchemy.tables.rst | 7 + .../api/zaqar.storage.sqlalchemy.utils.rst | 7 + doc/source/api/zaqar.storage.utils.rst | 7 + doc/source/api/zaqar.transport.auth.rst | 7 + doc/source/api/zaqar.transport.base.rst | 7 + doc/source/api/zaqar.transport.utils.rst | 7 + doc/source/api/zaqar.transport.validation.rst | 7 + doc/source/api/zaqar.transport.wsgi.app.rst | 7 + ...se.rst => zaqar.transport.wsgi.driver.rst} | 4 +- .../api/zaqar.transport.wsgi.errors.rst | 7 + doc/source/api/zaqar.transport.wsgi.utils.rst | 7 + .../api/zaqar.transport.wsgi.v1_0.claims.rst | 7 + .../api/zaqar.transport.wsgi.v1_0.health.rst | 7 + ... => zaqar.transport.wsgi.v1_0.homedoc.rst} | 4 +- ...=> zaqar.transport.wsgi.v1_0.messages.rst} | 4 +- ...=> zaqar.transport.wsgi.v1_0.metadata.rst} | 4 +- .../api/zaqar.transport.wsgi.v1_0.pools.rst | 7 + .../api/zaqar.transport.wsgi.v1_0.queues.rst | 7 + .../api/zaqar.transport.wsgi.v1_0.stats.rst | 7 + .../api/zaqar.transport.wsgi.v1_1.claims.rst | 7 + ... => zaqar.transport.wsgi.v1_1.flavors.rst} | 4 +- .../api/zaqar.transport.wsgi.v1_1.health.rst | 7 + .../api/zaqar.transport.wsgi.v1_1.homedoc.rst | 7 + ...=> zaqar.transport.wsgi.v1_1.messages.rst} | 4 +- .../api/zaqar.transport.wsgi.v1_1.ping.rst | 7 + .../api/zaqar.transport.wsgi.v1_1.pools.rst | 7 + .../api/zaqar.transport.wsgi.v1_1.queues.rst | 7 + .../api/zaqar.transport.wsgi.v1_1.stats.rst | 7 + doc/source/storage/api.rst | 2 +- doc/source/storage/mongodb.rst | 2 +- doc/source/transport.rst | 2 +- etc/oslo-config-generator/zaqar.conf | 18 +- setup.cfg | 42 ++-- tests/unit/common/storage/test_utils.py | 4 +- .../unit/queues/storage/test_impl_mongodb.py | 16 +- tests/unit/queues/storage/test_impl_redis.py | 12 +- .../queues/storage/test_impl_sqlalchemy.py | 10 +- .../unit/queues/storage/test_pool_catalog.py | 8 +- tests/unit/queues/storage/test_pool_queues.py | 4 +- tests/unit/queues/transport/test_auth.py | 2 +- .../unit/queues/transport/wsgi/test_utils.py | 2 +- tests/unit/test_bootstrap.py | 10 +- zaqar/__init__.py | 4 +- zaqar/{queues => api}/__init__.py | 0 zaqar/{queues/api => api/v1}/__init__.py | 0 zaqar/{queues => }/api/v1/request.py | 0 zaqar/{queues => }/api/v1/response.py | 0 zaqar/{queues/api/v1 => api/v1_1}/__init__.py | 0 zaqar/{queues => }/api/v1_1/request.py | 0 zaqar/{queues => }/api/v1_1/response.py | 0 zaqar/{queues => }/bootstrap.py | 8 +- zaqar/cmd/gc.py | 2 +- zaqar/cmd/server.py | 2 +- zaqar/common/transport/wsgi/helpers.py | 2 +- zaqar/queues/transport/zmq/__init__.py | 0 zaqar/{queues => }/storage/__init__.py | 4 +- zaqar/{queues => }/storage/base.py | 0 zaqar/{queues => }/storage/errors.py | 0 .../{queues => }/storage/mongodb/__init__.py | 2 +- .../{queues => }/storage/mongodb/catalogue.py | 6 +- zaqar/{queues => }/storage/mongodb/claims.py | 6 +- .../storage/mongodb/controllers.py | 12 +- zaqar/{queues => }/storage/mongodb/driver.py | 6 +- zaqar/{queues => }/storage/mongodb/flavors.py | 6 +- .../{queues => }/storage/mongodb/messages.py | 6 +- zaqar/{queues => }/storage/mongodb/options.py | 0 zaqar/{queues => }/storage/mongodb/pools.py | 6 +- zaqar/{queues => }/storage/mongodb/queues.py | 6 +- zaqar/{queues => }/storage/mongodb/utils.py | 2 +- zaqar/{queues => }/storage/pipeline.py | 4 +- zaqar/{queues => }/storage/pooling.py | 10 +- .../api/v1_1 => storage/redis}/__init__.py | 0 zaqar/{queues => }/storage/redis/claims.py | 10 +- .../{queues => }/storage/redis/controllers.py | 6 +- zaqar/{queues => }/storage/redis/driver.py | 6 +- zaqar/{queues => }/storage/redis/messages.py | 10 +- zaqar/{queues => }/storage/redis/models.py | 0 zaqar/{queues => }/storage/redis/options.py | 0 zaqar/{queues => }/storage/redis/queues.py | 6 +- zaqar/{queues => }/storage/redis/scripting.py | 0 .../storage/redis/scripts/claim_messages.lua | 0 .../storage/redis/scripts/index_messages.lua | 0 zaqar/{queues => }/storage/redis/utils.py | 2 +- .../storage/sqlalchemy/__init__.py | 2 +- .../storage/sqlalchemy/catalogue.py | 6 +- .../{queues => }/storage/sqlalchemy/claims.py | 8 +- .../storage/sqlalchemy/controllers.py | 10 +- .../{queues => }/storage/sqlalchemy/driver.py | 10 +- .../storage/sqlalchemy/messages.py | 8 +- .../storage/sqlalchemy/options.py | 0 .../{queues => }/storage/sqlalchemy/pools.py | 8 +- .../{queues => }/storage/sqlalchemy/queues.py | 8 +- .../{queues => }/storage/sqlalchemy/tables.py | 0 .../{queues => }/storage/sqlalchemy/utils.py | 4 +- zaqar/{queues => }/storage/utils.py | 2 +- zaqar/tests/base.py | 2 +- zaqar/tests/faulty_storage.py | 2 +- zaqar/tests/functional/base.py | 18 +- zaqar/tests/queues/storage/base.py | 4 +- zaqar/tests/queues/transport/wsgi/base.py | 6 +- .../transport/wsgi/v1/test_default_limits.py | 2 +- .../queues/transport/wsgi/v1/test_messages.py | 2 +- .../wsgi/v1_1/test_default_limits.py | 2 +- .../queues/transport/wsgi/v1_1/test_health.py | 4 +- .../transport/wsgi/v1_1/test_messages.py | 2 +- zaqar/{queues => }/transport/__init__.py | 2 +- zaqar/{queues => }/transport/auth.py | 0 zaqar/{queues => }/transport/base.py | 4 +- zaqar/{queues => }/transport/utils.py | 0 zaqar/{queues => }/transport/validation.py | 0 zaqar/{queues => }/transport/wsgi/__init__.py | 2 +- zaqar/{queues => }/transport/wsgi/app.py | 4 +- zaqar/{queues => }/transport/wsgi/driver.py | 10 +- zaqar/{queues => }/transport/wsgi/errors.py | 0 zaqar/{queues => }/transport/wsgi/utils.py | 4 +- .../transport/wsgi/v1_0/__init__.py | 16 +- .../transport/wsgi/v1_0/claims.py | 10 +- .../transport/wsgi/v1_0/health.py | 0 .../transport/wsgi/v1_0/homedoc.py | 0 .../transport/wsgi/v1_0/messages.py | 10 +- .../transport/wsgi/v1_0/metadata.py | 10 +- .../{queues => }/transport/wsgi/v1_0/pools.py | 10 +- .../transport/wsgi/v1_0/queues.py | 6 +- .../{queues => }/transport/wsgi/v1_0/stats.py | 6 +- .../transport/wsgi/v1_1/__init__.py | 18 +- .../transport/wsgi/v1_1/claims.py | 10 +- .../transport/wsgi/v1_1/flavors.py | 8 +- .../transport/wsgi/v1_1/health.py | 4 +- .../transport/wsgi/v1_1/homedoc.py | 0 .../transport/wsgi/v1_1/messages.py | 10 +- .../{queues => }/transport/wsgi/v1_1/ping.py | 0 .../{queues => }/transport/wsgi/v1_1/pools.py | 10 +- .../transport/wsgi/v1_1/queues.py | 10 +- .../{queues => }/transport/wsgi/v1_1/stats.py | 6 +- .../redis => transport/zmq}/__init__.py | 0 214 files changed, 781 insertions(+), 660 deletions(-) create mode 100644 doc/source/api/zaqar.api.v1.request.rst create mode 100644 doc/source/api/zaqar.api.v1.response.rst rename doc/source/api/{zaqar.queues.bootstrap.rst => zaqar.api.v1_1.request.rst} (54%) create mode 100644 doc/source/api/zaqar.api.v1_1.response.rst create mode 100644 doc/source/api/zaqar.bootstrap.rst create mode 100644 doc/source/api/zaqar.context.rst rename doc/source/api/{zaqar.queues.api.v1_1.response.rst => zaqar.openstack.common.context.rst} (51%) delete mode 100644 doc/source/api/zaqar.queues.storage.mongodb.catalogue.rst delete mode 100644 doc/source/api/zaqar.queues.storage.mongodb.claims.rst delete mode 100644 doc/source/api/zaqar.queues.storage.mongodb.controllers.rst delete mode 100644 doc/source/api/zaqar.queues.storage.mongodb.driver.rst delete mode 100644 doc/source/api/zaqar.queues.storage.mongodb.messages.rst delete mode 100644 doc/source/api/zaqar.queues.storage.mongodb.options.rst delete mode 100644 doc/source/api/zaqar.queues.storage.mongodb.queues.rst delete mode 100644 doc/source/api/zaqar.queues.storage.redis.controllers.rst delete mode 100644 doc/source/api/zaqar.queues.storage.redis.messages.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.catalogue.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.claims.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.controllers.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.driver.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.messages.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.options.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.pools.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.queues.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.tables.rst delete mode 100644 doc/source/api/zaqar.queues.storage.sqlalchemy.utils.rst delete mode 100644 doc/source/api/zaqar.queues.transport.validation.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.errors.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.utils.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_0.claims.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_0.health.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_0.homedoc.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_0.messages.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_0.metadata.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_0.pools.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_0.queues.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_0.stats.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.claims.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.flavors.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.health.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.homedoc.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.messages.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.ping.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.pools.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.queues.rst delete mode 100644 doc/source/api/zaqar.queues.transport.wsgi.v1_1.stats.rst create mode 100644 doc/source/api/zaqar.storage.base.rst create mode 100644 doc/source/api/zaqar.storage.errors.rst rename doc/source/api/{zaqar.queues.transport.wsgi.app.rst => zaqar.storage.mongodb.catalogue.rst} (51%) rename doc/source/api/{zaqar.queues.storage.pooling.rst => zaqar.storage.mongodb.claims.rst} (52%) rename doc/source/api/{zaqar.queues.storage.redis.claims.rst => zaqar.storage.mongodb.controllers.rst} (50%) rename doc/source/api/{zaqar.queues.api.v1.response.rst => zaqar.storage.mongodb.driver.rst} (52%) rename doc/source/api/{zaqar.queues.storage.pipeline.rst => zaqar.storage.mongodb.flavors.rst} (51%) create mode 100644 doc/source/api/zaqar.storage.mongodb.messages.rst rename doc/source/api/{zaqar.queues.api.v1_1.request.rst => zaqar.storage.mongodb.options.rst} (51%) rename doc/source/api/{zaqar.queues.api.v1.request.rst => zaqar.storage.mongodb.pools.rst} (52%) rename doc/source/api/{zaqar.queues.transport.utils.rst => zaqar.storage.mongodb.queues.rst} (52%) rename doc/source/api/{zaqar.queues.storage.errors.rst => zaqar.storage.mongodb.utils.rst} (52%) create mode 100644 doc/source/api/zaqar.storage.pipeline.rst create mode 100644 doc/source/api/zaqar.storage.pooling.rst rename doc/source/api/{zaqar.queues.storage.utils.rst => zaqar.storage.redis.claims.rst} (52%) create mode 100644 doc/source/api/zaqar.storage.redis.controllers.rst create mode 100644 doc/source/api/zaqar.storage.redis.driver.rst create mode 100644 doc/source/api/zaqar.storage.redis.messages.rst create mode 100644 doc/source/api/zaqar.storage.redis.models.rst rename doc/source/api/{zaqar.queues.transport.auth.rst => zaqar.storage.redis.options.rst} (52%) create mode 100644 doc/source/api/zaqar.storage.redis.queues.rst create mode 100644 doc/source/api/zaqar.storage.redis.scripting.rst rename doc/source/api/{zaqar.queues.storage.base.rst => zaqar.storage.redis.utils.rst} (53%) rename doc/source/api/{zaqar.queues.storage.mongodb.pools.rst => zaqar.storage.sqlalchemy.catalogue.rst} (50%) create mode 100644 doc/source/api/zaqar.storage.sqlalchemy.claims.rst rename doc/source/api/{zaqar.queues.storage.mongodb.flavors.rst => zaqar.storage.sqlalchemy.controllers.rst} (50%) create mode 100644 doc/source/api/zaqar.storage.sqlalchemy.driver.rst rename doc/source/api/{zaqar.queues.storage.redis.driver.rst => zaqar.storage.sqlalchemy.messages.rst} (50%) rename doc/source/api/{zaqar.queues.storage.redis.utils.rst => zaqar.storage.sqlalchemy.options.rst} (50%) create mode 100644 doc/source/api/zaqar.storage.sqlalchemy.pools.rst create mode 100644 doc/source/api/zaqar.storage.sqlalchemy.queues.rst create mode 100644 doc/source/api/zaqar.storage.sqlalchemy.tables.rst create mode 100644 doc/source/api/zaqar.storage.sqlalchemy.utils.rst create mode 100644 doc/source/api/zaqar.storage.utils.rst create mode 100644 doc/source/api/zaqar.transport.auth.rst create mode 100644 doc/source/api/zaqar.transport.base.rst create mode 100644 doc/source/api/zaqar.transport.utils.rst create mode 100644 doc/source/api/zaqar.transport.validation.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.app.rst rename doc/source/api/{zaqar.queues.transport.base.rst => zaqar.transport.wsgi.driver.rst} (52%) create mode 100644 doc/source/api/zaqar.transport.wsgi.errors.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.utils.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_0.claims.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_0.health.rst rename doc/source/api/{zaqar.queues.storage.redis.models.rst => zaqar.transport.wsgi.v1_0.homedoc.rst} (50%) rename doc/source/api/{zaqar.queues.storage.mongodb.utils.rst => zaqar.transport.wsgi.v1_0.messages.rst} (50%) rename doc/source/api/{zaqar.queues.storage.redis.options.rst => zaqar.transport.wsgi.v1_0.metadata.rst} (50%) create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_0.pools.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_0.queues.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_0.stats.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_1.claims.rst rename doc/source/api/{zaqar.queues.storage.redis.queues.rst => zaqar.transport.wsgi.v1_1.flavors.rst} (50%) create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_1.health.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_1.homedoc.rst rename doc/source/api/{zaqar.queues.transport.wsgi.driver.rst => zaqar.transport.wsgi.v1_1.messages.rst} (50%) create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_1.ping.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_1.pools.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_1.queues.rst create mode 100644 doc/source/api/zaqar.transport.wsgi.v1_1.stats.rst rename zaqar/{queues => api}/__init__.py (100%) rename zaqar/{queues/api => api/v1}/__init__.py (100%) rename zaqar/{queues => }/api/v1/request.py (100%) rename zaqar/{queues => }/api/v1/response.py (100%) rename zaqar/{queues/api/v1 => api/v1_1}/__init__.py (100%) rename zaqar/{queues => }/api/v1_1/request.py (100%) rename zaqar/{queues => }/api/v1_1/response.py (100%) rename zaqar/{queues => }/bootstrap.py (95%) delete mode 100644 zaqar/queues/transport/zmq/__init__.py rename zaqar/{queues => }/storage/__init__.py (92%) rename zaqar/{queues => }/storage/base.py (100%) rename zaqar/{queues => }/storage/errors.py (100%) rename zaqar/{queues => }/storage/mongodb/__init__.py (97%) rename zaqar/{queues => }/storage/mongodb/catalogue.py (96%) rename zaqar/{queues => }/storage/mongodb/claims.py (98%) rename zaqar/{queues => }/storage/mongodb/controllers.py (79%) rename zaqar/{queues => }/storage/mongodb/driver.py (98%) rename zaqar/{queues => }/storage/mongodb/flavors.py (97%) rename zaqar/{queues => }/storage/mongodb/messages.py (99%) rename zaqar/{queues => }/storage/mongodb/options.py (100%) rename zaqar/{queues => }/storage/mongodb/pools.py (97%) rename zaqar/{queues => }/storage/mongodb/queues.py (98%) rename zaqar/{queues => }/storage/mongodb/utils.py (99%) rename zaqar/{queues => }/storage/pipeline.py (97%) rename zaqar/{queues => }/storage/pooling.py (98%) rename zaqar/{queues/api/v1_1 => storage/redis}/__init__.py (100%) rename zaqar/{queues => }/storage/redis/claims.py (98%) rename zaqar/{queues => }/storage/redis/controllers.py (83%) rename zaqar/{queues => }/storage/redis/driver.py (98%) rename zaqar/{queues => }/storage/redis/messages.py (98%) rename zaqar/{queues => }/storage/redis/models.py (100%) rename zaqar/{queues => }/storage/redis/options.py (100%) rename zaqar/{queues => }/storage/redis/queues.py (98%) rename zaqar/{queues => }/storage/redis/scripting.py (100%) rename zaqar/{queues => }/storage/redis/scripts/claim_messages.lua (100%) rename zaqar/{queues => }/storage/redis/scripts/index_messages.lua (100%) rename zaqar/{queues => }/storage/redis/utils.py (99%) rename zaqar/{queues => }/storage/sqlalchemy/__init__.py (93%) rename zaqar/{queues => }/storage/sqlalchemy/catalogue.py (95%) rename zaqar/{queues => }/storage/sqlalchemy/claims.py (97%) rename zaqar/{queues => }/storage/sqlalchemy/controllers.py (76%) rename zaqar/{queues => }/storage/sqlalchemy/driver.py (96%) rename zaqar/{queues => }/storage/sqlalchemy/messages.py (98%) rename zaqar/{queues => }/storage/sqlalchemy/options.py (100%) rename zaqar/{queues => }/storage/sqlalchemy/pools.py (96%) rename zaqar/{queues => }/storage/sqlalchemy/queues.py (97%) rename zaqar/{queues => }/storage/sqlalchemy/tables.py (100%) rename zaqar/{queues => }/storage/sqlalchemy/utils.py (97%) rename zaqar/{queues => }/storage/utils.py (98%) rename zaqar/{queues => }/transport/__init__.py (94%) rename zaqar/{queues => }/transport/auth.py (100%) rename zaqar/{queues => }/transport/base.py (95%) rename zaqar/{queues => }/transport/utils.py (100%) rename zaqar/{queues => }/transport/validation.py (100%) rename zaqar/{queues => }/transport/wsgi/__init__.py (93%) rename zaqar/{queues => }/transport/wsgi/app.py (93%) rename zaqar/{queues => }/transport/wsgi/driver.py (94%) rename zaqar/{queues => }/transport/wsgi/errors.py (100%) rename zaqar/{queues => }/transport/wsgi/utils.py (98%) rename zaqar/{queues => }/transport/wsgi/v1_0/__init__.py (85%) rename zaqar/{queues => }/transport/wsgi/v1_0/claims.py (96%) rename zaqar/{queues => }/transport/wsgi/v1_0/health.py (100%) rename zaqar/{queues => }/transport/wsgi/v1_0/homedoc.py (100%) rename zaqar/{queues => }/transport/wsgi/v1_0/messages.py (97%) rename zaqar/{queues => }/transport/wsgi/v1_0/metadata.py (92%) rename zaqar/{queues => }/transport/wsgi/v1_0/pools.py (96%) rename zaqar/{queues => }/transport/wsgi/v1_0/queues.py (96%) rename zaqar/{queues => }/transport/wsgi/v1_0/stats.py (92%) rename zaqar/{queues => }/transport/wsgi/v1_1/__init__.py (87%) rename zaqar/{queues => }/transport/wsgi/v1_1/claims.py (96%) rename zaqar/{queues => }/transport/wsgi/v1_1/flavors.py (96%) rename zaqar/{queues => }/transport/wsgi/v1_1/health.py (92%) rename zaqar/{queues => }/transport/wsgi/v1_1/homedoc.py (100%) rename zaqar/{queues => }/transport/wsgi/v1_1/messages.py (97%) rename zaqar/{queues => }/transport/wsgi/v1_1/ping.py (100%) rename zaqar/{queues => }/transport/wsgi/v1_1/pools.py (96%) rename zaqar/{queues => }/transport/wsgi/v1_1/queues.py (95%) rename zaqar/{queues => }/transport/wsgi/v1_1/stats.py (93%) rename zaqar/{queues/storage/redis => transport/zmq}/__init__.py (100%) diff --git a/HACKING.rst b/HACKING.rst index c705839ec..a272920f3 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -74,11 +74,11 @@ More Import Examples **INCORRECT** :: - import zaqar.queues.transport.wsgi as wsgi + import zaqar.transport.wsgi as wsgi **CORRECT** :: - from zaqar.queues.transport import wsgi + from zaqar.transport import wsgi Docstrings ---------- diff --git a/doc/source/api/autoindex.rst b/doc/source/api/autoindex.rst index eb10fcb18..53626cf3f 100644 --- a/doc/source/api/autoindex.rst +++ b/doc/source/api/autoindex.rst @@ -1,97 +1,197 @@ .. toctree:: :maxdepth: 1 + zaqar.api.v1_1.request.rst + zaqar.api.v1_1.request.rst + zaqar.api.v1_1.response.rst + zaqar.api.v1_1.response.rst + zaqar.api.v1.request.rst + zaqar.api.v1.request.rst + zaqar.api.v1.response.rst + zaqar.api.v1.response.rst + zaqar.bootstrap.rst + zaqar.bootstrap.rst + zaqar.cmd.gc.rst zaqar.cmd.gc.rst zaqar.cmd.server.rst + zaqar.cmd.server.rst + zaqar.common.access.rst zaqar.common.access.rst zaqar.common.api.rst + zaqar.common.api.rst + zaqar.common.cli.rst zaqar.common.cli.rst zaqar.common.decorators.rst + zaqar.common.decorators.rst + zaqar.common.errors.rst zaqar.common.errors.rst zaqar.common.pipeline.rst + zaqar.common.pipeline.rst + zaqar.common.request.rst zaqar.common.request.rst zaqar.common.response.rst + zaqar.common.response.rst + zaqar.common.schemas.flavors.rst zaqar.common.schemas.flavors.rst zaqar.common.schemas.pools.rst + zaqar.common.schemas.pools.rst + zaqar.common.storage.select.rst zaqar.common.storage.select.rst zaqar.common.transport.wsgi.helpers.rst + zaqar.common.transport.wsgi.helpers.rst zaqar.common.utils.rst + zaqar.common.utils.rst + zaqar.context.rst + zaqar.context.rst + zaqar.i18n.rst zaqar.i18n.rst zaqar.openstack.common.cache._backends.memory.rst + zaqar.openstack.common.cache._backends.memory.rst + zaqar.openstack.common.cache.backends.rst zaqar.openstack.common.cache.backends.rst zaqar.openstack.common.cache.cache.rst + zaqar.openstack.common.cache.cache.rst zaqar.openstack.common.config.generator.rst + zaqar.openstack.common.config.generator.rst + zaqar.openstack.common.context.rst + zaqar.openstack.common.context.rst + zaqar.openstack.common.excutils.rst zaqar.openstack.common.excutils.rst zaqar.openstack.common.fileutils.rst + zaqar.openstack.common.fileutils.rst + zaqar.openstack.common.gettextutils.rst zaqar.openstack.common.gettextutils.rst zaqar.openstack.common.importutils.rst + zaqar.openstack.common.importutils.rst + zaqar.openstack.common.jsonutils.rst zaqar.openstack.common.jsonutils.rst zaqar.openstack.common.local.rst + zaqar.openstack.common.local.rst + zaqar.openstack.common.lockutils.rst zaqar.openstack.common.lockutils.rst zaqar.openstack.common.log.rst + zaqar.openstack.common.log.rst + zaqar.openstack.common.strutils.rst zaqar.openstack.common.strutils.rst zaqar.openstack.common.timeutils.rst - zaqar.queues.api.v1_1.request.rst - zaqar.queues.api.v1_1.response.rst - zaqar.queues.api.v1.request.rst - zaqar.queues.api.v1.response.rst - zaqar.queues.bootstrap.rst - zaqar.queues.storage.base.rst - zaqar.queues.storage.errors.rst - zaqar.queues.storage.mongodb.catalogue.rst - zaqar.queues.storage.mongodb.claims.rst - zaqar.queues.storage.mongodb.controllers.rst - zaqar.queues.storage.mongodb.driver.rst - zaqar.queues.storage.mongodb.flavors.rst - zaqar.queues.storage.mongodb.messages.rst - zaqar.queues.storage.mongodb.options.rst - zaqar.queues.storage.mongodb.pools.rst - zaqar.queues.storage.mongodb.queues.rst - zaqar.queues.storage.mongodb.utils.rst - zaqar.queues.storage.pipeline.rst - zaqar.queues.storage.pooling.rst - zaqar.queues.storage.redis.claims.rst - zaqar.queues.storage.redis.controllers.rst - zaqar.queues.storage.redis.driver.rst - zaqar.queues.storage.redis.messages.rst - zaqar.queues.storage.redis.models.rst - zaqar.queues.storage.redis.options.rst - zaqar.queues.storage.redis.queues.rst - zaqar.queues.storage.redis.utils.rst - zaqar.queues.storage.sqlalchemy.catalogue.rst - zaqar.queues.storage.sqlalchemy.claims.rst - zaqar.queues.storage.sqlalchemy.controllers.rst - zaqar.queues.storage.sqlalchemy.driver.rst - zaqar.queues.storage.sqlalchemy.messages.rst - zaqar.queues.storage.sqlalchemy.options.rst - zaqar.queues.storage.sqlalchemy.pools.rst - zaqar.queues.storage.sqlalchemy.queues.rst - zaqar.queues.storage.sqlalchemy.tables.rst - zaqar.queues.storage.sqlalchemy.utils.rst - zaqar.queues.storage.utils.rst - zaqar.queues.transport.auth.rst - zaqar.queues.transport.base.rst - zaqar.queues.transport.utils.rst - zaqar.queues.transport.validation.rst - zaqar.queues.transport.wsgi.app.rst - zaqar.queues.transport.wsgi.driver.rst - zaqar.queues.transport.wsgi.errors.rst - zaqar.queues.transport.wsgi.utils.rst - zaqar.queues.transport.wsgi.v1_0.claims.rst - zaqar.queues.transport.wsgi.v1_0.health.rst - zaqar.queues.transport.wsgi.v1_0.homedoc.rst - zaqar.queues.transport.wsgi.v1_0.messages.rst - zaqar.queues.transport.wsgi.v1_0.metadata.rst - zaqar.queues.transport.wsgi.v1_0.pools.rst - zaqar.queues.transport.wsgi.v1_0.queues.rst - zaqar.queues.transport.wsgi.v1_0.stats.rst - zaqar.queues.transport.wsgi.v1_1.claims.rst - zaqar.queues.transport.wsgi.v1_1.flavors.rst - zaqar.queues.transport.wsgi.v1_1.health.rst - zaqar.queues.transport.wsgi.v1_1.homedoc.rst - zaqar.queues.transport.wsgi.v1_1.messages.rst - zaqar.queues.transport.wsgi.v1_1.ping.rst - zaqar.queues.transport.wsgi.v1_1.pools.rst - zaqar.queues.transport.wsgi.v1_1.queues.rst - zaqar.queues.transport.wsgi.v1_1.stats.rst + zaqar.openstack.common.timeutils.rst + zaqar.storage.base.rst + zaqar.storage.base.rst + zaqar.storage.errors.rst + zaqar.storage.errors.rst + zaqar.storage.mongodb.catalogue.rst + zaqar.storage.mongodb.catalogue.rst + zaqar.storage.mongodb.claims.rst + zaqar.storage.mongodb.claims.rst + zaqar.storage.mongodb.controllers.rst + zaqar.storage.mongodb.controllers.rst + zaqar.storage.mongodb.driver.rst + zaqar.storage.mongodb.driver.rst + zaqar.storage.mongodb.flavors.rst + zaqar.storage.mongodb.flavors.rst + zaqar.storage.mongodb.messages.rst + zaqar.storage.mongodb.messages.rst + zaqar.storage.mongodb.options.rst + zaqar.storage.mongodb.options.rst + zaqar.storage.mongodb.pools.rst + zaqar.storage.mongodb.pools.rst + zaqar.storage.mongodb.queues.rst + zaqar.storage.mongodb.queues.rst + zaqar.storage.mongodb.utils.rst + zaqar.storage.mongodb.utils.rst + zaqar.storage.pipeline.rst + zaqar.storage.pipeline.rst + zaqar.storage.pooling.rst + zaqar.storage.pooling.rst + zaqar.storage.redis.claims.rst + zaqar.storage.redis.claims.rst + zaqar.storage.redis.controllers.rst + zaqar.storage.redis.controllers.rst + zaqar.storage.redis.driver.rst + zaqar.storage.redis.driver.rst + zaqar.storage.redis.messages.rst + zaqar.storage.redis.messages.rst + zaqar.storage.redis.models.rst + zaqar.storage.redis.models.rst + zaqar.storage.redis.options.rst + zaqar.storage.redis.options.rst + zaqar.storage.redis.queues.rst + zaqar.storage.redis.queues.rst + zaqar.storage.redis.scripting.rst + zaqar.storage.redis.scripting.rst + zaqar.storage.redis.utils.rst + zaqar.storage.redis.utils.rst + zaqar.storage.sqlalchemy.catalogue.rst + zaqar.storage.sqlalchemy.catalogue.rst + zaqar.storage.sqlalchemy.claims.rst + zaqar.storage.sqlalchemy.claims.rst + zaqar.storage.sqlalchemy.controllers.rst + zaqar.storage.sqlalchemy.controllers.rst + zaqar.storage.sqlalchemy.driver.rst + zaqar.storage.sqlalchemy.driver.rst + zaqar.storage.sqlalchemy.messages.rst + zaqar.storage.sqlalchemy.messages.rst + zaqar.storage.sqlalchemy.options.rst + zaqar.storage.sqlalchemy.options.rst + zaqar.storage.sqlalchemy.pools.rst + zaqar.storage.sqlalchemy.pools.rst + zaqar.storage.sqlalchemy.queues.rst + zaqar.storage.sqlalchemy.queues.rst + zaqar.storage.sqlalchemy.tables.rst + zaqar.storage.sqlalchemy.tables.rst + zaqar.storage.sqlalchemy.utils.rst + zaqar.storage.sqlalchemy.utils.rst + zaqar.storage.utils.rst + zaqar.storage.utils.rst + zaqar.transport.auth.rst + zaqar.transport.auth.rst + zaqar.transport.base.rst + zaqar.transport.base.rst + zaqar.transport.utils.rst + zaqar.transport.utils.rst + zaqar.transport.validation.rst + zaqar.transport.validation.rst + zaqar.transport.wsgi.app.rst + zaqar.transport.wsgi.app.rst + zaqar.transport.wsgi.driver.rst + zaqar.transport.wsgi.driver.rst + zaqar.transport.wsgi.errors.rst + zaqar.transport.wsgi.errors.rst + zaqar.transport.wsgi.utils.rst + zaqar.transport.wsgi.utils.rst + zaqar.transport.wsgi.v1_0.claims.rst + zaqar.transport.wsgi.v1_0.claims.rst + zaqar.transport.wsgi.v1_0.health.rst + zaqar.transport.wsgi.v1_0.health.rst + zaqar.transport.wsgi.v1_0.homedoc.rst + zaqar.transport.wsgi.v1_0.homedoc.rst + zaqar.transport.wsgi.v1_0.messages.rst + zaqar.transport.wsgi.v1_0.messages.rst + zaqar.transport.wsgi.v1_0.metadata.rst + zaqar.transport.wsgi.v1_0.metadata.rst + zaqar.transport.wsgi.v1_0.pools.rst + zaqar.transport.wsgi.v1_0.pools.rst + zaqar.transport.wsgi.v1_0.queues.rst + zaqar.transport.wsgi.v1_0.queues.rst + zaqar.transport.wsgi.v1_0.stats.rst + zaqar.transport.wsgi.v1_0.stats.rst + zaqar.transport.wsgi.v1_1.claims.rst + zaqar.transport.wsgi.v1_1.claims.rst + zaqar.transport.wsgi.v1_1.flavors.rst + zaqar.transport.wsgi.v1_1.flavors.rst + zaqar.transport.wsgi.v1_1.health.rst + zaqar.transport.wsgi.v1_1.health.rst + zaqar.transport.wsgi.v1_1.homedoc.rst + zaqar.transport.wsgi.v1_1.homedoc.rst + zaqar.transport.wsgi.v1_1.messages.rst + zaqar.transport.wsgi.v1_1.messages.rst + zaqar.transport.wsgi.v1_1.ping.rst + zaqar.transport.wsgi.v1_1.ping.rst + zaqar.transport.wsgi.v1_1.pools.rst + zaqar.transport.wsgi.v1_1.pools.rst + zaqar.transport.wsgi.v1_1.queues.rst + zaqar.transport.wsgi.v1_1.queues.rst + zaqar.transport.wsgi.v1_1.stats.rst + zaqar.transport.wsgi.v1_1.stats.rst + zaqar.version.rst zaqar.version.rst diff --git a/doc/source/api/zaqar.api.v1.request.rst b/doc/source/api/zaqar.api.v1.request.rst new file mode 100644 index 000000000..ca7ad8b3c --- /dev/null +++ b/doc/source/api/zaqar.api.v1.request.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.api.v1.request` module +======================================= + +.. automodule:: zaqar.api.v1.request + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.api.v1.response.rst b/doc/source/api/zaqar.api.v1.response.rst new file mode 100644 index 000000000..6bf7552e7 --- /dev/null +++ b/doc/source/api/zaqar.api.v1.response.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.api.v1.response` module +======================================== + +.. automodule:: zaqar.api.v1.response + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.bootstrap.rst b/doc/source/api/zaqar.api.v1_1.request.rst similarity index 54% rename from doc/source/api/zaqar.queues.bootstrap.rst rename to doc/source/api/zaqar.api.v1_1.request.rst index 6eb983b38..21bb71a11 100644 --- a/doc/source/api/zaqar.queues.bootstrap.rst +++ b/doc/source/api/zaqar.api.v1_1.request.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.bootstrap` module +The :mod:`zaqar.api.v1_1.request` module ========================================= -.. automodule:: zaqar.queues.bootstrap +.. automodule:: zaqar.api.v1_1.request :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.api.v1_1.response.rst b/doc/source/api/zaqar.api.v1_1.response.rst new file mode 100644 index 000000000..a05cb6f27 --- /dev/null +++ b/doc/source/api/zaqar.api.v1_1.response.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.api.v1_1.response` module +========================================== + +.. automodule:: zaqar.api.v1_1.response + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.bootstrap.rst b/doc/source/api/zaqar.bootstrap.rst new file mode 100644 index 000000000..568b0a9f6 --- /dev/null +++ b/doc/source/api/zaqar.bootstrap.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.bootstrap` module +================================== + +.. automodule:: zaqar.bootstrap + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.context.rst b/doc/source/api/zaqar.context.rst new file mode 100644 index 000000000..11b6aab09 --- /dev/null +++ b/doc/source/api/zaqar.context.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.context` module +================================ + +.. automodule:: zaqar.context + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.api.v1_1.response.rst b/doc/source/api/zaqar.openstack.common.context.rst similarity index 51% rename from doc/source/api/zaqar.queues.api.v1_1.response.rst rename to doc/source/api/zaqar.openstack.common.context.rst index db3ccda8c..adc91e36d 100644 --- a/doc/source/api/zaqar.queues.api.v1_1.response.rst +++ b/doc/source/api/zaqar.openstack.common.context.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.api.v1_1.response` module +The :mod:`zaqar.openstack.common.context` module ================================================= -.. automodule:: zaqar.queues.api.v1_1.response +.. automodule:: zaqar.openstack.common.context :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.catalogue.rst b/doc/source/api/zaqar.queues.storage.mongodb.catalogue.rst deleted file mode 100644 index 3bb2989b0..000000000 --- a/doc/source/api/zaqar.queues.storage.mongodb.catalogue.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.mongodb.catalogue` module -========================================================= - -.. automodule:: zaqar.queues.storage.mongodb.catalogue - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.claims.rst b/doc/source/api/zaqar.queues.storage.mongodb.claims.rst deleted file mode 100644 index 49bf173c7..000000000 --- a/doc/source/api/zaqar.queues.storage.mongodb.claims.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.mongodb.claims` module -====================================================== - -.. automodule:: zaqar.queues.storage.mongodb.claims - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.controllers.rst b/doc/source/api/zaqar.queues.storage.mongodb.controllers.rst deleted file mode 100644 index 58a554dd5..000000000 --- a/doc/source/api/zaqar.queues.storage.mongodb.controllers.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.mongodb.controllers` module -=========================================================== - -.. automodule:: zaqar.queues.storage.mongodb.controllers - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.driver.rst b/doc/source/api/zaqar.queues.storage.mongodb.driver.rst deleted file mode 100644 index e35b10839..000000000 --- a/doc/source/api/zaqar.queues.storage.mongodb.driver.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.mongodb.driver` module -====================================================== - -.. automodule:: zaqar.queues.storage.mongodb.driver - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.messages.rst b/doc/source/api/zaqar.queues.storage.mongodb.messages.rst deleted file mode 100644 index 39840a4ae..000000000 --- a/doc/source/api/zaqar.queues.storage.mongodb.messages.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.mongodb.messages` module -======================================================== - -.. automodule:: zaqar.queues.storage.mongodb.messages - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.options.rst b/doc/source/api/zaqar.queues.storage.mongodb.options.rst deleted file mode 100644 index 4fcdc6dcc..000000000 --- a/doc/source/api/zaqar.queues.storage.mongodb.options.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.mongodb.options` module -======================================================= - -.. automodule:: zaqar.queues.storage.mongodb.options - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.queues.rst b/doc/source/api/zaqar.queues.storage.mongodb.queues.rst deleted file mode 100644 index df7e5a193..000000000 --- a/doc/source/api/zaqar.queues.storage.mongodb.queues.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.mongodb.queues` module -====================================================== - -.. automodule:: zaqar.queues.storage.mongodb.queues - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.redis.controllers.rst b/doc/source/api/zaqar.queues.storage.redis.controllers.rst deleted file mode 100644 index 5a7487fcb..000000000 --- a/doc/source/api/zaqar.queues.storage.redis.controllers.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.redis.controllers` module -========================================================= - -.. automodule:: zaqar.queues.storage.redis.controllers - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.redis.messages.rst b/doc/source/api/zaqar.queues.storage.redis.messages.rst deleted file mode 100644 index e67d5f335..000000000 --- a/doc/source/api/zaqar.queues.storage.redis.messages.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.redis.messages` module -====================================================== - -.. automodule:: zaqar.queues.storage.redis.messages - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.catalogue.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.catalogue.rst deleted file mode 100644 index 096e2bf3d..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.catalogue.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.catalogue` module -============================================================ - -.. automodule:: zaqar.queues.storage.sqlalchemy.catalogue - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.claims.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.claims.rst deleted file mode 100644 index d23c02f20..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.claims.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.claims` module -========================================================= - -.. automodule:: zaqar.queues.storage.sqlalchemy.claims - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.controllers.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.controllers.rst deleted file mode 100644 index e55a32f4e..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.controllers.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.controllers` module -============================================================== - -.. automodule:: zaqar.queues.storage.sqlalchemy.controllers - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.driver.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.driver.rst deleted file mode 100644 index cc1c9a62c..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.driver.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.driver` module -========================================================= - -.. automodule:: zaqar.queues.storage.sqlalchemy.driver - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.messages.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.messages.rst deleted file mode 100644 index 7b2951bb2..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.messages.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.messages` module -=========================================================== - -.. automodule:: zaqar.queues.storage.sqlalchemy.messages - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.options.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.options.rst deleted file mode 100644 index aeb68c96c..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.options.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.options` module -========================================================== - -.. automodule:: zaqar.queues.storage.sqlalchemy.options - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.pools.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.pools.rst deleted file mode 100644 index de94c23a2..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.pools.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.pools` module -======================================================== - -.. automodule:: zaqar.queues.storage.sqlalchemy.pools - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.queues.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.queues.rst deleted file mode 100644 index e5edcab95..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.queues.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.queues` module -========================================================= - -.. automodule:: zaqar.queues.storage.sqlalchemy.queues - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.tables.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.tables.rst deleted file mode 100644 index 128b670ed..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.tables.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.tables` module -========================================================= - -.. automodule:: zaqar.queues.storage.sqlalchemy.tables - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.sqlalchemy.utils.rst b/doc/source/api/zaqar.queues.storage.sqlalchemy.utils.rst deleted file mode 100644 index 310cfc972..000000000 --- a/doc/source/api/zaqar.queues.storage.sqlalchemy.utils.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.storage.sqlalchemy.utils` module -======================================================== - -.. automodule:: zaqar.queues.storage.sqlalchemy.utils - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.validation.rst b/doc/source/api/zaqar.queues.transport.validation.rst deleted file mode 100644 index c961328e6..000000000 --- a/doc/source/api/zaqar.queues.transport.validation.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.validation` module -==================================================== - -.. automodule:: zaqar.queues.transport.validation - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.errors.rst b/doc/source/api/zaqar.queues.transport.wsgi.errors.rst deleted file mode 100644 index 7d5d4887a..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.errors.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.errors` module -===================================================== - -.. automodule:: zaqar.queues.transport.wsgi.errors - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.utils.rst b/doc/source/api/zaqar.queues.transport.wsgi.utils.rst deleted file mode 100644 index f94927439..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.utils.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.utils` module -==================================================== - -.. automodule:: zaqar.queues.transport.wsgi.utils - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.claims.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_0.claims.rst deleted file mode 100644 index ee2d13e8b..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.claims.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_0.claims` module -========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_0.claims - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.health.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_0.health.rst deleted file mode 100644 index 1e4ad162e..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.health.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_0.health` module -========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_0.health - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.homedoc.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_0.homedoc.rst deleted file mode 100644 index adaf98524..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.homedoc.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_0.homedoc` module -=========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_0.homedoc - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.messages.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_0.messages.rst deleted file mode 100644 index c22219012..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.messages.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_0.messages` module -============================================================ - -.. automodule:: zaqar.queues.transport.wsgi.v1_0.messages - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.metadata.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_0.metadata.rst deleted file mode 100644 index 09006fbdd..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.metadata.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_0.metadata` module -============================================================ - -.. automodule:: zaqar.queues.transport.wsgi.v1_0.metadata - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.pools.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_0.pools.rst deleted file mode 100644 index cd398cecb..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.pools.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_0.pools` module -========================================================= - -.. automodule:: zaqar.queues.transport.wsgi.v1_0.pools - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.queues.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_0.queues.rst deleted file mode 100644 index cbc208302..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.queues.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_0.queues` module -========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_0.queues - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.stats.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_0.stats.rst deleted file mode 100644 index ab6806a95..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_0.stats.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_0.stats` module -========================================================= - -.. automodule:: zaqar.queues.transport.wsgi.v1_0.stats - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.claims.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.claims.rst deleted file mode 100644 index bc841b719..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.claims.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.claims` module -========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.claims - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.flavors.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.flavors.rst deleted file mode 100644 index 4601aaab5..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.flavors.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.flavors` module -=========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.flavors - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.health.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.health.rst deleted file mode 100644 index bd8da6331..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.health.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.health` module -========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.health - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.homedoc.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.homedoc.rst deleted file mode 100644 index 076d26415..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.homedoc.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.homedoc` module -=========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.homedoc - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.messages.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.messages.rst deleted file mode 100644 index 198ab397c..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.messages.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.messages` module -============================================================ - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.messages - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.ping.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.ping.rst deleted file mode 100644 index 0df07ae7e..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.ping.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.ping` module -======================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.ping - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.pools.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.pools.rst deleted file mode 100644 index 90c3a6a56..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.pools.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.pools` module -========================================================= - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.pools - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.queues.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.queues.rst deleted file mode 100644 index c1ac4a690..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.queues.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.queues` module -========================================================== - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.queues - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.stats.rst b/doc/source/api/zaqar.queues.transport.wsgi.v1_1.stats.rst deleted file mode 100644 index 4a0888273..000000000 --- a/doc/source/api/zaqar.queues.transport.wsgi.v1_1.stats.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.queues.transport.wsgi.v1_1.stats` module -========================================================= - -.. automodule:: zaqar.queues.transport.wsgi.v1_1.stats - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.storage.base.rst b/doc/source/api/zaqar.storage.base.rst new file mode 100644 index 000000000..78329d03a --- /dev/null +++ b/doc/source/api/zaqar.storage.base.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.base` module +===================================== + +.. automodule:: zaqar.storage.base + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.errors.rst b/doc/source/api/zaqar.storage.errors.rst new file mode 100644 index 000000000..dcd96d78c --- /dev/null +++ b/doc/source/api/zaqar.storage.errors.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.errors` module +======================================= + +.. automodule:: zaqar.storage.errors + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.app.rst b/doc/source/api/zaqar.storage.mongodb.catalogue.rst similarity index 51% rename from doc/source/api/zaqar.queues.transport.wsgi.app.rst rename to doc/source/api/zaqar.storage.mongodb.catalogue.rst index 9505d66ab..df797faf4 100644 --- a/doc/source/api/zaqar.queues.transport.wsgi.app.rst +++ b/doc/source/api/zaqar.storage.mongodb.catalogue.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.transport.wsgi.app` module +The :mod:`zaqar.storage.mongodb.catalogue` module ================================================== -.. automodule:: zaqar.queues.transport.wsgi.app +.. automodule:: zaqar.storage.mongodb.catalogue :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.pooling.rst b/doc/source/api/zaqar.storage.mongodb.claims.rst similarity index 52% rename from doc/source/api/zaqar.queues.storage.pooling.rst rename to doc/source/api/zaqar.storage.mongodb.claims.rst index d398541c0..406a6b147 100644 --- a/doc/source/api/zaqar.queues.storage.pooling.rst +++ b/doc/source/api/zaqar.storage.mongodb.claims.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.pooling` module +The :mod:`zaqar.storage.mongodb.claims` module =============================================== -.. automodule:: zaqar.queues.storage.pooling +.. automodule:: zaqar.storage.mongodb.claims :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.redis.claims.rst b/doc/source/api/zaqar.storage.mongodb.controllers.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.redis.claims.rst rename to doc/source/api/zaqar.storage.mongodb.controllers.rst index 0ee675c4a..93dddf6d1 100644 --- a/doc/source/api/zaqar.queues.storage.redis.claims.rst +++ b/doc/source/api/zaqar.storage.mongodb.controllers.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.redis.claims` module +The :mod:`zaqar.storage.mongodb.controllers` module ==================================================== -.. automodule:: zaqar.queues.storage.redis.claims +.. automodule:: zaqar.storage.mongodb.controllers :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.api.v1.response.rst b/doc/source/api/zaqar.storage.mongodb.driver.rst similarity index 52% rename from doc/source/api/zaqar.queues.api.v1.response.rst rename to doc/source/api/zaqar.storage.mongodb.driver.rst index dd1631ab6..bfe0b5703 100644 --- a/doc/source/api/zaqar.queues.api.v1.response.rst +++ b/doc/source/api/zaqar.storage.mongodb.driver.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.api.v1.response` module +The :mod:`zaqar.storage.mongodb.driver` module =============================================== -.. automodule:: zaqar.queues.api.v1.response +.. automodule:: zaqar.storage.mongodb.driver :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.pipeline.rst b/doc/source/api/zaqar.storage.mongodb.flavors.rst similarity index 51% rename from doc/source/api/zaqar.queues.storage.pipeline.rst rename to doc/source/api/zaqar.storage.mongodb.flavors.rst index ba84a8cbf..d9954958f 100644 --- a/doc/source/api/zaqar.queues.storage.pipeline.rst +++ b/doc/source/api/zaqar.storage.mongodb.flavors.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.pipeline` module +The :mod:`zaqar.storage.mongodb.flavors` module ================================================ -.. automodule:: zaqar.queues.storage.pipeline +.. automodule:: zaqar.storage.mongodb.flavors :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.storage.mongodb.messages.rst b/doc/source/api/zaqar.storage.mongodb.messages.rst new file mode 100644 index 000000000..7a4a402bb --- /dev/null +++ b/doc/source/api/zaqar.storage.mongodb.messages.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.mongodb.messages` module +================================================= + +.. automodule:: zaqar.storage.mongodb.messages + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.api.v1_1.request.rst b/doc/source/api/zaqar.storage.mongodb.options.rst similarity index 51% rename from doc/source/api/zaqar.queues.api.v1_1.request.rst rename to doc/source/api/zaqar.storage.mongodb.options.rst index b4c339351..e757fee29 100644 --- a/doc/source/api/zaqar.queues.api.v1_1.request.rst +++ b/doc/source/api/zaqar.storage.mongodb.options.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.api.v1_1.request` module +The :mod:`zaqar.storage.mongodb.options` module ================================================ -.. automodule:: zaqar.queues.api.v1_1.request +.. automodule:: zaqar.storage.mongodb.options :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.api.v1.request.rst b/doc/source/api/zaqar.storage.mongodb.pools.rst similarity index 52% rename from doc/source/api/zaqar.queues.api.v1.request.rst rename to doc/source/api/zaqar.storage.mongodb.pools.rst index 2469c9e20..f4fe9a997 100644 --- a/doc/source/api/zaqar.queues.api.v1.request.rst +++ b/doc/source/api/zaqar.storage.mongodb.pools.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.api.v1.request` module +The :mod:`zaqar.storage.mongodb.pools` module ============================================== -.. automodule:: zaqar.queues.api.v1.request +.. automodule:: zaqar.storage.mongodb.pools :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.utils.rst b/doc/source/api/zaqar.storage.mongodb.queues.rst similarity index 52% rename from doc/source/api/zaqar.queues.transport.utils.rst rename to doc/source/api/zaqar.storage.mongodb.queues.rst index b74433ef4..013deb356 100644 --- a/doc/source/api/zaqar.queues.transport.utils.rst +++ b/doc/source/api/zaqar.storage.mongodb.queues.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.transport.utils` module +The :mod:`zaqar.storage.mongodb.queues` module =============================================== -.. automodule:: zaqar.queues.transport.utils +.. automodule:: zaqar.storage.mongodb.queues :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.errors.rst b/doc/source/api/zaqar.storage.mongodb.utils.rst similarity index 52% rename from doc/source/api/zaqar.queues.storage.errors.rst rename to doc/source/api/zaqar.storage.mongodb.utils.rst index 4c21077ae..477fbe5ac 100644 --- a/doc/source/api/zaqar.queues.storage.errors.rst +++ b/doc/source/api/zaqar.storage.mongodb.utils.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.errors` module +The :mod:`zaqar.storage.mongodb.utils` module ============================================== -.. automodule:: zaqar.queues.storage.errors +.. automodule:: zaqar.storage.mongodb.utils :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.storage.pipeline.rst b/doc/source/api/zaqar.storage.pipeline.rst new file mode 100644 index 000000000..2c7572979 --- /dev/null +++ b/doc/source/api/zaqar.storage.pipeline.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.pipeline` module +========================================= + +.. automodule:: zaqar.storage.pipeline + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.pooling.rst b/doc/source/api/zaqar.storage.pooling.rst new file mode 100644 index 000000000..f95e6160c --- /dev/null +++ b/doc/source/api/zaqar.storage.pooling.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.pooling` module +======================================== + +.. automodule:: zaqar.storage.pooling + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.utils.rst b/doc/source/api/zaqar.storage.redis.claims.rst similarity index 52% rename from doc/source/api/zaqar.queues.storage.utils.rst rename to doc/source/api/zaqar.storage.redis.claims.rst index e61819c65..6be259cac 100644 --- a/doc/source/api/zaqar.queues.storage.utils.rst +++ b/doc/source/api/zaqar.storage.redis.claims.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.utils` module +The :mod:`zaqar.storage.redis.claims` module ============================================= -.. automodule:: zaqar.queues.storage.utils +.. automodule:: zaqar.storage.redis.claims :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.storage.redis.controllers.rst b/doc/source/api/zaqar.storage.redis.controllers.rst new file mode 100644 index 000000000..1d1db6856 --- /dev/null +++ b/doc/source/api/zaqar.storage.redis.controllers.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.redis.controllers` module +================================================== + +.. automodule:: zaqar.storage.redis.controllers + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.redis.driver.rst b/doc/source/api/zaqar.storage.redis.driver.rst new file mode 100644 index 000000000..c1f4e723a --- /dev/null +++ b/doc/source/api/zaqar.storage.redis.driver.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.redis.driver` module +============================================= + +.. automodule:: zaqar.storage.redis.driver + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.redis.messages.rst b/doc/source/api/zaqar.storage.redis.messages.rst new file mode 100644 index 000000000..4c0abd7a9 --- /dev/null +++ b/doc/source/api/zaqar.storage.redis.messages.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.redis.messages` module +=============================================== + +.. automodule:: zaqar.storage.redis.messages + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.redis.models.rst b/doc/source/api/zaqar.storage.redis.models.rst new file mode 100644 index 000000000..888a5f5fa --- /dev/null +++ b/doc/source/api/zaqar.storage.redis.models.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.redis.models` module +============================================= + +.. automodule:: zaqar.storage.redis.models + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.auth.rst b/doc/source/api/zaqar.storage.redis.options.rst similarity index 52% rename from doc/source/api/zaqar.queues.transport.auth.rst rename to doc/source/api/zaqar.storage.redis.options.rst index 2f607610e..6ef022076 100644 --- a/doc/source/api/zaqar.queues.transport.auth.rst +++ b/doc/source/api/zaqar.storage.redis.options.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.transport.auth` module +The :mod:`zaqar.storage.redis.options` module ============================================== -.. automodule:: zaqar.queues.transport.auth +.. automodule:: zaqar.storage.redis.options :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.storage.redis.queues.rst b/doc/source/api/zaqar.storage.redis.queues.rst new file mode 100644 index 000000000..32ea9ffed --- /dev/null +++ b/doc/source/api/zaqar.storage.redis.queues.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.redis.queues` module +============================================= + +.. automodule:: zaqar.storage.redis.queues + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.redis.scripting.rst b/doc/source/api/zaqar.storage.redis.scripting.rst new file mode 100644 index 000000000..02c71c878 --- /dev/null +++ b/doc/source/api/zaqar.storage.redis.scripting.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.redis.scripting` module +================================================ + +.. automodule:: zaqar.storage.redis.scripting + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.base.rst b/doc/source/api/zaqar.storage.redis.utils.rst similarity index 53% rename from doc/source/api/zaqar.queues.storage.base.rst rename to doc/source/api/zaqar.storage.redis.utils.rst index d94596b74..a8855e818 100644 --- a/doc/source/api/zaqar.queues.storage.base.rst +++ b/doc/source/api/zaqar.storage.redis.utils.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.base` module +The :mod:`zaqar.storage.redis.utils` module ============================================ -.. automodule:: zaqar.queues.storage.base +.. automodule:: zaqar.storage.redis.utils :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.pools.rst b/doc/source/api/zaqar.storage.sqlalchemy.catalogue.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.mongodb.pools.rst rename to doc/source/api/zaqar.storage.sqlalchemy.catalogue.rst index 5dac61008..4c57d8b81 100644 --- a/doc/source/api/zaqar.queues.storage.mongodb.pools.rst +++ b/doc/source/api/zaqar.storage.sqlalchemy.catalogue.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.mongodb.pools` module +The :mod:`zaqar.storage.sqlalchemy.catalogue` module ===================================================== -.. automodule:: zaqar.queues.storage.mongodb.pools +.. automodule:: zaqar.storage.sqlalchemy.catalogue :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.storage.sqlalchemy.claims.rst b/doc/source/api/zaqar.storage.sqlalchemy.claims.rst new file mode 100644 index 000000000..c8b68a914 --- /dev/null +++ b/doc/source/api/zaqar.storage.sqlalchemy.claims.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.sqlalchemy.claims` module +================================================== + +.. automodule:: zaqar.storage.sqlalchemy.claims + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.flavors.rst b/doc/source/api/zaqar.storage.sqlalchemy.controllers.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.mongodb.flavors.rst rename to doc/source/api/zaqar.storage.sqlalchemy.controllers.rst index 1dc7b758f..225060243 100644 --- a/doc/source/api/zaqar.queues.storage.mongodb.flavors.rst +++ b/doc/source/api/zaqar.storage.sqlalchemy.controllers.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.mongodb.flavors` module +The :mod:`zaqar.storage.sqlalchemy.controllers` module ======================================================= -.. automodule:: zaqar.queues.storage.mongodb.flavors +.. automodule:: zaqar.storage.sqlalchemy.controllers :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.storage.sqlalchemy.driver.rst b/doc/source/api/zaqar.storage.sqlalchemy.driver.rst new file mode 100644 index 000000000..b26a3ebf0 --- /dev/null +++ b/doc/source/api/zaqar.storage.sqlalchemy.driver.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.sqlalchemy.driver` module +================================================== + +.. automodule:: zaqar.storage.sqlalchemy.driver + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.redis.driver.rst b/doc/source/api/zaqar.storage.sqlalchemy.messages.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.redis.driver.rst rename to doc/source/api/zaqar.storage.sqlalchemy.messages.rst index 1e1ca39d5..f56ed4bf0 100644 --- a/doc/source/api/zaqar.queues.storage.redis.driver.rst +++ b/doc/source/api/zaqar.storage.sqlalchemy.messages.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.redis.driver` module +The :mod:`zaqar.storage.sqlalchemy.messages` module ==================================================== -.. automodule:: zaqar.queues.storage.redis.driver +.. automodule:: zaqar.storage.sqlalchemy.messages :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.redis.utils.rst b/doc/source/api/zaqar.storage.sqlalchemy.options.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.redis.utils.rst rename to doc/source/api/zaqar.storage.sqlalchemy.options.rst index c3652a60a..2fc00cf5c 100644 --- a/doc/source/api/zaqar.queues.storage.redis.utils.rst +++ b/doc/source/api/zaqar.storage.sqlalchemy.options.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.redis.utils` module +The :mod:`zaqar.storage.sqlalchemy.options` module =================================================== -.. automodule:: zaqar.queues.storage.redis.utils +.. automodule:: zaqar.storage.sqlalchemy.options :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.storage.sqlalchemy.pools.rst b/doc/source/api/zaqar.storage.sqlalchemy.pools.rst new file mode 100644 index 000000000..263c6ef5d --- /dev/null +++ b/doc/source/api/zaqar.storage.sqlalchemy.pools.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.sqlalchemy.pools` module +================================================= + +.. automodule:: zaqar.storage.sqlalchemy.pools + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.sqlalchemy.queues.rst b/doc/source/api/zaqar.storage.sqlalchemy.queues.rst new file mode 100644 index 000000000..158bac71f --- /dev/null +++ b/doc/source/api/zaqar.storage.sqlalchemy.queues.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.sqlalchemy.queues` module +================================================== + +.. automodule:: zaqar.storage.sqlalchemy.queues + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.sqlalchemy.tables.rst b/doc/source/api/zaqar.storage.sqlalchemy.tables.rst new file mode 100644 index 000000000..21eb03b18 --- /dev/null +++ b/doc/source/api/zaqar.storage.sqlalchemy.tables.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.sqlalchemy.tables` module +================================================== + +.. automodule:: zaqar.storage.sqlalchemy.tables + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.sqlalchemy.utils.rst b/doc/source/api/zaqar.storage.sqlalchemy.utils.rst new file mode 100644 index 000000000..fa5cac1ff --- /dev/null +++ b/doc/source/api/zaqar.storage.sqlalchemy.utils.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.sqlalchemy.utils` module +================================================= + +.. automodule:: zaqar.storage.sqlalchemy.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.storage.utils.rst b/doc/source/api/zaqar.storage.utils.rst new file mode 100644 index 000000000..99939e740 --- /dev/null +++ b/doc/source/api/zaqar.storage.utils.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.storage.utils` module +====================================== + +.. automodule:: zaqar.storage.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.auth.rst b/doc/source/api/zaqar.transport.auth.rst new file mode 100644 index 000000000..bfd9e3e85 --- /dev/null +++ b/doc/source/api/zaqar.transport.auth.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.auth` module +======================================= + +.. automodule:: zaqar.transport.auth + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.base.rst b/doc/source/api/zaqar.transport.base.rst new file mode 100644 index 000000000..99da1adbc --- /dev/null +++ b/doc/source/api/zaqar.transport.base.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.base` module +======================================= + +.. automodule:: zaqar.transport.base + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.utils.rst b/doc/source/api/zaqar.transport.utils.rst new file mode 100644 index 000000000..34e147e0a --- /dev/null +++ b/doc/source/api/zaqar.transport.utils.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.utils` module +======================================== + +.. automodule:: zaqar.transport.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.validation.rst b/doc/source/api/zaqar.transport.validation.rst new file mode 100644 index 000000000..1dba434c2 --- /dev/null +++ b/doc/source/api/zaqar.transport.validation.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.validation` module +============================================= + +.. automodule:: zaqar.transport.validation + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.app.rst b/doc/source/api/zaqar.transport.wsgi.app.rst new file mode 100644 index 000000000..b8ab315b4 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.app.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.app` module +=========================================== + +.. automodule:: zaqar.transport.wsgi.app + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.base.rst b/doc/source/api/zaqar.transport.wsgi.driver.rst similarity index 52% rename from doc/source/api/zaqar.queues.transport.base.rst rename to doc/source/api/zaqar.transport.wsgi.driver.rst index c31f33c32..657291023 100644 --- a/doc/source/api/zaqar.queues.transport.base.rst +++ b/doc/source/api/zaqar.transport.wsgi.driver.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.transport.base` module +The :mod:`zaqar.transport.wsgi.driver` module ============================================== -.. automodule:: zaqar.queues.transport.base +.. automodule:: zaqar.transport.wsgi.driver :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.errors.rst b/doc/source/api/zaqar.transport.wsgi.errors.rst new file mode 100644 index 000000000..d802b0c99 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.errors.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.errors` module +============================================== + +.. automodule:: zaqar.transport.wsgi.errors + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.utils.rst b/doc/source/api/zaqar.transport.wsgi.utils.rst new file mode 100644 index 000000000..20653b870 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.utils.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.utils` module +============================================= + +.. automodule:: zaqar.transport.wsgi.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_0.claims.rst b/doc/source/api/zaqar.transport.wsgi.v1_0.claims.rst new file mode 100644 index 000000000..9b6541670 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_0.claims.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_0.claims` module +=================================================== + +.. automodule:: zaqar.transport.wsgi.v1_0.claims + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_0.health.rst b/doc/source/api/zaqar.transport.wsgi.v1_0.health.rst new file mode 100644 index 000000000..3698986d1 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_0.health.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_0.health` module +=================================================== + +.. automodule:: zaqar.transport.wsgi.v1_0.health + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.redis.models.rst b/doc/source/api/zaqar.transport.wsgi.v1_0.homedoc.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.redis.models.rst rename to doc/source/api/zaqar.transport.wsgi.v1_0.homedoc.rst index 74b65bbe5..57f5d01f6 100644 --- a/doc/source/api/zaqar.queues.storage.redis.models.rst +++ b/doc/source/api/zaqar.transport.wsgi.v1_0.homedoc.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.redis.models` module +The :mod:`zaqar.transport.wsgi.v1_0.homedoc` module ==================================================== -.. automodule:: zaqar.queues.storage.redis.models +.. automodule:: zaqar.transport.wsgi.v1_0.homedoc :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.mongodb.utils.rst b/doc/source/api/zaqar.transport.wsgi.v1_0.messages.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.mongodb.utils.rst rename to doc/source/api/zaqar.transport.wsgi.v1_0.messages.rst index 33579a7d1..2f64fe1e3 100644 --- a/doc/source/api/zaqar.queues.storage.mongodb.utils.rst +++ b/doc/source/api/zaqar.transport.wsgi.v1_0.messages.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.mongodb.utils` module +The :mod:`zaqar.transport.wsgi.v1_0.messages` module ===================================================== -.. automodule:: zaqar.queues.storage.mongodb.utils +.. automodule:: zaqar.transport.wsgi.v1_0.messages :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.redis.options.rst b/doc/source/api/zaqar.transport.wsgi.v1_0.metadata.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.redis.options.rst rename to doc/source/api/zaqar.transport.wsgi.v1_0.metadata.rst index 3d43fb8b8..a31d7b0d2 100644 --- a/doc/source/api/zaqar.queues.storage.redis.options.rst +++ b/doc/source/api/zaqar.transport.wsgi.v1_0.metadata.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.redis.options` module +The :mod:`zaqar.transport.wsgi.v1_0.metadata` module ===================================================== -.. automodule:: zaqar.queues.storage.redis.options +.. automodule:: zaqar.transport.wsgi.v1_0.metadata :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_0.pools.rst b/doc/source/api/zaqar.transport.wsgi.v1_0.pools.rst new file mode 100644 index 000000000..299c8c607 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_0.pools.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_0.pools` module +================================================== + +.. automodule:: zaqar.transport.wsgi.v1_0.pools + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_0.queues.rst b/doc/source/api/zaqar.transport.wsgi.v1_0.queues.rst new file mode 100644 index 000000000..e1f081d1b --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_0.queues.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_0.queues` module +=================================================== + +.. automodule:: zaqar.transport.wsgi.v1_0.queues + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_0.stats.rst b/doc/source/api/zaqar.transport.wsgi.v1_0.stats.rst new file mode 100644 index 000000000..029b998d4 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_0.stats.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_0.stats` module +================================================== + +.. automodule:: zaqar.transport.wsgi.v1_0.stats + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_1.claims.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.claims.rst new file mode 100644 index 000000000..d0faf9c5c --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.claims.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_1.claims` module +=================================================== + +.. automodule:: zaqar.transport.wsgi.v1_1.claims + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.storage.redis.queues.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.flavors.rst similarity index 50% rename from doc/source/api/zaqar.queues.storage.redis.queues.rst rename to doc/source/api/zaqar.transport.wsgi.v1_1.flavors.rst index fc1366a3c..a8ad5bfaf 100644 --- a/doc/source/api/zaqar.queues.storage.redis.queues.rst +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.flavors.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.storage.redis.queues` module +The :mod:`zaqar.transport.wsgi.v1_1.flavors` module ==================================================== -.. automodule:: zaqar.queues.storage.redis.queues +.. automodule:: zaqar.transport.wsgi.v1_1.flavors :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_1.health.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.health.rst new file mode 100644 index 000000000..6ef908577 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.health.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_1.health` module +=================================================== + +.. automodule:: zaqar.transport.wsgi.v1_1.health + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_1.homedoc.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.homedoc.rst new file mode 100644 index 000000000..105e2c472 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.homedoc.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_1.homedoc` module +==================================================== + +.. automodule:: zaqar.transport.wsgi.v1_1.homedoc + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.queues.transport.wsgi.driver.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.messages.rst similarity index 50% rename from doc/source/api/zaqar.queues.transport.wsgi.driver.rst rename to doc/source/api/zaqar.transport.wsgi.v1_1.messages.rst index 8e2923e07..dfc99d664 100644 --- a/doc/source/api/zaqar.queues.transport.wsgi.driver.rst +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.messages.rst @@ -1,7 +1,7 @@ -The :mod:`zaqar.queues.transport.wsgi.driver` module +The :mod:`zaqar.transport.wsgi.v1_1.messages` module ===================================================== -.. automodule:: zaqar.queues.transport.wsgi.driver +.. automodule:: zaqar.transport.wsgi.v1_1.messages :members: :undoc-members: :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_1.ping.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.ping.rst new file mode 100644 index 000000000..86c4626d2 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.ping.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_1.ping` module +================================================= + +.. automodule:: zaqar.transport.wsgi.v1_1.ping + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_1.pools.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.pools.rst new file mode 100644 index 000000000..d6e3735d5 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.pools.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_1.pools` module +================================================== + +.. automodule:: zaqar.transport.wsgi.v1_1.pools + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_1.queues.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.queues.rst new file mode 100644 index 000000000..f6464879b --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.queues.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_1.queues` module +=================================================== + +.. automodule:: zaqar.transport.wsgi.v1_1.queues + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/api/zaqar.transport.wsgi.v1_1.stats.rst b/doc/source/api/zaqar.transport.wsgi.v1_1.stats.rst new file mode 100644 index 000000000..9595ec2e1 --- /dev/null +++ b/doc/source/api/zaqar.transport.wsgi.v1_1.stats.rst @@ -0,0 +1,7 @@ +The :mod:`zaqar.transport.wsgi.v1_1.stats` module +================================================== + +.. automodule:: zaqar.transport.wsgi.v1_1.stats + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/storage/api.rst b/doc/source/storage/api.rst index 99ab0a4ae..f60df5405 100644 --- a/doc/source/storage/api.rst +++ b/doc/source/storage/api.rst @@ -2,7 +2,7 @@ API reference for storage drivers --------------------------------- -.. currentmodule:: zaqar.queues.storage.base +.. currentmodule:: zaqar.storage.base .. autoclass:: DataDriverBase :noindex: diff --git a/doc/source/storage/mongodb.rst b/doc/source/storage/mongodb.rst index 7f68f0118..983a52109 100644 --- a/doc/source/storage/mongodb.rst +++ b/doc/source/storage/mongodb.rst @@ -2,4 +2,4 @@ MongoDB Driver -------------- -.. automodule:: zaqar.queues.storage.mongodb +.. automodule:: zaqar.storage.mongodb diff --git a/doc/source/transport.rst b/doc/source/transport.rst index 6f6f1f16a..01653f4b5 100644 --- a/doc/source/transport.rst +++ b/doc/source/transport.rst @@ -2,7 +2,7 @@ Transport --------- -.. currentmodule:: zaqar.queues.transport.base +.. currentmodule:: zaqar.transport.base .. autoclass:: DriverBase :noindex: diff --git a/etc/oslo-config-generator/zaqar.conf b/etc/oslo-config-generator/zaqar.conf index f935925f3..526665590 100644 --- a/etc/oslo-config-generator/zaqar.conf +++ b/etc/oslo-config-generator/zaqar.conf @@ -1,12 +1,12 @@ [DEFAULT] output_file = etc/zaqar.conf.sample -namespace = zaqar.queues.bootstrap -namespace = zaqar.queues.storage.pipeline -namespace = zaqar.queues.storage.pooling -namespace = zaqar.queues.storage.mongodb -namespace = zaqar.queues.storage.redis -namespace = zaqar.queues.storage.sqlalchemy -namespace = zaqar.queues.transport.wsgi -namespace = zaqar.queues.transport.base -namespace = zaqar.queues.transport.validation +namespace = zaqar.bootstrap +namespace = zaqar.storage.pipeline +namespace = zaqar.storage.pooling +namespace = zaqar.storage.mongodb +namespace = zaqar.storage.redis +namespace = zaqar.storage.sqlalchemy +namespace = zaqar.transport.wsgi +namespace = zaqar.transport.base +namespace = zaqar.transport.validation namespace = keystoneclient.middleware.auth_token \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index f71a06e1a..8b728f6ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,37 +37,37 @@ console_scripts = marconi-server = zaqar.cmd.server:run zaqar-gc = zaqar.cmd.gc:run -zaqar.queues.data.storage = +zaqar.data.storage = # NOTE(flaper87): sqlite points to sqla for backwards compatibility - sqlite = zaqar.queues.storage.sqlalchemy.driver:DataDriver - sqlalchemy = zaqar.queues.storage.sqlalchemy.driver:DataDriver - mongodb = zaqar.queues.storage.mongodb.driver:DataDriver - redis = zaqar.queues.storage.redis.driver:DataDriver + sqlite = zaqar.storage.sqlalchemy.driver:DataDriver + sqlalchemy = zaqar.storage.sqlalchemy.driver:DataDriver + mongodb = zaqar.storage.mongodb.driver:DataDriver + redis = zaqar.storage.redis.driver:DataDriver faulty = zaqar.tests.faulty_storage:DataDriver -zaqar.queues.control.storage = - sqlite = zaqar.queues.storage.sqlalchemy.driver:ControlDriver - sqlalchemy = zaqar.queues.storage.sqlalchemy.driver:ControlDriver - mongodb = zaqar.queues.storage.mongodb.driver:ControlDriver - redis = zaqar.queues.storage.redis.driver:ControlDriver +zaqar.control.storage = + sqlite = zaqar.storage.sqlalchemy.driver:ControlDriver + sqlalchemy = zaqar.storage.sqlalchemy.driver:ControlDriver + mongodb = zaqar.storage.mongodb.driver:ControlDriver + redis = zaqar.storage.redis.driver:ControlDriver faulty = zaqar.tests.faulty_storage:ControlDriver -zaqar.queues.transport = - wsgi = zaqar.queues.transport.wsgi.driver:Driver +zaqar.transport = + wsgi = zaqar.transport.wsgi.driver:Driver zaqar.openstack.common.cache.backends = memory = zaqar.openstack.common.cache._backends.memory:MemoryBackend oslo.config.opts = - zaqar.queues.bootstrap = zaqar.queues.bootstrap:_config_options - zaqar.queues.storage.pipeline = zaqar.queues.storage.pipeline:_config_options - zaqar.queues.storage.pooling = zaqar.queues.storage.pooling:_config_options - zaqar.queues.storage.mongodb = zaqar.queues.storage.mongodb.options:_config_options - zaqar.queues.storage.redis = zaqar.queues.storage.redis.options:_config_options - zaqar.queues.storage.sqlalchemy = zaqar.queues.storage.sqlalchemy.options:_config_options - zaqar.queues.transport.wsgi = zaqar.queues.transport.wsgi.driver:_config_options - zaqar.queues.transport.base = zaqar.queues.transport.base:_config_options - zaqar.queues.transport.validation = zaqar.queues.transport.validation:_config_options + zaqar.bootstrap = zaqar.bootstrap:_config_options + zaqar.storage.pipeline = zaqar.storage.pipeline:_config_options + zaqar.storage.pooling = zaqar.storage.pooling:_config_options + zaqar.storage.mongodb = zaqar.storage.mongodb.options:_config_options + zaqar.storage.redis = zaqar.storage.redis.options:_config_options + zaqar.storage.sqlalchemy = zaqar.storage.sqlalchemy.options:_config_options + zaqar.transport.wsgi = zaqar.transport.wsgi.driver:_config_options + zaqar.transport.base = zaqar.transport.base:_config_options + zaqar.transport.validation = zaqar.transport.validation:_config_options [nosetests] where=tests diff --git a/tests/unit/common/storage/test_utils.py b/tests/unit/common/storage/test_utils.py index 765de09e4..4769bf6e4 100644 --- a/tests/unit/common/storage/test_utils.py +++ b/tests/unit/common/storage/test_utils.py @@ -15,8 +15,8 @@ import ddt -from zaqar.queues import bootstrap -from zaqar.queues.storage import utils +from zaqar import bootstrap +from zaqar.storage import utils from zaqar import tests as testing diff --git a/tests/unit/queues/storage/test_impl_mongodb.py b/tests/unit/queues/storage/test_impl_mongodb.py index e0426f6d2..013d7b8f7 100644 --- a/tests/unit/queues/storage/test_impl_mongodb.py +++ b/tests/unit/queues/storage/test_impl_mongodb.py @@ -25,15 +25,15 @@ import pymongo.errors import six from testtools import matchers +from zaqar import bootstrap from zaqar.openstack.common.cache import cache as oslo_cache -from zaqar.queues import bootstrap -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage import mongodb -from zaqar.queues.storage.mongodb import controllers -from zaqar.queues.storage.mongodb import options -from zaqar.queues.storage.mongodb import utils -from zaqar.queues.storage import pooling +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage import mongodb +from zaqar.storage.mongodb import controllers +from zaqar.storage.mongodb import options +from zaqar.storage.mongodb import utils +from zaqar.storage import pooling from zaqar import tests as testing from zaqar.tests.queues.storage import base diff --git a/tests/unit/queues/storage/test_impl_redis.py b/tests/unit/queues/storage/test_impl_redis.py index 2f45f5ece..aa226a6c3 100644 --- a/tests/unit/queues/storage/test_impl_redis.py +++ b/tests/unit/queues/storage/test_impl_redis.py @@ -22,12 +22,12 @@ import redis from zaqar.common import errors from zaqar.openstack.common.cache import cache as oslo_cache -from zaqar.queues import storage -from zaqar.queues.storage.redis import controllers -from zaqar.queues.storage.redis import driver -from zaqar.queues.storage.redis import messages -from zaqar.queues.storage.redis import options -from zaqar.queues.storage.redis import utils +from zaqar import storage +from zaqar.storage.redis import controllers +from zaqar.storage.redis import driver +from zaqar.storage.redis import messages +from zaqar.storage.redis import options +from zaqar.storage.redis import utils from zaqar import tests as testing from zaqar.tests.queues.storage import base diff --git a/tests/unit/queues/storage/test_impl_sqlalchemy.py b/tests/unit/queues/storage/test_impl_sqlalchemy.py index b690ca8a1..13e610600 100644 --- a/tests/unit/queues/storage/test_impl_sqlalchemy.py +++ b/tests/unit/queues/storage/test_impl_sqlalchemy.py @@ -19,11 +19,11 @@ import six import sqlalchemy as sa from sqlalchemy.sql import func as sfunc -from zaqar.queues.storage import pooling -from zaqar.queues.storage import sqlalchemy -from zaqar.queues.storage.sqlalchemy import controllers -from zaqar.queues.storage.sqlalchemy import tables -from zaqar.queues.storage.sqlalchemy import utils +from zaqar.storage import pooling +from zaqar.storage import sqlalchemy +from zaqar.storage.sqlalchemy import controllers +from zaqar.storage.sqlalchemy import tables +from zaqar.storage.sqlalchemy import utils from zaqar import tests as testing from zaqar.tests.queues.storage import base diff --git a/tests/unit/queues/storage/test_pool_catalog.py b/tests/unit/queues/storage/test_pool_catalog.py index 861e9784b..ab9820afc 100644 --- a/tests/unit/queues/storage/test_pool_catalog.py +++ b/tests/unit/queues/storage/test_pool_catalog.py @@ -17,10 +17,10 @@ import uuid from oslo.config import cfg from zaqar.openstack.common.cache import cache as oslo_cache -from zaqar.queues.storage import errors -from zaqar.queues.storage import pooling -from zaqar.queues.storage import sqlalchemy -from zaqar.queues.storage import utils +from zaqar.storage import errors +from zaqar.storage import pooling +from zaqar.storage import sqlalchemy +from zaqar.storage import utils from zaqar import tests as testing diff --git a/tests/unit/queues/storage/test_pool_queues.py b/tests/unit/queues/storage/test_pool_queues.py index 144044d31..0c961983b 100644 --- a/tests/unit/queues/storage/test_pool_queues.py +++ b/tests/unit/queues/storage/test_pool_queues.py @@ -19,8 +19,8 @@ from oslo.config import cfg import six from zaqar.openstack.common.cache import cache as oslo_cache -from zaqar.queues.storage import pooling -from zaqar.queues.storage import utils +from zaqar.storage import pooling +from zaqar.storage import utils from zaqar import tests as testing diff --git a/tests/unit/queues/transport/test_auth.py b/tests/unit/queues/transport/test_auth.py index 9715aeaad..3ae031c0a 100644 --- a/tests/unit/queues/transport/test_auth.py +++ b/tests/unit/queues/transport/test_auth.py @@ -17,8 +17,8 @@ from oslo.config import cfg -from zaqar.queues.transport import auth from zaqar import tests as testing +from zaqar.transport import auth class TestTransportAuth(testing.TestBase): diff --git a/tests/unit/queues/transport/wsgi/test_utils.py b/tests/unit/queues/transport/wsgi/test_utils.py index 894b25cf1..3893fd8d7 100644 --- a/tests/unit/queues/transport/wsgi/test_utils.py +++ b/tests/unit/queues/transport/wsgi/test_utils.py @@ -19,7 +19,7 @@ import falcon import six import testtools -from zaqar.queues.transport.wsgi import utils +from zaqar.transport.wsgi import utils class TestUtils(testtools.TestCase): diff --git a/tests/unit/test_bootstrap.py b/tests/unit/test_bootstrap.py index a0ba8c157..6594bf3e4 100644 --- a/tests/unit/test_bootstrap.py +++ b/tests/unit/test_bootstrap.py @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +from zaqar import bootstrap from zaqar.common import errors -from zaqar.queues import bootstrap -from zaqar.queues.storage import pipeline -from zaqar.queues.storage import pooling -from zaqar.queues.storage import sqlalchemy -from zaqar.queues.transport import wsgi +from zaqar.storage import pipeline +from zaqar.storage import pooling +from zaqar.storage import sqlalchemy from zaqar.tests import base +from zaqar.transport import wsgi class TestBootstrap(base.TestBase): diff --git a/zaqar/__init__.py b/zaqar/__init__.py index 8561dda9b..4819a0259 100644 --- a/zaqar/__init__.py +++ b/zaqar/__init__.py @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import zaqar.queues.bootstrap +import zaqar.bootstrap import zaqar.version -Bootstrap = zaqar.queues.bootstrap.Bootstrap +Bootstrap = zaqar.bootstrap.Bootstrap __version__ = zaqar.version.version_info.cached_version_string() diff --git a/zaqar/queues/__init__.py b/zaqar/api/__init__.py similarity index 100% rename from zaqar/queues/__init__.py rename to zaqar/api/__init__.py diff --git a/zaqar/queues/api/__init__.py b/zaqar/api/v1/__init__.py similarity index 100% rename from zaqar/queues/api/__init__.py rename to zaqar/api/v1/__init__.py diff --git a/zaqar/queues/api/v1/request.py b/zaqar/api/v1/request.py similarity index 100% rename from zaqar/queues/api/v1/request.py rename to zaqar/api/v1/request.py diff --git a/zaqar/queues/api/v1/response.py b/zaqar/api/v1/response.py similarity index 100% rename from zaqar/queues/api/v1/response.py rename to zaqar/api/v1/response.py diff --git a/zaqar/queues/api/v1/__init__.py b/zaqar/api/v1_1/__init__.py similarity index 100% rename from zaqar/queues/api/v1/__init__.py rename to zaqar/api/v1_1/__init__.py diff --git a/zaqar/queues/api/v1_1/request.py b/zaqar/api/v1_1/request.py similarity index 100% rename from zaqar/queues/api/v1_1/request.py rename to zaqar/api/v1_1/request.py diff --git a/zaqar/queues/api/v1_1/response.py b/zaqar/api/v1_1/response.py similarity index 100% rename from zaqar/queues/api/v1_1/response.py rename to zaqar/api/v1_1/response.py diff --git a/zaqar/queues/bootstrap.py b/zaqar/bootstrap.py similarity index 95% rename from zaqar/queues/bootstrap.py rename to zaqar/bootstrap.py index b6139cd58..f0a1f0ee9 100644 --- a/zaqar/queues/bootstrap.py +++ b/zaqar/bootstrap.py @@ -21,9 +21,9 @@ from zaqar.common import errors from zaqar.i18n import _ from zaqar.openstack.common.cache import cache as oslo_cache from zaqar.openstack.common import log -from zaqar.queues.storage import pipeline -from zaqar.queues.storage import pooling -from zaqar.queues.storage import utils as storage_utils +from zaqar.storage import pipeline +from zaqar.storage import pooling +from zaqar.storage import utils as storage_utils LOG = log.getLogger(__name__) @@ -137,7 +137,7 @@ class Bootstrap(object): ] try: - mgr = driver.DriverManager('zaqar.queues.transport', + mgr = driver.DriverManager('zaqar.transport', transport_name, invoke_on_load=True, invoke_args=args) diff --git a/zaqar/cmd/gc.py b/zaqar/cmd/gc.py index 669d8661a..bcb9b3033 100644 --- a/zaqar/cmd/gc.py +++ b/zaqar/cmd/gc.py @@ -13,9 +13,9 @@ from oslo.config import cfg +from zaqar import bootstrap from zaqar.common import cli from zaqar.openstack.common import log -from zaqar.queues import bootstrap LOG = log.getLogger(__name__) diff --git a/zaqar/cmd/server.py b/zaqar/cmd/server.py index bf0e37dab..158423b60 100644 --- a/zaqar/cmd/server.py +++ b/zaqar/cmd/server.py @@ -16,8 +16,8 @@ import os from oslo.config import cfg +from zaqar import bootstrap from zaqar.common import cli -from zaqar.queues import bootstrap @cli.runnable diff --git a/zaqar/common/transport/wsgi/helpers.py b/zaqar/common/transport/wsgi/helpers.py index 1f50eb5fb..7a60f1496 100644 --- a/zaqar/common/transport/wsgi/helpers.py +++ b/zaqar/common/transport/wsgi/helpers.py @@ -23,7 +23,7 @@ import six from zaqar import context from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.transport import validation +from zaqar.transport import validation LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/zmq/__init__.py b/zaqar/queues/transport/zmq/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/zaqar/queues/storage/__init__.py b/zaqar/storage/__init__.py similarity index 92% rename from zaqar/queues/storage/__init__.py rename to zaqar/storage/__init__.py index e20ca3dae..b68737ba6 100644 --- a/zaqar/queues/storage/__init__.py +++ b/zaqar/storage/__init__.py @@ -13,8 +13,8 @@ """Zaqar Storage Drivers""" -from zaqar.queues.storage import base -from zaqar.queues.storage import errors # NOQA +from zaqar.storage import base +from zaqar.storage import errors # NOQA # Hoist classes into package namespace ControlDriverBase = base.ControlDriverBase diff --git a/zaqar/queues/storage/base.py b/zaqar/storage/base.py similarity index 100% rename from zaqar/queues/storage/base.py rename to zaqar/storage/base.py diff --git a/zaqar/queues/storage/errors.py b/zaqar/storage/errors.py similarity index 100% rename from zaqar/queues/storage/errors.py rename to zaqar/storage/errors.py diff --git a/zaqar/queues/storage/mongodb/__init__.py b/zaqar/storage/mongodb/__init__.py similarity index 97% rename from zaqar/queues/storage/mongodb/__init__.py rename to zaqar/storage/mongodb/__init__.py index 7c55a2f8c..4433b5e6b 100644 --- a/zaqar/queues/storage/mongodb/__init__.py +++ b/zaqar/storage/mongodb/__init__.py @@ -56,7 +56,7 @@ Sharded Cluster TBD """ -from zaqar.queues.storage.mongodb import driver +from zaqar.storage.mongodb import driver # Hoist classes into package namespace ControlDriver = driver.ControlDriver diff --git a/zaqar/queues/storage/mongodb/catalogue.py b/zaqar/storage/mongodb/catalogue.py similarity index 96% rename from zaqar/queues/storage/mongodb/catalogue.py rename to zaqar/storage/mongodb/catalogue.py index fa9c2ad07..e95e9392f 100644 --- a/zaqar/queues/storage/mongodb/catalogue.py +++ b/zaqar/storage/mongodb/catalogue.py @@ -26,9 +26,9 @@ Serves to construct an association between a project + queue -> pool. """ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import base -from zaqar.queues.storage import errors -from zaqar.queues.storage.mongodb import utils +from zaqar.storage import base +from zaqar.storage import errors +from zaqar.storage.mongodb import utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/mongodb/claims.py b/zaqar/storage/mongodb/claims.py similarity index 98% rename from zaqar/queues/storage/mongodb/claims.py rename to zaqar/storage/mongodb/claims.py index 8d35850ca..fde6d82f9 100644 --- a/zaqar/queues/storage/mongodb/claims.py +++ b/zaqar/storage/mongodb/claims.py @@ -27,9 +27,9 @@ from bson import objectid from oslo.utils import timeutils import zaqar.openstack.common.log as logging -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.mongodb import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.mongodb import utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/mongodb/controllers.py b/zaqar/storage/mongodb/controllers.py similarity index 79% rename from zaqar/queues/storage/mongodb/controllers.py rename to zaqar/storage/mongodb/controllers.py index 246b2b6ba..37e426fe8 100644 --- a/zaqar/queues/storage/mongodb/controllers.py +++ b/zaqar/storage/mongodb/controllers.py @@ -22,12 +22,12 @@ Field Mappings: updated and documented in each controller class. """ -from zaqar.queues.storage.mongodb import catalogue -from zaqar.queues.storage.mongodb import claims -from zaqar.queues.storage.mongodb import flavors -from zaqar.queues.storage.mongodb import messages -from zaqar.queues.storage.mongodb import pools -from zaqar.queues.storage.mongodb import queues +from zaqar.storage.mongodb import catalogue +from zaqar.storage.mongodb import claims +from zaqar.storage.mongodb import flavors +from zaqar.storage.mongodb import messages +from zaqar.storage.mongodb import pools +from zaqar.storage.mongodb import queues CatalogueController = catalogue.CatalogueController diff --git a/zaqar/queues/storage/mongodb/driver.py b/zaqar/storage/mongodb/driver.py similarity index 98% rename from zaqar/queues/storage/mongodb/driver.py rename to zaqar/storage/mongodb/driver.py index a8e810726..c7c4021c0 100644 --- a/zaqar/queues/storage/mongodb/driver.py +++ b/zaqar/storage/mongodb/driver.py @@ -23,9 +23,9 @@ import pymongo.errors from zaqar.common import decorators from zaqar.i18n import _ from zaqar.openstack.common import log as logging -from zaqar.queues import storage -from zaqar.queues.storage.mongodb import controllers -from zaqar.queues.storage.mongodb import options +from zaqar import storage +from zaqar.storage.mongodb import controllers +from zaqar.storage.mongodb import options LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/mongodb/flavors.py b/zaqar/storage/mongodb/flavors.py similarity index 97% rename from zaqar/queues/storage/mongodb/flavors.py rename to zaqar/storage/mongodb/flavors.py index d08eb44d4..c057bc9bd 100644 --- a/zaqar/queues/storage/mongodb/flavors.py +++ b/zaqar/storage/mongodb/flavors.py @@ -22,9 +22,9 @@ Schema: import functools -from zaqar.queues.storage import base -from zaqar.queues.storage import errors -from zaqar.queues.storage.mongodb import utils +from zaqar.storage import base +from zaqar.storage import errors +from zaqar.storage.mongodb import utils FLAVORS_INDEX = [ ('p', 1), diff --git a/zaqar/queues/storage/mongodb/messages.py b/zaqar/storage/mongodb/messages.py similarity index 99% rename from zaqar/queues/storage/mongodb/messages.py rename to zaqar/storage/mongodb/messages.py index 87a689217..aa4600314 100644 --- a/zaqar/queues/storage/mongodb/messages.py +++ b/zaqar/storage/mongodb/messages.py @@ -31,9 +31,9 @@ import pymongo.read_preferences from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.mongodb import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.mongodb import utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/mongodb/options.py b/zaqar/storage/mongodb/options.py similarity index 100% rename from zaqar/queues/storage/mongodb/options.py rename to zaqar/storage/mongodb/options.py diff --git a/zaqar/queues/storage/mongodb/pools.py b/zaqar/storage/mongodb/pools.py similarity index 97% rename from zaqar/queues/storage/mongodb/pools.py rename to zaqar/storage/mongodb/pools.py index c1cccce12..80704486f 100644 --- a/zaqar/queues/storage/mongodb/pools.py +++ b/zaqar/storage/mongodb/pools.py @@ -25,9 +25,9 @@ Schema: import functools from zaqar.common import utils as common_utils -from zaqar.queues.storage import base -from zaqar.queues.storage import errors -from zaqar.queues.storage.mongodb import utils +from zaqar.storage import base +from zaqar.storage import errors +from zaqar.storage.mongodb import utils POOLS_INDEX = [ ('n', 1) diff --git a/zaqar/queues/storage/mongodb/queues.py b/zaqar/storage/mongodb/queues.py similarity index 98% rename from zaqar/queues/storage/mongodb/queues.py rename to zaqar/storage/mongodb/queues.py index 8966aa14e..5bcfe77ef 100644 --- a/zaqar/queues/storage/mongodb/queues.py +++ b/zaqar/storage/mongodb/queues.py @@ -27,9 +27,9 @@ import pymongo.errors from zaqar.common import decorators from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.mongodb import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.mongodb import utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/mongodb/utils.py b/zaqar/storage/mongodb/utils.py similarity index 99% rename from zaqar/queues/storage/mongodb/utils.py rename to zaqar/storage/mongodb/utils.py index 3e75161c2..784c91515 100644 --- a/zaqar/queues/storage/mongodb/utils.py +++ b/zaqar/storage/mongodb/utils.py @@ -29,7 +29,7 @@ from pymongo import errors from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors +from zaqar.storage import errors as storage_errors # BSON ObjectId gives TZ-aware datetime, so we generate a diff --git a/zaqar/queues/storage/pipeline.py b/zaqar/storage/pipeline.py similarity index 97% rename from zaqar/queues/storage/pipeline.py rename to zaqar/storage/pipeline.py index 131ba6d92..0513c1f9c 100644 --- a/zaqar/queues/storage/pipeline.py +++ b/zaqar/storage/pipeline.py @@ -19,7 +19,7 @@ from zaqar import common from zaqar.common import decorators from zaqar.i18n import _ from zaqar.openstack.common import log as logging -from zaqar.queues.storage import base +from zaqar.storage import base LOG = logging.getLogger(__name__) @@ -70,7 +70,7 @@ def _get_storage_pipeline(resource_name, conf): pipeline = [] for ns in storage_conf[resource_name + '_pipeline']: try: - mgr = driver.DriverManager('zaqar.queues.storage.stages', + mgr = driver.DriverManager('zaqar.storage.stages', ns, invoke_on_load=True) pipeline.append(mgr.driver) except RuntimeError as exc: diff --git a/zaqar/queues/storage/pooling.py b/zaqar/storage/pooling.py similarity index 98% rename from zaqar/queues/storage/pooling.py rename to zaqar/storage/pooling.py index 3b137590e..66dbe9d5d 100644 --- a/zaqar/queues/storage/pooling.py +++ b/zaqar/storage/pooling.py @@ -21,9 +21,9 @@ from oslo.config import cfg from zaqar.common import decorators from zaqar.common.storage import select from zaqar.openstack.common import log -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage import utils LOG = log.getLogger(__name__) @@ -400,7 +400,7 @@ class Catalog(object): :param pool_id: The name of a pool. :type pool_id: six.text_type :returns: a storage driver - :rtype: zaqar.queues.storage.base.DataDriverBase + :rtype: zaqar.storage.base.DataDriverBase """ pool = self._pools_ctrl.get(pool_id, detailed=True) conf = utils.dynamic_conf(pool['uri'], pool['options'], @@ -514,7 +514,7 @@ class Catalog(object): :param pool_id: The name of a pool. :type pool_id: six.text_type :returns: a storage driver - :rtype: zaqar.queues.storage.base.DataDriver + :rtype: zaqar.storage.base.DataDriver """ try: diff --git a/zaqar/queues/api/v1_1/__init__.py b/zaqar/storage/redis/__init__.py similarity index 100% rename from zaqar/queues/api/v1_1/__init__.py rename to zaqar/storage/redis/__init__.py diff --git a/zaqar/queues/storage/redis/claims.py b/zaqar/storage/redis/claims.py similarity index 98% rename from zaqar/queues/storage/redis/claims.py rename to zaqar/storage/redis/claims.py index e4db5fcc6..25503d226 100644 --- a/zaqar/queues/storage/redis/claims.py +++ b/zaqar/storage/redis/claims.py @@ -19,11 +19,11 @@ from oslo.utils import timeutils from zaqar.common import decorators from zaqar.openstack.common import log as logging -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.redis import messages -from zaqar.queues.storage.redis import scripting -from zaqar.queues.storage.redis import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.redis import messages +from zaqar.storage.redis import scripting +from zaqar.storage.redis import utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/redis/controllers.py b/zaqar/storage/redis/controllers.py similarity index 83% rename from zaqar/queues/storage/redis/controllers.py rename to zaqar/storage/redis/controllers.py index 07b55cb4c..ac76eb35d 100644 --- a/zaqar/queues/storage/redis/controllers.py +++ b/zaqar/storage/redis/controllers.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from zaqar.queues.storage.redis import claims -from zaqar.queues.storage.redis import messages -from zaqar.queues.storage.redis import queues +from zaqar.storage.redis import claims +from zaqar.storage.redis import messages +from zaqar.storage.redis import queues QueueController = queues.QueueController diff --git a/zaqar/queues/storage/redis/driver.py b/zaqar/storage/redis/driver.py similarity index 98% rename from zaqar/queues/storage/redis/driver.py rename to zaqar/storage/redis/driver.py index 660422b32..42eedf4d6 100644 --- a/zaqar/queues/storage/redis/driver.py +++ b/zaqar/storage/redis/driver.py @@ -19,9 +19,9 @@ from zaqar.common import decorators from zaqar.common import errors from zaqar.i18n import _ from zaqar.openstack.common import log as logging -from zaqar.queues import storage -from zaqar.queues.storage.redis import controllers -from zaqar.queues.storage.redis import options +from zaqar import storage +from zaqar.storage.redis import controllers +from zaqar.storage.redis import options LOG = logging.getLogger(__name__) REDIS_DEFAULT_PORT = 6379 diff --git a/zaqar/queues/storage/redis/messages.py b/zaqar/storage/redis/messages.py similarity index 98% rename from zaqar/queues/storage/redis/messages.py rename to zaqar/storage/redis/messages.py index 67c09f034..42b524a6f 100644 --- a/zaqar/queues/storage/redis/messages.py +++ b/zaqar/storage/redis/messages.py @@ -19,11 +19,11 @@ from oslo.utils import encodeutils from oslo.utils import timeutils from zaqar.common import decorators -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.redis import models -from zaqar.queues.storage.redis import scripting -from zaqar.queues.storage.redis import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.redis import models +from zaqar.storage.redis import scripting +from zaqar.storage.redis import utils Message = models.Message MessageEnvelope = models.MessageEnvelope diff --git a/zaqar/queues/storage/redis/models.py b/zaqar/storage/redis/models.py similarity index 100% rename from zaqar/queues/storage/redis/models.py rename to zaqar/storage/redis/models.py diff --git a/zaqar/queues/storage/redis/options.py b/zaqar/storage/redis/options.py similarity index 100% rename from zaqar/queues/storage/redis/options.py rename to zaqar/storage/redis/options.py diff --git a/zaqar/queues/storage/redis/queues.py b/zaqar/storage/redis/queues.py similarity index 98% rename from zaqar/queues/storage/redis/queues.py rename to zaqar/storage/redis/queues.py index 6ba6a14e5..afc649848 100644 --- a/zaqar/queues/storage/redis/queues.py +++ b/zaqar/storage/redis/queues.py @@ -20,9 +20,9 @@ import redis from zaqar.common import decorators from zaqar.openstack.common import log as logging -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.redis import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.redis import utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/redis/scripting.py b/zaqar/storage/redis/scripting.py similarity index 100% rename from zaqar/queues/storage/redis/scripting.py rename to zaqar/storage/redis/scripting.py diff --git a/zaqar/queues/storage/redis/scripts/claim_messages.lua b/zaqar/storage/redis/scripts/claim_messages.lua similarity index 100% rename from zaqar/queues/storage/redis/scripts/claim_messages.lua rename to zaqar/storage/redis/scripts/claim_messages.lua diff --git a/zaqar/queues/storage/redis/scripts/index_messages.lua b/zaqar/storage/redis/scripts/index_messages.lua similarity index 100% rename from zaqar/queues/storage/redis/scripts/index_messages.lua rename to zaqar/storage/redis/scripts/index_messages.lua diff --git a/zaqar/queues/storage/redis/utils.py b/zaqar/storage/redis/utils.py similarity index 99% rename from zaqar/queues/storage/redis/utils.py rename to zaqar/storage/redis/utils.py index 6482a80b1..5d19ec590 100644 --- a/zaqar/queues/storage/redis/utils.py +++ b/zaqar/storage/redis/utils.py @@ -23,7 +23,7 @@ import six from zaqar.i18n import _ from zaqar.openstack.common import log as logging -from zaqar.queues.storage import errors +from zaqar.storage import errors LOG = logging.getLogger(__name__) MESSAGE_IDS_SUFFIX = 'messages' diff --git a/zaqar/queues/storage/sqlalchemy/__init__.py b/zaqar/storage/sqlalchemy/__init__.py similarity index 93% rename from zaqar/queues/storage/sqlalchemy/__init__.py rename to zaqar/storage/sqlalchemy/__init__.py index f72a24c95..50184fad8 100644 --- a/zaqar/queues/storage/sqlalchemy/__init__.py +++ b/zaqar/storage/sqlalchemy/__init__.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from zaqar.queues.storage.sqlalchemy import driver +from zaqar.storage.sqlalchemy import driver # Hoist classes into package namespace ControlDriver = driver.ControlDriver diff --git a/zaqar/queues/storage/sqlalchemy/catalogue.py b/zaqar/storage/sqlalchemy/catalogue.py similarity index 95% rename from zaqar/queues/storage/sqlalchemy/catalogue.py rename to zaqar/storage/sqlalchemy/catalogue.py index 1c1698aad..d31fc3f4a 100644 --- a/zaqar/queues/storage/sqlalchemy/catalogue.py +++ b/zaqar/storage/sqlalchemy/catalogue.py @@ -24,9 +24,9 @@ queue: string import sqlalchemy as sa -from zaqar.queues.storage import base -from zaqar.queues.storage import errors -from zaqar.queues.storage.sqlalchemy import tables +from zaqar.storage import base +from zaqar.storage import errors +from zaqar.storage.sqlalchemy import tables def _match(project, queue): diff --git a/zaqar/queues/storage/sqlalchemy/claims.py b/zaqar/storage/sqlalchemy/claims.py similarity index 97% rename from zaqar/queues/storage/sqlalchemy/claims.py rename to zaqar/storage/sqlalchemy/claims.py index a0bfeadb0..2d1b92734 100644 --- a/zaqar/queues/storage/sqlalchemy/claims.py +++ b/zaqar/storage/sqlalchemy/claims.py @@ -17,10 +17,10 @@ from oslo.utils import timeutils import sqlalchemy as sa from sqlalchemy.sql import func as sfunc -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.sqlalchemy import tables -from zaqar.queues.storage.sqlalchemy import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.sqlalchemy import tables +from zaqar.storage.sqlalchemy import utils class ClaimController(storage.Claim): diff --git a/zaqar/queues/storage/sqlalchemy/controllers.py b/zaqar/storage/sqlalchemy/controllers.py similarity index 76% rename from zaqar/queues/storage/sqlalchemy/controllers.py rename to zaqar/storage/sqlalchemy/controllers.py index 63c8e0391..8a35d6b83 100644 --- a/zaqar/queues/storage/sqlalchemy/controllers.py +++ b/zaqar/storage/sqlalchemy/controllers.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations under # the License. -from zaqar.queues.storage.sqlalchemy import catalogue -from zaqar.queues.storage.sqlalchemy import claims -from zaqar.queues.storage.sqlalchemy import messages -from zaqar.queues.storage.sqlalchemy import pools -from zaqar.queues.storage.sqlalchemy import queues +from zaqar.storage.sqlalchemy import catalogue +from zaqar.storage.sqlalchemy import claims +from zaqar.storage.sqlalchemy import messages +from zaqar.storage.sqlalchemy import pools +from zaqar.storage.sqlalchemy import queues QueueController = queues.QueueController diff --git a/zaqar/queues/storage/sqlalchemy/driver.py b/zaqar/storage/sqlalchemy/driver.py similarity index 96% rename from zaqar/queues/storage/sqlalchemy/driver.py rename to zaqar/storage/sqlalchemy/driver.py index f7d640f09..f6d95bf71 100644 --- a/zaqar/queues/storage/sqlalchemy/driver.py +++ b/zaqar/storage/sqlalchemy/driver.py @@ -20,11 +20,11 @@ import sqlalchemy as sa from zaqar.common import decorators from zaqar.i18n import _ -from zaqar.queues import storage -from zaqar.queues.storage.sqlalchemy import controllers -from zaqar.queues.storage.sqlalchemy import options -from zaqar.queues.storage.sqlalchemy import tables -from zaqar.queues.storage.sqlalchemy import utils +from zaqar import storage +from zaqar.storage.sqlalchemy import controllers +from zaqar.storage.sqlalchemy import options +from zaqar.storage.sqlalchemy import tables +from zaqar.storage.sqlalchemy import utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/sqlalchemy/messages.py b/zaqar/storage/sqlalchemy/messages.py similarity index 98% rename from zaqar/queues/storage/sqlalchemy/messages.py rename to zaqar/storage/sqlalchemy/messages.py index 9f2d933d2..c6eb916a5 100644 --- a/zaqar/queues/storage/sqlalchemy/messages.py +++ b/zaqar/storage/sqlalchemy/messages.py @@ -19,10 +19,10 @@ from oslo.utils import timeutils import sqlalchemy as sa from sqlalchemy.sql import func as sfunc -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.sqlalchemy import tables -from zaqar.queues.storage.sqlalchemy import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.sqlalchemy import tables +from zaqar.storage.sqlalchemy import utils class MessageController(storage.Message): diff --git a/zaqar/queues/storage/sqlalchemy/options.py b/zaqar/storage/sqlalchemy/options.py similarity index 100% rename from zaqar/queues/storage/sqlalchemy/options.py rename to zaqar/storage/sqlalchemy/options.py diff --git a/zaqar/queues/storage/sqlalchemy/pools.py b/zaqar/storage/sqlalchemy/pools.py similarity index 96% rename from zaqar/queues/storage/sqlalchemy/pools.py rename to zaqar/storage/sqlalchemy/pools.py index 0fb8463d6..582fb9bbc 100644 --- a/zaqar/queues/storage/sqlalchemy/pools.py +++ b/zaqar/storage/sqlalchemy/pools.py @@ -27,10 +27,10 @@ import functools import sqlalchemy as sa from zaqar.common import utils as common_utils -from zaqar.queues.storage import base -from zaqar.queues.storage import errors -from zaqar.queues.storage.sqlalchemy import tables -from zaqar.queues.storage.sqlalchemy import utils +from zaqar.storage import base +from zaqar.storage import errors +from zaqar.storage.sqlalchemy import tables +from zaqar.storage.sqlalchemy import utils class PoolsController(base.PoolsBase): diff --git a/zaqar/queues/storage/sqlalchemy/queues.py b/zaqar/storage/sqlalchemy/queues.py similarity index 97% rename from zaqar/queues/storage/sqlalchemy/queues.py rename to zaqar/storage/sqlalchemy/queues.py index ca41b69b3..884fc7199 100644 --- a/zaqar/queues/storage/sqlalchemy/queues.py +++ b/zaqar/storage/sqlalchemy/queues.py @@ -15,10 +15,10 @@ import sqlalchemy as sa from sqlalchemy.sql import func as sfunc -from zaqar.queues import storage -from zaqar.queues.storage import errors -from zaqar.queues.storage.sqlalchemy import tables -from zaqar.queues.storage.sqlalchemy import utils +from zaqar import storage +from zaqar.storage import errors +from zaqar.storage.sqlalchemy import tables +from zaqar.storage.sqlalchemy import utils class QueueController(storage.Queue): diff --git a/zaqar/queues/storage/sqlalchemy/tables.py b/zaqar/storage/sqlalchemy/tables.py similarity index 100% rename from zaqar/queues/storage/sqlalchemy/tables.py rename to zaqar/storage/sqlalchemy/tables.py diff --git a/zaqar/queues/storage/sqlalchemy/utils.py b/zaqar/storage/sqlalchemy/utils.py similarity index 97% rename from zaqar/queues/storage/sqlalchemy/utils.py rename to zaqar/storage/sqlalchemy/utils.py index 9ebe36adf..5401cee1b 100644 --- a/zaqar/queues/storage/sqlalchemy/utils.py +++ b/zaqar/storage/sqlalchemy/utils.py @@ -22,8 +22,8 @@ from sqlalchemy.sql import func as sfunc from zaqar.openstack.common import jsonutils from zaqar.openstack.common import log as logging -from zaqar.queues.storage import errors -from zaqar.queues.storage.sqlalchemy import tables +from zaqar.storage import errors +from zaqar.storage.sqlalchemy import tables LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/utils.py b/zaqar/storage/utils.py similarity index 98% rename from zaqar/queues/storage/utils.py rename to zaqar/storage/utils.py index c56af70d5..3e7c55afa 100644 --- a/zaqar/queues/storage/utils.py +++ b/zaqar/storage/utils.py @@ -83,7 +83,7 @@ def load_storage_driver(conf, cache, storage_type=None, control_mode=False): """ mode = 'control' if control_mode else 'data' - driver_type = 'zaqar.queues.{0}.storage'.format(mode) + driver_type = 'zaqar.{0}.storage'.format(mode) storage_type = storage_type or conf['drivers'].storage try: diff --git a/zaqar/tests/base.py b/zaqar/tests/base.py index 9d3c9fe81..716baa747 100644 --- a/zaqar/tests/base.py +++ b/zaqar/tests/base.py @@ -20,7 +20,7 @@ from oslo.config import cfg import six import testtools -from zaqar.queues import bootstrap +from zaqar import bootstrap class TestBase(testtools.TestCase): diff --git a/zaqar/tests/faulty_storage.py b/zaqar/tests/faulty_storage.py index 0a26a2692..28eba2b02 100644 --- a/zaqar/tests/faulty_storage.py +++ b/zaqar/tests/faulty_storage.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from zaqar.queues import storage +from zaqar import storage class DataDriver(storage.DataDriverBase): diff --git a/zaqar/tests/functional/base.py b/zaqar/tests/functional/base.py index 2e370eb8f..abf71111c 100644 --- a/zaqar/tests/functional/base.py +++ b/zaqar/tests/functional/base.py @@ -22,19 +22,19 @@ import jsonschema from oslo.utils import timeutils import six -from zaqar.queues.api.v1 import response as response_v1 -from zaqar.queues.api.v1_1 import response as response_v1_1 -from zaqar.queues import bootstrap -from zaqar.queues.transport import base as transport_base -# TODO(flaper87): This is necessary to register, -# wsgi configs and won't be permanent. It'll be -# refactored as part of the work for this blueprint -from zaqar.queues.transport import validation -from zaqar.queues.transport import wsgi # noqa +from zaqar.api.v1 import response as response_v1 +from zaqar.api.v1_1 import response as response_v1_1 +from zaqar import bootstrap from zaqar import tests as testing from zaqar.tests.functional import config from zaqar.tests.functional import helpers from zaqar.tests.functional import http +from zaqar.transport import base as transport_base +# TODO(flaper87): This is necessary to register, +# wsgi configs and won't be permanent. It'll be +# refactored as part of the work for this blueprint +from zaqar.transport import validation +from zaqar.transport import wsgi # noqa # TODO(kgriffs): Run functional tests to a devstack gate job and # set this using an environment variable or something. diff --git a/zaqar/tests/queues/storage/base.py b/zaqar/tests/queues/storage/base.py index f7af26d6e..24249fa38 100644 --- a/zaqar/tests/queues/storage/base.py +++ b/zaqar/tests/queues/storage/base.py @@ -25,8 +25,8 @@ import six from testtools import matchers from zaqar.openstack.common.cache import cache as oslo_cache -from zaqar.queues import storage -from zaqar.queues.storage import errors +from zaqar import storage +from zaqar.storage import errors from zaqar import tests as testing from zaqar.tests import helpers diff --git a/zaqar/tests/queues/transport/wsgi/base.py b/zaqar/tests/queues/transport/wsgi/base.py index d391620a2..2e8ecaf3c 100644 --- a/zaqar/tests/queues/transport/wsgi/base.py +++ b/zaqar/tests/queues/transport/wsgi/base.py @@ -16,11 +16,11 @@ import uuid from falcon import testing as ftest +from zaqar import bootstrap from zaqar.openstack.common import jsonutils -from zaqar.queues import bootstrap -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import driver from zaqar import tests as testing +from zaqar.transport import validation +from zaqar.transport.wsgi import driver class TestBase(testing.TestBase): diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py b/zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py index e0c1c30ee..575dfcf15 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py +++ b/zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py @@ -19,7 +19,7 @@ import uuid import falcon from zaqar.openstack.common import jsonutils -from zaqar.queues import storage +from zaqar import storage from zaqar.tests.queues.transport.wsgi import base diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_messages.py b/zaqar/tests/queues/transport/wsgi/v1/test_messages.py index a4559b6c0..ae07d3c65 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_messages.py +++ b/zaqar/tests/queues/transport/wsgi/v1/test_messages.py @@ -24,9 +24,9 @@ import six from testtools import matchers from zaqar.openstack.common import jsonutils -from zaqar.queues.transport import validation from zaqar import tests as testing from zaqar.tests.queues.transport.wsgi import base +from zaqar.transport import validation @ddt.ddt diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py index 586eb3611..a0e1b5142 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py +++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py @@ -19,7 +19,7 @@ import uuid import falcon from zaqar.openstack.common import jsonutils -from zaqar.queues import storage +from zaqar import storage from zaqar.tests.queues.transport.wsgi import base diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_health.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_health.py index f405b70f9..2693e9519 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_health.py +++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_health.py @@ -19,8 +19,8 @@ import falcon import mock from zaqar.openstack.common import jsonutils -from zaqar.queues.storage import errors -import zaqar.queues.storage.mongodb as mongo +from zaqar.storage import errors +import zaqar.storage.mongodb as mongo from zaqar import tests as testing from zaqar.tests.queues.transport.wsgi import base diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py index 3908a9c5a..6c4acf125 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py +++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py @@ -24,9 +24,9 @@ import six from testtools import matchers from zaqar.openstack.common import jsonutils -from zaqar.queues.transport import validation from zaqar import tests as testing from zaqar.tests.queues.transport.wsgi import base +from zaqar.transport import validation @ddt.ddt diff --git a/zaqar/queues/transport/__init__.py b/zaqar/transport/__init__.py similarity index 94% rename from zaqar/queues/transport/__init__.py rename to zaqar/transport/__init__.py index 9fd50dff7..8d2bfde78 100644 --- a/zaqar/queues/transport/__init__.py +++ b/zaqar/transport/__init__.py @@ -13,7 +13,7 @@ """Zaqar Transport Drivers""" -from zaqar.queues.transport import base +from zaqar.transport import base # Hoist into package namespace DriverBase = base.DriverBase diff --git a/zaqar/queues/transport/auth.py b/zaqar/transport/auth.py similarity index 100% rename from zaqar/queues/transport/auth.py rename to zaqar/transport/auth.py diff --git a/zaqar/queues/transport/base.py b/zaqar/transport/base.py similarity index 95% rename from zaqar/queues/transport/base.py rename to zaqar/transport/base.py index 8240ecbb1..62df6bfb4 100644 --- a/zaqar/queues/transport/base.py +++ b/zaqar/transport/base.py @@ -71,11 +71,11 @@ class DriverBase(object): :param conf: configuration instance :type conf: oslo.config.cfg.CONF :param storage: The storage driver - :type storage: zaqar.queues.storage.base.DataDriverBase + :type storage: zaqar.storage.base.DataDriverBase :param cache: caching object :type cache: zaqar.openstack.common.cache.backends.BaseCache :param control: Storage driver to handle the control plane - :type control: zaqar.queues.storage.base.ControlDriverBase + :type control: zaqar.storage.base.ControlDriverBase """ def __init__(self, conf, storage, cache, control): diff --git a/zaqar/queues/transport/utils.py b/zaqar/transport/utils.py similarity index 100% rename from zaqar/queues/transport/utils.py rename to zaqar/transport/utils.py diff --git a/zaqar/queues/transport/validation.py b/zaqar/transport/validation.py similarity index 100% rename from zaqar/queues/transport/validation.py rename to zaqar/transport/validation.py diff --git a/zaqar/queues/transport/wsgi/__init__.py b/zaqar/transport/wsgi/__init__.py similarity index 93% rename from zaqar/queues/transport/wsgi/__init__.py rename to zaqar/transport/wsgi/__init__.py index 7ebc3bfa1..dacc59271 100644 --- a/zaqar/queues/transport/wsgi/__init__.py +++ b/zaqar/transport/wsgi/__init__.py @@ -13,7 +13,7 @@ """WSGI Transport Driver""" -from zaqar.queues.transport.wsgi import driver +from zaqar.transport.wsgi import driver # Hoist into package namespace Driver = driver.Driver diff --git a/zaqar/queues/transport/wsgi/app.py b/zaqar/transport/wsgi/app.py similarity index 93% rename from zaqar/queues/transport/wsgi/app.py rename to zaqar/transport/wsgi/app.py index 023121587..589d400ba 100644 --- a/zaqar/queues/transport/wsgi/app.py +++ b/zaqar/transport/wsgi/app.py @@ -18,7 +18,7 @@ This app should be used by external WSGI containers. For example: - $ gunicorn zaqar.queues.transport.wsgi.app:app + $ gunicorn zaqar.transport.wsgi.app:app NOTE: As for external containers, it is necessary to put config files in the standard paths. There's @@ -28,7 +28,7 @@ to the WSGI app when it is called from other apps. from oslo.config import cfg -from zaqar.queues import bootstrap +from zaqar import bootstrap # TODO(kgriffs): For now, we have to use the global config # to pick up common options from openstack.common.log, since diff --git a/zaqar/queues/transport/wsgi/driver.py b/zaqar/transport/wsgi/driver.py similarity index 94% rename from zaqar/queues/transport/wsgi/driver.py rename to zaqar/transport/wsgi/driver.py index 09ce89c7e..f4161b6bd 100644 --- a/zaqar/queues/transport/wsgi/driver.py +++ b/zaqar/transport/wsgi/driver.py @@ -23,11 +23,11 @@ from zaqar.common import decorators from zaqar.common.transport.wsgi import helpers from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues import transport -from zaqar.queues.transport import auth -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import v1_0 -from zaqar.queues.transport.wsgi import v1_1 +from zaqar import transport +from zaqar.transport import auth +from zaqar.transport import validation +from zaqar.transport.wsgi import v1_0 +from zaqar.transport.wsgi import v1_1 _WSGI_OPTIONS = ( cfg.StrOpt('bind', default='127.0.0.1', diff --git a/zaqar/queues/transport/wsgi/errors.py b/zaqar/transport/wsgi/errors.py similarity index 100% rename from zaqar/queues/transport/wsgi/errors.py rename to zaqar/transport/wsgi/errors.py diff --git a/zaqar/queues/transport/wsgi/utils.py b/zaqar/transport/wsgi/utils.py similarity index 98% rename from zaqar/queues/transport/wsgi/utils.py rename to zaqar/transport/wsgi/utils.py index 05bc42d3c..4ebb310b7 100644 --- a/zaqar/queues/transport/wsgi/utils.py +++ b/zaqar/transport/wsgi/utils.py @@ -17,8 +17,8 @@ import jsonschema from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.transport import utils -from zaqar.queues.transport.wsgi import errors +from zaqar.transport import utils +from zaqar.transport.wsgi import errors JSONObject = dict """Represents a JSON object in Python.""" diff --git a/zaqar/queues/transport/wsgi/v1_0/__init__.py b/zaqar/transport/wsgi/v1_0/__init__.py similarity index 85% rename from zaqar/queues/transport/wsgi/v1_0/__init__.py rename to zaqar/transport/wsgi/v1_0/__init__.py index c0ad8f4ee..bda7ed2c0 100644 --- a/zaqar/queues/transport/wsgi/v1_0/__init__.py +++ b/zaqar/transport/wsgi/v1_0/__init__.py @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations under # the License. -from zaqar.queues.transport.wsgi.v1_0 import claims -from zaqar.queues.transport.wsgi.v1_0 import health -from zaqar.queues.transport.wsgi.v1_0 import homedoc -from zaqar.queues.transport.wsgi.v1_0 import messages -from zaqar.queues.transport.wsgi.v1_0 import metadata -from zaqar.queues.transport.wsgi.v1_0 import pools -from zaqar.queues.transport.wsgi.v1_0 import queues -from zaqar.queues.transport.wsgi.v1_0 import stats +from zaqar.transport.wsgi.v1_0 import claims +from zaqar.transport.wsgi.v1_0 import health +from zaqar.transport.wsgi.v1_0 import homedoc +from zaqar.transport.wsgi.v1_0 import messages +from zaqar.transport.wsgi.v1_0 import metadata +from zaqar.transport.wsgi.v1_0 import pools +from zaqar.transport.wsgi.v1_0 import queues +from zaqar.transport.wsgi.v1_0 import stats def public_endpoints(driver, conf): diff --git a/zaqar/queues/transport/wsgi/v1_0/claims.py b/zaqar/transport/wsgi/v1_0/claims.py similarity index 96% rename from zaqar/queues/transport/wsgi/v1_0/claims.py rename to zaqar/transport/wsgi/v1_0/claims.py index 9c257c6c0..ff58e4d9b 100644 --- a/zaqar/queues/transport/wsgi/v1_0/claims.py +++ b/zaqar/transport/wsgi/v1_0/claims.py @@ -18,11 +18,11 @@ import six from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors -from zaqar.queues.transport import utils -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors as storage_errors +from zaqar.transport import utils +from zaqar.transport import validation +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_0/health.py b/zaqar/transport/wsgi/v1_0/health.py similarity index 100% rename from zaqar/queues/transport/wsgi/v1_0/health.py rename to zaqar/transport/wsgi/v1_0/health.py diff --git a/zaqar/queues/transport/wsgi/v1_0/homedoc.py b/zaqar/transport/wsgi/v1_0/homedoc.py similarity index 100% rename from zaqar/queues/transport/wsgi/v1_0/homedoc.py rename to zaqar/transport/wsgi/v1_0/homedoc.py diff --git a/zaqar/queues/transport/wsgi/v1_0/messages.py b/zaqar/transport/wsgi/v1_0/messages.py similarity index 97% rename from zaqar/queues/transport/wsgi/v1_0/messages.py rename to zaqar/transport/wsgi/v1_0/messages.py index 8993e4dcb..52e4beb11 100644 --- a/zaqar/queues/transport/wsgi/v1_0/messages.py +++ b/zaqar/transport/wsgi/v1_0/messages.py @@ -19,11 +19,11 @@ import six from zaqar.common.transport.wsgi import helpers as wsgi_helpers from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors -from zaqar.queues.transport import utils -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors as storage_errors +from zaqar.transport import utils +from zaqar.transport import validation +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_0/metadata.py b/zaqar/transport/wsgi/v1_0/metadata.py similarity index 92% rename from zaqar/queues/transport/wsgi/v1_0/metadata.py rename to zaqar/transport/wsgi/v1_0/metadata.py index 4f5155d88..255fd0151 100644 --- a/zaqar/queues/transport/wsgi/v1_0/metadata.py +++ b/zaqar/transport/wsgi/v1_0/metadata.py @@ -18,11 +18,11 @@ import six from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors -from zaqar.queues.transport import utils -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors as storage_errors +from zaqar.transport import utils +from zaqar.transport import validation +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_0/pools.py b/zaqar/transport/wsgi/v1_0/pools.py similarity index 96% rename from zaqar/queues/transport/wsgi/v1_0/pools.py rename to zaqar/transport/wsgi/v1_0/pools.py index ac25ea3fd..bce4cf474 100644 --- a/zaqar/queues/transport/wsgi/v1_0/pools.py +++ b/zaqar/transport/wsgi/v1_0/pools.py @@ -41,11 +41,11 @@ import jsonschema from zaqar.common.schemas import pools as schema from zaqar.common import utils as common_utils from zaqar.openstack.common import log -from zaqar.queues.storage import errors -from zaqar.queues.storage import utils as storage_utils -from zaqar.queues.transport import utils as transport_utils -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors +from zaqar.storage import utils as storage_utils +from zaqar.transport import utils as transport_utils +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = log.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_0/queues.py b/zaqar/transport/wsgi/v1_0/queues.py similarity index 96% rename from zaqar/queues/transport/wsgi/v1_0/queues.py rename to zaqar/transport/wsgi/v1_0/queues.py index 610eeb75f..acd343b06 100644 --- a/zaqar/queues/transport/wsgi/v1_0/queues.py +++ b/zaqar/transport/wsgi/v1_0/queues.py @@ -18,9 +18,9 @@ import six from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.transport import utils -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import errors as wsgi_errors +from zaqar.transport import utils +from zaqar.transport import validation +from zaqar.transport.wsgi import errors as wsgi_errors LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_0/stats.py b/zaqar/transport/wsgi/v1_0/stats.py similarity index 92% rename from zaqar/queues/transport/wsgi/v1_0/stats.py rename to zaqar/transport/wsgi/v1_0/stats.py index 2166c5c3a..fc9f39bb1 100644 --- a/zaqar/queues/transport/wsgi/v1_0/stats.py +++ b/zaqar/transport/wsgi/v1_0/stats.py @@ -17,9 +17,9 @@ import falcon from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors -from zaqar.queues.transport import utils -from zaqar.queues.transport.wsgi import errors as wsgi_errors +from zaqar.storage import errors as storage_errors +from zaqar.transport import utils +from zaqar.transport.wsgi import errors as wsgi_errors LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_1/__init__.py b/zaqar/transport/wsgi/v1_1/__init__.py similarity index 87% rename from zaqar/queues/transport/wsgi/v1_1/__init__.py rename to zaqar/transport/wsgi/v1_1/__init__.py index 1f680a2c6..a6c07a1d2 100644 --- a/zaqar/queues/transport/wsgi/v1_1/__init__.py +++ b/zaqar/transport/wsgi/v1_1/__init__.py @@ -12,15 +12,15 @@ # License for the specific language governing permissions and limitations under # the License. -from zaqar.queues.transport.wsgi.v1_1 import claims -from zaqar.queues.transport.wsgi.v1_1 import flavors -from zaqar.queues.transport.wsgi.v1_1 import health -from zaqar.queues.transport.wsgi.v1_1 import homedoc -from zaqar.queues.transport.wsgi.v1_1 import messages -from zaqar.queues.transport.wsgi.v1_1 import ping -from zaqar.queues.transport.wsgi.v1_1 import pools -from zaqar.queues.transport.wsgi.v1_1 import queues -from zaqar.queues.transport.wsgi.v1_1 import stats +from zaqar.transport.wsgi.v1_1 import claims +from zaqar.transport.wsgi.v1_1 import flavors +from zaqar.transport.wsgi.v1_1 import health +from zaqar.transport.wsgi.v1_1 import homedoc +from zaqar.transport.wsgi.v1_1 import messages +from zaqar.transport.wsgi.v1_1 import ping +from zaqar.transport.wsgi.v1_1 import pools +from zaqar.transport.wsgi.v1_1 import queues +from zaqar.transport.wsgi.v1_1 import stats def public_endpoints(driver, conf): diff --git a/zaqar/queues/transport/wsgi/v1_1/claims.py b/zaqar/transport/wsgi/v1_1/claims.py similarity index 96% rename from zaqar/queues/transport/wsgi/v1_1/claims.py rename to zaqar/transport/wsgi/v1_1/claims.py index eb42373b1..fe3d0dfc7 100644 --- a/zaqar/queues/transport/wsgi/v1_1/claims.py +++ b/zaqar/transport/wsgi/v1_1/claims.py @@ -18,11 +18,11 @@ import six from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors -from zaqar.queues.transport import utils -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors as storage_errors +from zaqar.transport import utils +from zaqar.transport import validation +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_1/flavors.py b/zaqar/transport/wsgi/v1_1/flavors.py similarity index 96% rename from zaqar/queues/transport/wsgi/v1_1/flavors.py rename to zaqar/transport/wsgi/v1_1/flavors.py index f049d1a45..247dd5ce7 100644 --- a/zaqar/queues/transport/wsgi/v1_1/flavors.py +++ b/zaqar/transport/wsgi/v1_1/flavors.py @@ -20,10 +20,10 @@ from zaqar.common.schemas import flavors as schema from zaqar.common import utils as common_utils from zaqar.i18n import _ from zaqar.openstack.common import log -from zaqar.queues.storage import errors -from zaqar.queues.transport import utils as transport_utils -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors +from zaqar.transport import utils as transport_utils +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = log.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_1/health.py b/zaqar/transport/wsgi/v1_1/health.py similarity index 92% rename from zaqar/queues/transport/wsgi/v1_1/health.py rename to zaqar/transport/wsgi/v1_1/health.py index 7f0238901..1aaa0f6f4 100644 --- a/zaqar/queues/transport/wsgi/v1_1/health.py +++ b/zaqar/transport/wsgi/v1_1/health.py @@ -15,8 +15,8 @@ from zaqar.i18n import _ from zaqar.openstack.common import log as logging -from zaqar.queues.transport import utils -from zaqar.queues.transport.wsgi import errors as wsgi_errors +from zaqar.transport import utils +from zaqar.transport.wsgi import errors as wsgi_errors LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_1/homedoc.py b/zaqar/transport/wsgi/v1_1/homedoc.py similarity index 100% rename from zaqar/queues/transport/wsgi/v1_1/homedoc.py rename to zaqar/transport/wsgi/v1_1/homedoc.py diff --git a/zaqar/queues/transport/wsgi/v1_1/messages.py b/zaqar/transport/wsgi/v1_1/messages.py similarity index 97% rename from zaqar/queues/transport/wsgi/v1_1/messages.py rename to zaqar/transport/wsgi/v1_1/messages.py index 6a4212ff8..b7ee49141 100644 --- a/zaqar/queues/transport/wsgi/v1_1/messages.py +++ b/zaqar/transport/wsgi/v1_1/messages.py @@ -19,11 +19,11 @@ import six from zaqar.common.transport.wsgi import helpers as wsgi_helpers from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors -from zaqar.queues.transport import utils -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors as storage_errors +from zaqar.transport import utils +from zaqar.transport import validation +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_1/ping.py b/zaqar/transport/wsgi/v1_1/ping.py similarity index 100% rename from zaqar/queues/transport/wsgi/v1_1/ping.py rename to zaqar/transport/wsgi/v1_1/ping.py diff --git a/zaqar/queues/transport/wsgi/v1_1/pools.py b/zaqar/transport/wsgi/v1_1/pools.py similarity index 96% rename from zaqar/queues/transport/wsgi/v1_1/pools.py rename to zaqar/transport/wsgi/v1_1/pools.py index e4235dc1f..3c0ed7d08 100644 --- a/zaqar/queues/transport/wsgi/v1_1/pools.py +++ b/zaqar/transport/wsgi/v1_1/pools.py @@ -43,11 +43,11 @@ from zaqar.common.schemas import pools as schema from zaqar.common import utils as common_utils from zaqar.i18n import _ from zaqar.openstack.common import log -from zaqar.queues.storage import errors -from zaqar.queues.storage import utils as storage_utils -from zaqar.queues.transport import utils as transport_utils -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors +from zaqar.storage import utils as storage_utils +from zaqar.transport import utils as transport_utils +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = log.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_1/queues.py b/zaqar/transport/wsgi/v1_1/queues.py similarity index 95% rename from zaqar/queues/transport/wsgi/v1_1/queues.py rename to zaqar/transport/wsgi/v1_1/queues.py index 957ea8bfb..690ca9170 100644 --- a/zaqar/queues/transport/wsgi/v1_1/queues.py +++ b/zaqar/transport/wsgi/v1_1/queues.py @@ -18,11 +18,11 @@ import six from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors -from zaqar.queues.transport import utils -from zaqar.queues.transport import validation -from zaqar.queues.transport.wsgi import errors as wsgi_errors -from zaqar.queues.transport.wsgi import utils as wsgi_utils +from zaqar.storage import errors as storage_errors +from zaqar.transport import utils +from zaqar.transport import validation +from zaqar.transport.wsgi import errors as wsgi_errors +from zaqar.transport.wsgi import utils as wsgi_utils LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/transport/wsgi/v1_1/stats.py b/zaqar/transport/wsgi/v1_1/stats.py similarity index 93% rename from zaqar/queues/transport/wsgi/v1_1/stats.py rename to zaqar/transport/wsgi/v1_1/stats.py index bf90ddc3c..0e8c754c8 100644 --- a/zaqar/queues/transport/wsgi/v1_1/stats.py +++ b/zaqar/transport/wsgi/v1_1/stats.py @@ -17,9 +17,9 @@ import falcon from zaqar.i18n import _ import zaqar.openstack.common.log as logging -from zaqar.queues.storage import errors as storage_errors -from zaqar.queues.transport import utils -from zaqar.queues.transport.wsgi import errors as wsgi_errors +from zaqar.storage import errors as storage_errors +from zaqar.transport import utils +from zaqar.transport.wsgi import errors as wsgi_errors LOG = logging.getLogger(__name__) diff --git a/zaqar/queues/storage/redis/__init__.py b/zaqar/transport/zmq/__init__.py similarity index 100% rename from zaqar/queues/storage/redis/__init__.py rename to zaqar/transport/zmq/__init__.py