openstack/manila
Code Issues Proposed changes

docs

Browse Source
This commit is contained in:
Yulia Portnova 2013-09-17 10:57:47 +03:00
parent 901d841a23
commit 9169fc311e
38 changed files with 784 additions and 784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -4,7 +4,7 @@
*.pyc *.pyc
*.sqlite *.sqlite
*.swp *.swp
.cinder-venv .manila-venv
.coverage .coverage
.testrepository .testrepository
.tox .tox
@ -16,7 +16,7 @@ build/*
build-stamp build-stamp
CA/ CA/
ChangeLog ChangeLog
cinder.egg-info manila.egg-info
cover/* cover/*
covhtml covhtml
dist/* dist/*
@ -24,7 +24,7 @@ instances
keeper keeper
keys keys
local_settings.py local_settings.py
tools/conf/cinder.conf* tools/conf/manila.conf*
tools/lintstack.head.py tools/lintstack.head.py
tools/pylint_exceptions tools/pylint_exceptions
tags tags

2
CONTRIBUTING.md
View File

@ -8,5 +8,5 @@ the workflow documented at [http://wiki.openstack.org/GerritWorkflow](http://wik
Pull requests submitted through GitHub will be ignored. Pull requests submitted through GitHub will be ignored.
Bugs should be filed [on Launchpad](https://bugs.launchpad.net/cinder), Bugs should be filed [on Launchpad](https://bugs.launchpad.net/manila),
not in GitHub's issue tracker. not in GitHub's issue tracker.

20
HACKING.rst
View File

@ -1,4 +1,4 @@
Cinder Style Commandments Manila Style Commandments
======================= =======================
- Step 1: Read http://www.python.org/dev/peps/pep-0008/ - Step 1: Read http://www.python.org/dev/peps/pep-0008/
@ -59,7 +59,7 @@ Imports
- imports from ``migrate`` package - imports from ``migrate`` package
- imports from ``sqlalchemy`` package - imports from ``sqlalchemy`` package
- imports from ``cinder.db.sqlalchemy.session`` module - imports from ``manila.db.sqlalchemy.session`` module
Example:: Example::
@ -68,7 +68,7 @@ Example::
\n \n
{{third-party lib imports in human alphabetical order}} {{third-party lib imports in human alphabetical order}}
\n \n
{{cinder imports in human alphabetical order}} {{manila imports in human alphabetical order}}
\n \n
\n \n
{{begin your code}} {{begin your code}}
@ -88,12 +88,12 @@ Example::
import eventlet import eventlet
import webob.exc import webob.exc
import cinder.api.ec2 import manila.api.ec2
from cinder.api import openstack from manila.api import openstack
from cinder.auth import users from manila.auth import users
from cinder.endpoint import cloud from manila.endpoint import cloud
import cinder.flags import manila.flags
from cinder import test from manila import test
Docstrings Docstrings
@ -216,7 +216,7 @@ submitted bug fix does have a unit test, be sure to add a new one that fails
without the patch and passes with the patch. without the patch and passes with the patch.
For more information on creating unit tests and utilizing the testing For more information on creating unit tests and utilizing the testing
infrastructure in OpenStack Cinder, please read cinder/testing/README.rst. infrastructure in OpenStack Manila, please read manila/testing/README.rst.
openstack-common openstack-common

12
README.rst
View File

@ -1,21 +1,21 @@
The Choose Your Own Adventure README for Cinder The Choose Your Own Adventure README for Manila
=============================================== ===============================================
You have come across a storage service for an open cloud computing service. You have come across a storage service for an open cloud computing service.
It has identified itself as "Cinder." It was abstracted from the Nova project. It has identified itself as "Manila." It was abstracted from the Nova project.
To monitor it from a distance: follow `@openstack <http://twitter.com/openstack>`_ on twitter. To monitor it from a distance: follow `@openstack <http://twitter.com/openstack>`_ on twitter.
To tame it for use in your own cloud: read http://docs.openstack.org To tame it for use in your own cloud: read http://docs.openstack.org
To study its anatomy: read http://cinder.openstack.org To study its anatomy: read http://manila.openstack.org
To dissect it in detail: visit http://github.com/openstack/cinder To dissect it in detail: visit http://github.com/openstack/manila
To taunt it with its weaknesses: use http://bugs.launchpad.net/cinder To taunt it with its weaknesses: use http://bugs.launchpad.net/manila
To watch it: http://jenkins.openstack.org To watch it: http://jenkins.openstack.org
To hack at it: read HACKING To hack at it: read HACKING
To cry over its pylint problems: http://jenkins.openstack.org/job/cinder-pylint/violations To cry over its pylint problems: http://jenkins.openstack.org/job/manila-pylint/violations

6
doc/Makefile
View File

@ -32,7 +32,7 @@ help:
clean: clean:
-rm -rf $(BUILDDIR)/* -rm -rf $(BUILDDIR)/*
-rm -rf cinder.sqlite -rm -rf manila.sqlite
if [ -f .autogenerated ] ; then \ if [ -f .autogenerated ] ; then \
cat .autogenerated | xargs rm ; \ cat .autogenerated | xargs rm ; \
rm .autogenerated ; \ rm .autogenerated ; \
@ -69,9 +69,9 @@ qthelp:
@echo @echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:" ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/cinder.qhcp" @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/manila.qhcp"
@echo "To view the help file:" @echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/cinder.qhc" @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/manila.qhc"
latex: latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex

2
doc/README.rst
View File

@ -8,7 +8,7 @@ Dependencies
Sphinx_ Sphinx_
You'll need sphinx (the python one) and if you are You'll need sphinx (the python one) and if you are
using the virtualenv you'll need to install it in the virtualenv using the virtualenv you'll need to install it in the virtualenv
specifically so that it can load the cinder modules. specifically so that it can load the manila modules.
:: ::

6
doc/find_autodoc_modules.sh
View File

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
CINDER_DIR='cinder/' # include trailing slash MANILA_DIR='manila/' # include trailing slash
DOCS_DIR='source' DOCS_DIR='source'
modules='' modules=''
for x in `find ${CINDER_DIR} -name '*.py' | grep -v cinder/tests`; do for x in `find ${MANILA_DIR} -name '*.py' | grep -v manila/tests`; do
if [ `basename ${x} .py` == "__init__" ] ; then if [ `basename ${x} .py` == "__init__" ] ; then
continue continue
fi fi
relative=cinder.`echo ${x} | sed -e 's$^'${CINDER_DIR}'$$' -e 's/.py$//' -e 's$/$.$g'` relative=manila.`echo ${x} | sed -e 's$^'${MANILA_DIR}'$$' -e 's/.py$//' -e 's$/$.$g'`
modules="${modules} ${relative}" modules="${modules} ${relative}"
done done

8
doc/source/devref/addmethod.openstackapi.rst
View File

@ -24,7 +24,7 @@ Routing
To map URLs to controllers+actions, OpenStack uses the Routes package, a clone of Rails routes for Python implementations. See http://routes.groovie.org/ for more information. To map URLs to controllers+actions, OpenStack uses the Routes package, a clone of Rails routes for Python implementations. See http://routes.groovie.org/ for more information.
URLs are mapped to "action" methods on "controller" classes in ``cinder/api/openstack/__init__/ApiRouter.__init__`` . URLs are mapped to "action" methods on "controller" classes in ``manila/api/openstack/__init__/ApiRouter.__init__`` .
See http://routes.groovie.org/manual.html for all syntax, but you'll probably just need these two: See http://routes.groovie.org/manual.html for all syntax, but you'll probably just need these two:
- mapper.connect() lets you map a single URL to a single action on a controller. - mapper.connect() lets you map a single URL to a single action on a controller.
@ -33,9 +33,9 @@ See http://routes.groovie.org/manual.html for all syntax, but you'll probably ju
Controllers and actions Controllers and actions
----------------------- -----------------------
Controllers live in ``cinder/api/openstack``, and inherit from cinder.wsgi.Controller. Controllers live in ``manila/api/openstack``, and inherit from manila.wsgi.Controller.
See ``cinder/api/openstack/servers.py`` for an example. See ``manila/api/openstack/servers.py`` for an example.
Action methods take parameters that are sucked out of the URL by mapper.connect() or .resource(). The first two parameters are self and the WebOb request, from which you can get the req.environ, req.body, req.headers, etc. Action methods take parameters that are sucked out of the URL by mapper.connect() or .resource(). The first two parameters are self and the WebOb request, from which you can get the req.environ, req.body, req.headers, etc.
@ -46,7 +46,7 @@ Actions return a dictionary, and wsgi.Controller serializes that to JSON or XML
If you define a new controller, you'll need to define a ``_serialization_metadata`` attribute on the class, to tell wsgi.Controller how to convert your dictionary to XML. It needs to know the singular form of any list tag (e.g. ``<servers>`` list contains ``<server>`` tags) and which dictionary keys are to be XML attributes as opposed to subtags (e.g. ``<server id="4"/>`` instead of ``<server><id>4</id></server>``). If you define a new controller, you'll need to define a ``_serialization_metadata`` attribute on the class, to tell wsgi.Controller how to convert your dictionary to XML. It needs to know the singular form of any list tag (e.g. ``<servers>`` list contains ``<server>`` tags) and which dictionary keys are to be XML attributes as opposed to subtags (e.g. ``<server id="4"/>`` instead of ``<server><id>4</id></server>``).
See `cinder/api/openstack/servers.py` for an example. See `manila/api/openstack/servers.py` for an example.
Faults Faults
------ ------

38
doc/source/devref/api.rst
View File

@ -18,25 +18,25 @@
API Endpoint API Endpoint
============ ============
Cinder has a system for managing multiple APIs on different subdomains. Manila has a system for managing multiple APIs on different subdomains.
Currently there is support for the OpenStack API, as well as the Amazon EC2 Currently there is support for the OpenStack API, as well as the Amazon EC2
API. API.
Common Components Common Components
----------------- -----------------
The :mod:`cinder.api` Module The :mod:`manila.api` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.api .. automodule:: manila.api
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.api.cloud` Module The :mod:`manila.api.cloud` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.api.cloud .. automodule:: manila.api.cloud
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -47,7 +47,7 @@ OpenStack API
The :mod:`openstack` Module The :mod:`openstack` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.api.openstack .. automodule:: manila.api.openstack
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -55,7 +55,7 @@ The :mod:`openstack` Module
The :mod:`auth` Module The :mod:`auth` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.api.openstack.auth .. automodule:: manila.api.openstack.auth
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -64,10 +64,10 @@ The :mod:`auth` Module
EC2 API EC2 API
------- -------
The :mod:`cinder.api.ec2` Module The :mod:`manila.api.ec2` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.api.ec2 .. automodule:: manila.api.ec2
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -76,7 +76,7 @@ The :mod:`cinder.api.ec2` Module
The :mod:`cloud` Module The :mod:`cloud` Module
~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.api.ec2.cloud .. automodule:: manila.api.ec2.cloud
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -85,7 +85,7 @@ The :mod:`cloud` Module
The :mod:`metadatarequesthandler` Module The :mod:`metadatarequesthandler` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.api.ec2.metadatarequesthandler .. automodule:: manila.api.ec2.metadatarequesthandler
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -97,7 +97,7 @@ Tests
The :mod:`api_unittest` Module The :mod:`api_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.api_unittest .. automodule:: manila.tests.api_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -106,7 +106,7 @@ The :mod:`api_unittest` Module
The :mod:`api_integration` Module The :mod:`api_integration` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.api_integration .. automodule:: manila.tests.api_integration
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -115,7 +115,7 @@ The :mod:`api_integration` Module
The :mod:`cloud_unittest` Module The :mod:`cloud_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.cloud_unittest .. automodule:: manila.tests.cloud_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -124,7 +124,7 @@ The :mod:`cloud_unittest` Module
The :mod:`api.fakes` Module The :mod:`api.fakes` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.api.fakes .. automodule:: manila.tests.api.fakes
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -133,7 +133,7 @@ The :mod:`api.fakes` Module
The :mod:`api.test_wsgi` Module The :mod:`api.test_wsgi` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.api.test_wsgi .. automodule:: manila.tests.api.test_wsgi
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -142,7 +142,7 @@ The :mod:`api.test_wsgi` Module
The :mod:`test_api` Module The :mod:`test_api` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.api.openstack.test_api .. automodule:: manila.tests.api.openstack.test_api
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -151,7 +151,7 @@ The :mod:`test_api` Module
The :mod:`test_auth` Module The :mod:`test_auth` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.api.openstack.test_auth .. automodule:: manila.tests.api.openstack.test_auth
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -160,7 +160,7 @@ The :mod:`test_auth` Module
The :mod:`test_faults` Module The :mod:`test_faults` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.api.openstack.test_faults .. automodule:: manila.tests.api.openstack.test_faults
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:

8
doc/source/devref/architecture.rst
View File

@ -15,12 +15,12 @@
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
Cinder System Architecture Manila System Architecture
======================== ========================
The Cinder Block Storage Service is intended to be ran on one or more nodes. The Manila Block Storage Service is intended to be ran on one or more nodes.
Cinder uses a sql-based central database that is shared by all Cinder services in the system. The amount and depth of the data fits into a sql database quite well. For small deployments this seems like an optimal solution. For larger deployments, and especially if security is a concern, cinder will be moving towards multiple data stores with some kind of aggregation system. Manila uses a sql-based central database that is shared by all Manila services in the system. The amount and depth of the data fits into a sql database quite well. For small deployments this seems like an optimal solution. For larger deployments, and especially if security is a concern, manila will be moving towards multiple data stores with some kind of aggregation system.
Components Components
---------- ----------
@ -34,7 +34,7 @@ Below you will a brief explanation of the different components.
| \- ( DB ) | \- ( DB )
| |
| |
cinderclient | manilaclient |
/ \ | / \ |
[ Web Dashboard ]- -[ api ] -- < AMQP > -- [ scheduler ] -- [ volume ] -- ( iSCSI ) [ Web Dashboard ]- -[ api ] -- < AMQP > -- [ scheduler ] -- [ volume ] -- ( iSCSI )
\ / | \ / |

20
doc/source/devref/auth.rst
View File

@ -20,20 +20,20 @@
Authentication and Authorization Authentication and Authorization
================================ ================================
The :mod:`cinder.quota` Module The :mod:`manila.quota` Module
---------------------------- ----------------------------
.. automodule:: cinder.quota .. automodule:: manila.quota
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.auth.signer` Module The :mod:`manila.auth.signer` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.auth.signer .. automodule:: manila.auth.signer
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -43,10 +43,10 @@ The :mod:`cinder.auth.signer` Module
Auth Manager Auth Manager
------------ ------------
The :mod:`cinder.auth.manager` Module The :mod:`manila.auth.manager` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.auth.manager .. automodule:: manila.auth.manager
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -60,7 +60,7 @@ Tests
The :mod:`auth_unittest` Module The :mod:`auth_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.auth_unittest .. automodule:: manila.tests.auth_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -70,7 +70,7 @@ The :mod:`auth_unittest` Module
The :mod:`access_unittest` Module The :mod:`access_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.access_unittest .. automodule:: manila.tests.access_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -80,7 +80,7 @@ The :mod:`access_unittest` Module
The :mod:`quota_unittest` Module The :mod:`quota_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.quota_unittest .. automodule:: manila.tests.quota_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -90,7 +90,7 @@ The :mod:`quota_unittest` Module
Legacy Docs Legacy Docs
----------- -----------
Cinder provides RBAC (Role-based access control) of the AWS-type APIs. We define the following roles: Manila provides RBAC (Role-based access control) of the AWS-type APIs. We define the following roles:
Roles-Based Access Control of AWS-style APIs using SAML Assertions Roles-Based Access Control of AWS-style APIs using SAML Assertions
“Achieving FIPS 199 Moderate certification of a hybrid cloud environment using CloudAudit and declarative C.I.A. classifications” “Achieving FIPS 199 Moderate certification of a hybrid cloud environment using CloudAudit and declarative C.I.A. classifications”

62
doc/source/devref/cinder.rst
View File

@ -18,114 +18,114 @@
Common and Misc Libraries Common and Misc Libraries
========================= =========================
Libraries common throughout Cinder or just ones that haven't been categorized Libraries common throughout Manila or just ones that haven't been categorized
very well yet. very well yet.
The :mod:`cinder.adminclient` Module The :mod:`manila.adminclient` Module
---------------------------------- ----------------------------------
.. automodule:: cinder.adminclient .. automodule:: manila.adminclient
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.context` Module The :mod:`manila.context` Module
------------------------------ ------------------------------
.. automodule:: cinder.context .. automodule:: manila.context
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.exception` Module The :mod:`manila.exception` Module
-------------------------------- --------------------------------
.. automodule:: cinder.exception .. automodule:: manila.exception
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.flags` Module The :mod:`manila.flags` Module
---------------------------- ----------------------------
.. automodule:: cinder.flags .. automodule:: manila.flags
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.process` Module The :mod:`manila.process` Module
------------------------------ ------------------------------
.. automodule:: cinder.process .. automodule:: manila.process
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.rpc` Module The :mod:`manila.rpc` Module
-------------------------- --------------------------
.. automodule:: cinder.rpc .. automodule:: manila.rpc
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.server` Module The :mod:`manila.server` Module
----------------------------- -----------------------------
.. automodule:: cinder.server .. automodule:: manila.server
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.test` Module The :mod:`manila.test` Module
--------------------------- ---------------------------
.. automodule:: cinder.test .. automodule:: manila.test
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.utils` Module The :mod:`manila.utils` Module
---------------------------- ----------------------------
.. automodule:: cinder.utils .. automodule:: manila.utils
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.validate` Module The :mod:`manila.validate` Module
------------------------------- -------------------------------
.. automodule:: cinder.validate .. automodule:: manila.validate
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.wsgi` Module The :mod:`manila.wsgi` Module
--------------------------- ---------------------------
.. automodule:: cinder.wsgi .. automodule:: manila.wsgi
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -138,7 +138,7 @@ Tests
The :mod:`declare_flags` Module The :mod:`declare_flags` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.declare_flags .. automodule:: manila.tests.declare_flags
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -148,7 +148,7 @@ The :mod:`declare_flags` Module
The :mod:`fake_flags` Module The :mod:`fake_flags` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.fake_flags .. automodule:: manila.tests.fake_flags
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -158,7 +158,7 @@ The :mod:`fake_flags` Module
The :mod:`flags_unittest` Module The :mod:`flags_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.flags_unittest .. automodule:: manila.tests.flags_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -168,7 +168,7 @@ The :mod:`flags_unittest` Module
The :mod:`process_unittest` Module The :mod:`process_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.process_unittest .. automodule:: manila.tests.process_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -178,7 +178,7 @@ The :mod:`process_unittest` Module
The :mod:`real_flags` Module The :mod:`real_flags` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.real_flags .. automodule:: manila.tests.real_flags
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -188,7 +188,7 @@ The :mod:`real_flags` Module
The :mod:`rpc_unittest` Module The :mod:`rpc_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.rpc_unittest .. automodule:: manila.tests.rpc_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -198,7 +198,7 @@ The :mod:`rpc_unittest` Module
The :mod:`runtime_flags` Module The :mod:`runtime_flags` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.runtime_flags .. automodule:: manila.tests.runtime_flags
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -208,7 +208,7 @@ The :mod:`runtime_flags` Module
The :mod:`validator_unittest` Module The :mod:`validator_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.validator_unittest .. automodule:: manila.tests.validator_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:

16
doc/source/devref/database.rst
View File

@ -18,10 +18,10 @@
The Database Layer The Database Layer
================== ==================
The :mod:`cinder.db.api` Module The :mod:`manila.db.api` Module
----------------------------- -----------------------------
.. automodule:: cinder.db.api .. automodule:: manila.db.api
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -31,25 +31,25 @@ The :mod:`cinder.db.api` Module
The Sqlalchemy Driver The Sqlalchemy Driver
--------------------- ---------------------
The :mod:`cinder.db.sqlalchemy.api` Module The :mod:`manila.db.sqlalchemy.api` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.db.sqlalchemy.api .. automodule:: manila.db.sqlalchemy.api
:noindex: :noindex:
The :mod:`cinder.db.sqlalchemy.models` Module The :mod:`manila.db.sqlalchemy.models` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.db.sqlalchemy.models .. automodule:: manila.db.sqlalchemy.models
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.db.sqlalchemy.session` Module The :mod:`manila.db.sqlalchemy.session` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.db.sqlalchemy.session .. automodule:: manila.db.sqlalchemy.session
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:

28
doc/source/devref/development.environment.rst
View File

@ -19,16 +19,16 @@ Setting Up a Development Environment
==================================== ====================================
This page describes how to setup a working Python development This page describes how to setup a working Python development
environment that can be used in developing cinder on Ubuntu, Fedora or environment that can be used in developing manila on Ubuntu, Fedora or
Mac OS X. These instructions assume you're already familiar with Mac OS X. These instructions assume you're already familiar with
git. Refer to GettingTheCode_ for additional information. git. Refer to GettingTheCode_ for additional information.
.. _GettingTheCode: http://wiki.openstack.org/GettingTheCode .. _GettingTheCode: http://wiki.openstack.org/GettingTheCode
Following these instructions will allow you to run the cinder unit Following these instructions will allow you to run the manila unit
tests. If you want to be able to run cinder (i.e., launch VM instances), tests. If you want to be able to run manila (i.e., launch VM instances),
you will also need to install libvirt and at least one of the you will also need to install libvirt and at least one of the
`supported hypervisors`_. Running cinder is currently only supported on `supported hypervisors`_. Running manila is currently only supported on
Linux, although you can run the unit tests on Mac OS X. See Linux, although you can run the unit tests on Mac OS X. See
:doc:`../quickstart` for how to get a working version of OpenStack :doc:`../quickstart` for how to get a working version of OpenStack
Compute running as quickly as possible. Compute running as quickly as possible.
@ -38,10 +38,10 @@ Compute running as quickly as possible.
Virtual environments Virtual environments
-------------------- --------------------
Cinder development uses `virtualenv <http://pypi.python.org/pypi/virtualenv>`__ to track and manage Python Manila development uses `virtualenv <http://pypi.python.org/pypi/virtualenv>`__ to track and manage Python
dependencies while in development and testing. This allows you to dependencies while in development and testing. This allows you to
install all of the Python package dependencies in a virtual install all of the Python package dependencies in a virtual
environment or "virtualenv" (a special subdirectory of your cinder environment or "virtualenv" (a special subdirectory of your manila
directory), instead of installing the packages at the system level. directory), instead of installing the packages at the system level.
.. note:: .. note::
@ -54,7 +54,7 @@ Linux Systems
.. note:: .. note::
This section is tested for Cinder on Ubuntu (12.04-64) and This section is tested for Manila on Ubuntu (12.04-64) and
Fedora-based (RHEL 6.1) distributions. Feel free to add notes and Fedora-based (RHEL 6.1) distributions. Feel free to add notes and
change according to your experiences or operating system. change according to your experiences or operating system.
@ -82,18 +82,18 @@ Check the version of OpenSSL you have installed::
If you have installed OpenSSL 1.0.0a, which can happen when installing a If you have installed OpenSSL 1.0.0a, which can happen when installing a
MacPorts package for OpenSSL, you will see an error when running MacPorts package for OpenSSL, you will see an error when running
``cinder.tests.auth_unittest.AuthTestCase.test_209_can_generate_x509``. ``manila.tests.auth_unittest.AuthTestCase.test_209_can_generate_x509``.
The stock version of OpenSSL that ships with Mac OS X 10.6 (OpenSSL 0.9.8l) The stock version of OpenSSL that ships with Mac OS X 10.6 (OpenSSL 0.9.8l)
or Mac OS X 10.7 (OpenSSL 0.9.8r) works fine with cinder. or Mac OS X 10.7 (OpenSSL 0.9.8r) works fine with manila.
Getting the code Getting the code
---------------- ----------------
Grab the code from GitHub:: Grab the code from GitHub::
git clone https://github.com/openstack/cinder.git git clone https://github.com/openstack/manila.git
cd cinder cd manila
Running unit tests Running unit tests
@ -127,9 +127,9 @@ by the ``tools/install_venv.py`` file into the virutalenv.
If all goes well, you should get a message something like this:: If all goes well, you should get a message something like this::
Cinder development environment setup is complete. Manila development environment setup is complete.
To activate the Cinder virtualenv for the extent of your current shell session To activate the Manila virtualenv for the extent of your current shell session
you can run:: you can run::
$ source .venv/bin/activate $ source .venv/bin/activate
@ -145,7 +145,7 @@ Contributing Your Work
Once your work is complete you may wish to contribute it to the project. Add Once your work is complete you may wish to contribute it to the project. Add
your name and email address to the ``Authors`` file, and also to the ``.mailmap`` your name and email address to the ``Authors`` file, and also to the ``.mailmap``
file if you use multiple email addresses. Your contributions can not be merged file if you use multiple email addresses. Your contributions can not be merged
into trunk unless you are listed in the Authors file. Cinder uses the Gerrit into trunk unless you are listed in the Authors file. Manila uses the Gerrit
code review system. For information on how to submit your branch to Gerrit, code review system. For information on how to submit your branch to Gerrit,
see GerritWorkflow_. see GerritWorkflow_.

24
doc/source/devref/fakes.rst
View File

@ -24,60 +24,60 @@ When the real thing isn't available and you have some development to do these
fake implementations of various drivers let you get on with your day. fake implementations of various drivers let you get on with your day.
The :mod:`cinder.virt.fake` Module The :mod:`manila.virt.fake` Module
-------------------------------- --------------------------------
.. automodule:: cinder.virt.fake .. automodule:: manila.virt.fake
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.auth.fakeldap` Module The :mod:`manila.auth.fakeldap` Module
------------------------------------ ------------------------------------
.. automodule:: cinder.auth.fakeldap .. automodule:: manila.auth.fakeldap
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.testing.fake.rabbit` Module The :mod:`manila.testing.fake.rabbit` Module
------------------------------------------ ------------------------------------------
.. automodule:: cinder.testing.fake.rabbit .. automodule:: manila.testing.fake.rabbit
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :class:`cinder.volume.driver.FakeAOEDriver` Class The :class:`manila.volume.driver.FakeAOEDriver` Class
--------------------------------------------------- ---------------------------------------------------
.. autoclass:: cinder.volume.driver.FakeAOEDriver .. autoclass:: manila.volume.driver.FakeAOEDriver
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :class:`cinder.tests.service_unittest.FakeManager` Class The :class:`manila.tests.service_unittest.FakeManager` Class
---------------------------------------------------------- ----------------------------------------------------------
.. autoclass:: cinder.tests.service_unittest.FakeManager .. autoclass:: manila.tests.service_unittest.FakeManager
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.tests.api.openstack.fakes` Module The :mod:`manila.tests.api.openstack.fakes` Module
------------------------------------------------ ------------------------------------------------
.. automodule:: cinder.tests.api.openstack.fakes .. automodule:: manila.tests.api.openstack.fakes
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:

4
doc/source/devref/gerrit.rst
View File

@ -1,11 +1,11 @@
Code Reviews with Gerrit Code Reviews with Gerrit
======================== ========================
Cinder uses the `Gerrit`_ tool to review proposed code changes. The review site Manila uses the `Gerrit`_ tool to review proposed code changes. The review site
is http://review.openstack.org. is http://review.openstack.org.
Gerrit is a complete replacement for Github pull requests. `All Github pull Gerrit is a complete replacement for Github pull requests. `All Github pull
requests to the Cinder repository will be ignored`. requests to the Manila repository will be ignored`.
See `Gerrit Workflow Quick Reference`_ for information about how to get See `Gerrit Workflow Quick Reference`_ for information about how to get
started using Gerrit. See `Gerrit, Jenkins and Github`_ for more detailed started using Gerrit. See `Gerrit, Jenkins and Github`_ for more detailed

10
doc/source/devref/il8n.rst
View File

@ -1,6 +1,6 @@
Internationalization Internationalization
==================== ====================
cinder uses `gettext <http://docs.python.org/library/gettext.html>`_ so that manila uses `gettext <http://docs.python.org/library/gettext.html>`_ so that
user-facing strings such as log messages appear in the appropriate user-facing strings such as log messages appear in the appropriate
language in different locales. language in different locales.
@ -20,14 +20,14 @@ For example::
If you do not follow the project conventions, your code may cause the If you do not follow the project conventions, your code may cause the
LocalizationTestCase.test_multiple_positional_format_placeholders test to fail LocalizationTestCase.test_multiple_positional_format_placeholders test to fail
in cinder/tests/test_localization.py. in manila/tests/test_localization.py.
The ``_()`` function is brought into the global scope by doing:: The ``_()`` function is brought into the global scope by doing::
from cinder.openstack.common import gettextutils from manila.openstack.common import gettextutils
gettextutils.install("cinder") gettextutils.install("manila")
These lines are needed in any toplevel script before any cinder modules are These lines are needed in any toplevel script before any manila modules are
imported. If this code is missing, it may result in an error that looks like:: imported. If this code is missing, it may result in an error that looks like::
NameError: name '_' is not defined NameError: name '_' is not defined

6
doc/source/devref/index.rst
View File

@ -18,7 +18,7 @@
Developer Guide Developer Guide
=============== ===============
In this section you will find information on Cinder's lower level programming APIs. In this section you will find information on Manila's lower level programming APIs.
Programming HowTos and Tutorials Programming HowTos and Tutorials
@ -31,7 +31,7 @@ Programming HowTos and Tutorials
addmethod.openstackapi addmethod.openstackapi
Background Concepts for Cinder Background Concepts for Manila
---------------------------- ----------------------------
.. toctree:: .. toctree::
:maxdepth: 3 :maxdepth: 3
@ -69,7 +69,7 @@ Module Reference
api api
scheduler scheduler
fakes fakes
cinder manila
Indices and tables Indices and tables

34
doc/source/devref/jenkins.rst
View File

@ -1,37 +1,37 @@
Continuous Integration with Jenkins Continuous Integration with Jenkins
=================================== ===================================
Cinder uses a `Jenkins`_ server to automate development tasks. The Jenkins Manila uses a `Jenkins`_ server to automate development tasks. The Jenkins
front-end is at http://jenkins.openstack.org. You must have an front-end is at http://jenkins.openstack.org. You must have an
account on `Launchpad`_ to be able to access the OpenStack Jenkins site. account on `Launchpad`_ to be able to access the OpenStack Jenkins site.
Jenkins performs tasks such as: Jenkins performs tasks such as:
`gate-cinder-unittests`_ `gate-manila-unittests`_
Run unit tests on proposed code changes that have been reviewed. Run unit tests on proposed code changes that have been reviewed.
`gate-cinder-pep8`_ `gate-manila-pep8`_
Run PEP8 checks on proposed code changes that have been reviewed. Run PEP8 checks on proposed code changes that have been reviewed.
`gate-cinder-merge`_ `gate-manila-merge`_
Merge reviewed code into the git repository. Merge reviewed code into the git repository.
`cinder-coverage`_ `manila-coverage`_
Calculate test coverage metrics. Calculate test coverage metrics.
`cinder-docs`_ `manila-docs`_
Build this documentation and push it to http://cinder.openstack.org. Build this documentation and push it to http://manila.openstack.org.
`cinder-tarball`_ `manila-tarball`_
Do ``python setup.py sdist`` to create a tarball of the cinder code and upload Do ``python setup.py sdist`` to create a tarball of the manila code and upload
it to http://cinder.openstack.org/tarballs it to http://manila.openstack.org/tarballs
.. _Jenkins: http://jenkins-ci.org .. _Jenkins: http://jenkins-ci.org
.. _Launchpad: http://launchpad.net .. _Launchpad: http://launchpad.net
.. _gate-cinder-merge: https://jenkins.openstack.org/view/Cinder/job/gate-cinder-merge .. _gate-manila-merge: https://jenkins.openstack.org/view/Manila/job/gate-manila-merge
.. _gate-cinder-pep8: https://jenkins.openstack.org/view/Cinder/job/gate-cinder-pep8 .. _gate-manila-pep8: https://jenkins.openstack.org/view/Manila/job/gate-manila-pep8
.. _gate-cinder-unittests: https://jenkins.openstack.org/view/Cinder/job/gate-cinder-unittests .. _gate-manila-unittests: https://jenkins.openstack.org/view/Manila/job/gate-manila-unittests
.. _cinder-coverage: https://jenkins.openstack.org/view/Cinder/job/cinder-coverage .. _manila-coverage: https://jenkins.openstack.org/view/Manila/job/manila-coverage
.. _cinder-docs: https://jenkins.openstack.org/view/Cinder/job/cinder-docs .. _manila-docs: https://jenkins.openstack.org/view/Manila/job/manila-docs
.. _cinder-pylint: https://jenkins.openstack.org/job/cinder-pylint .. _manila-pylint: https://jenkins.openstack.org/job/manila-pylint
.. _cinder-tarball: https://jenkins.openstack.org/job/cinder-tarball .. _manila-tarball: https://jenkins.openstack.org/job/manila-tarball

18
doc/source/devref/launchpad.rst
View File

@ -1,8 +1,8 @@
Project hosting with Launchpad Project hosting with Launchpad
============================== ==============================
`Launchpad`_ hosts the Cinder project. The Cinder project homepage on Launchpad is `Launchpad`_ hosts the Manila project. The Manila project homepage on Launchpad is
http://launchpad.net/cinder. http://launchpad.net/manila.
Launchpad credentials Launchpad credentials
--------------------- ---------------------
@ -21,7 +21,7 @@ Mailing list
The mailing list email is ``openstack@lists.launchpad.net``. This is a common The mailing list email is ``openstack@lists.launchpad.net``. This is a common
mailing list across the OpenStack projects. To participate in the mailing list: mailing list across the OpenStack projects. To participate in the mailing list:
#. Join the `Cinder Team`_ on Launchpad. #. Join the `Manila Team`_ on Launchpad.
#. Subscribe to the list on the `OpenStack Team`_ page on Launchpad. #. Subscribe to the list on the `OpenStack Team`_ page on Launchpad.
The mailing list archives are at https://lists.launchpad.net/openstack. The mailing list archives are at https://lists.launchpad.net/openstack.
@ -30,25 +30,25 @@ The mailing list archives are at https://lists.launchpad.net/openstack.
Bug tracking Bug tracking
------------ ------------
Report Cinder bugs at https://bugs.launchpad.net/cinder Report Manila bugs at https://bugs.launchpad.net/manila
Feature requests (Blueprints) Feature requests (Blueprints)
----------------------------- -----------------------------
Cinder uses Launchpad Blueprints to track feature requests. Blueprints are at Manila uses Launchpad Blueprints to track feature requests. Blueprints are at
https://blueprints.launchpad.net/cinder. https://blueprints.launchpad.net/manila.
Technical support (Answers) Technical support (Answers)
--------------------------- ---------------------------
Cinder uses Launchpad Answers to track Cinder technical support questions. The Cinder Manila uses Launchpad Answers to track Manila technical support questions. The Manila
Answers page is at https://answers.launchpad.net/cinder. Answers page is at https://answers.launchpad.net/manila.
Note that the `OpenStack Forums`_ (which are not hosted on Launchpad) can also Note that the `OpenStack Forums`_ (which are not hosted on Launchpad) can also
be used for technical support requests. be used for technical support requests.
.. _Launchpad: http://launchpad.net .. _Launchpad: http://launchpad.net
.. _Wiki: http://wiki.openstack.org .. _Wiki: http://wiki.openstack.org
.. _Cinder Team: https://launchpad.net/~cinder .. _Manila Team: https://launchpad.net/~manila
.. _OpenStack Team: https://launchpad.net/~openstack .. _OpenStack Team: https://launchpad.net/~openstack
.. _OpenStack Forums: http://forums.openstack.org/ .. _OpenStack Forums: http://forums.openstack.org/

20
doc/source/devref/rpc.rst
View File

@ -14,28 +14,28 @@
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
AMQP and Cinder AMQP and Manila
============= =============
AMQP is the messaging technology chosen by the OpenStack cloud. The AMQP broker, either RabbitMQ or Qpid, sits between any two Cinder components and allows them to communicate in a loosely coupled fashion. More precisely, Cinder components (the compute fabric of OpenStack) use Remote Procedure Calls (RPC hereinafter) to communicate to one another; however such a paradigm is built atop the publish/subscribe paradigm so that the following benefits can be achieved: AMQP is the messaging technology chosen by the OpenStack cloud. The AMQP broker, either RabbitMQ or Qpid, sits between any two Manila components and allows them to communicate in a loosely coupled fashion. More precisely, Manila components (the compute fabric of OpenStack) use Remote Procedure Calls (RPC hereinafter) to communicate to one another; however such a paradigm is built atop the publish/subscribe paradigm so that the following benefits can be achieved:
* Decoupling between client and servant (such as the client does not need to know where the servant's reference is). * Decoupling between client and servant (such as the client does not need to know where the servant's reference is).
* Full a-synchronism between client and servant (such as the client does not need the servant to run at the same time of the remote call). * Full a-synchronism between client and servant (such as the client does not need the servant to run at the same time of the remote call).
* Random balancing of remote calls (such as if more servants are up and running, one-way calls are transparently dispatched to the first available servant). * Random balancing of remote calls (such as if more servants are up and running, one-way calls are transparently dispatched to the first available servant).
Cinder uses direct, fanout, and topic-based exchanges. The architecture looks like the one depicted in the figure below: Manila uses direct, fanout, and topic-based exchanges. The architecture looks like the one depicted in the figure below:
.. image:: /images/rpc/arch.png .. image:: /images/rpc/arch.png
:width: 60% :width: 60%
.. ..
Cinder implements RPC (both request+response, and one-way, respectively nicknamed 'rpc.call' and 'rpc.cast') over AMQP by providing an adapter class which take cares of marshaling and unmarshaling of messages into function calls. Each Cinder service (for example Compute, Volume, etc.) create two queues at the initialization time, one which accepts messages with routing keys 'NODE-TYPE.NODE-ID' (for example compute.hostname) and another, which accepts messages with routing keys as generic 'NODE-TYPE' (for example compute). The former is used specifically when Cinder-API needs to redirect commands to a specific node like 'euca-terminate instance'. In this case, only the compute node whose host's hypervisor is running the virtual machine can kill the instance. The API acts as a consumer when RPC calls are request/response, otherwise is acts as publisher only. Manila implements RPC (both request+response, and one-way, respectively nicknamed 'rpc.call' and 'rpc.cast') over AMQP by providing an adapter class which take cares of marshaling and unmarshaling of messages into function calls. Each Manila service (for example Compute, Volume, etc.) create two queues at the initialization time, one which accepts messages with routing keys 'NODE-TYPE.NODE-ID' (for example compute.hostname) and another, which accepts messages with routing keys as generic 'NODE-TYPE' (for example compute). The former is used specifically when Manila-API needs to redirect commands to a specific node like 'euca-terminate instance'. In this case, only the compute node whose host's hypervisor is running the virtual machine can kill the instance. The API acts as a consumer when RPC calls are request/response, otherwise is acts as publisher only.
Cinder RPC Mappings Manila RPC Mappings
----------------- -----------------
The figure below shows the internals of a message broker node (referred to as a RabbitMQ node in the diagrams) when a single instance is deployed and shared in an OpenStack cloud. Every Cinder component connects to the message broker and, depending on its personality (for example a compute node or a network node), may use the queue either as an Invoker (such as API or Scheduler) or a Worker (such as Compute, Volume or Network). Invokers and Workers do not actually exist in the Cinder object model, but we are going to use them as an abstraction for sake of clarity. An Invoker is a component that sends messages in the queuing system via two operations: 1) rpc.call and ii) rpc.cast; a Worker is a component that receives messages from the queuing system and reply accordingly to rcp.call operations. The figure below shows the internals of a message broker node (referred to as a RabbitMQ node in the diagrams) when a single instance is deployed and shared in an OpenStack cloud. Every Manila component connects to the message broker and, depending on its personality (for example a compute node or a network node), may use the queue either as an Invoker (such as API or Scheduler) or a Worker (such as Compute, Volume or Network). Invokers and Workers do not actually exist in the Manila object model, but we are going to use them as an abstraction for sake of clarity. An Invoker is a component that sends messages in the queuing system via two operations: 1) rpc.call and ii) rpc.cast; a Worker is a component that receives messages from the queuing system and reply accordingly to rcp.call operations.
Figure 2 shows the following internal elements: Figure 2 shows the following internal elements:
@ -43,7 +43,7 @@ Figure 2 shows the following internal elements:
* Direct Consumer: a Direct Consumer comes to life if (an only if) a rpc.call operation is executed; this object is instantiated and used to receive a response message from the queuing system; Every consumer connects to a unique direct-based exchange via a unique exclusive queue; its life-cycle is limited to the message delivery; the exchange and queue identifiers are determined by a UUID generator, and are marshaled in the message sent by the Topic Publisher (only rpc.call operations). * Direct Consumer: a Direct Consumer comes to life if (an only if) a rpc.call operation is executed; this object is instantiated and used to receive a response message from the queuing system; Every consumer connects to a unique direct-based exchange via a unique exclusive queue; its life-cycle is limited to the message delivery; the exchange and queue identifiers are determined by a UUID generator, and are marshaled in the message sent by the Topic Publisher (only rpc.call operations).
* Topic Consumer: a Topic Consumer comes to life as soon as a Worker is instantiated and exists throughout its life-cycle; this object is used to receive messages from the queue and it invokes the appropriate action as defined by the Worker role. A Topic Consumer connects to the same topic-based exchange either via a shared queue or via a unique exclusive queue. Every Worker has two topic consumers, one that is addressed only during rpc.cast operations (and it connects to a shared queue whose exchange key is 'topic') and the other that is addressed only during rpc.call operations (and it connects to a unique queue whose exchange key is 'topic.host'). * Topic Consumer: a Topic Consumer comes to life as soon as a Worker is instantiated and exists throughout its life-cycle; this object is used to receive messages from the queue and it invokes the appropriate action as defined by the Worker role. A Topic Consumer connects to the same topic-based exchange either via a shared queue or via a unique exclusive queue. Every Worker has two topic consumers, one that is addressed only during rpc.cast operations (and it connects to a shared queue whose exchange key is 'topic') and the other that is addressed only during rpc.call operations (and it connects to a unique queue whose exchange key is 'topic.host').
* Direct Publisher: a Direct Publisher comes to life only during rpc.call operations and it is instantiated to return the message required by the request/response operation. The object connects to a direct-based exchange whose identity is dictated by the incoming message. * Direct Publisher: a Direct Publisher comes to life only during rpc.call operations and it is instantiated to return the message required by the request/response operation. The object connects to a direct-based exchange whose identity is dictated by the incoming message.
* Topic Exchange: The Exchange is a routing table that exists in the context of a virtual host (the multi-tenancy mechanism provided by Qpid or RabbitMQ); its type (such as topic vs. direct) determines the routing policy; a message broker node will have only one topic-based exchange for every topic in Cinder. * Topic Exchange: The Exchange is a routing table that exists in the context of a virtual host (the multi-tenancy mechanism provided by Qpid or RabbitMQ); its type (such as topic vs. direct) determines the routing policy; a message broker node will have only one topic-based exchange for every topic in Manila.
* Direct Exchange: this is a routing table that is created during rpc.call operations; there are many instances of this kind of exchange throughout the life-cycle of a message broker node, one for each rpc.call invoked. * Direct Exchange: this is a routing table that is created during rpc.call operations; there are many instances of this kind of exchange throughout the life-cycle of a message broker node, one for each rpc.call invoked.
* Queue Element: A Queue is a message bucket. Messages are kept in the queue until a Consumer (either Topic or Direct Consumer) connects to the queue and fetch it. Queues can be shared or can be exclusive. Queues whose routing key is 'topic' are shared amongst Workers of the same personality. * Queue Element: A Queue is a message bucket. Messages are kept in the queue until a Consumer (either Topic or Direct Consumer) connects to the queue and fetch it. Queues can be shared or can be exclusive. Queues whose routing key is 'topic' are shared amongst Workers of the same personality.
@ -88,10 +88,10 @@ At any given time the load of a message broker node running either Qpid or Rabbi
* Throughput of API calls: the number of API calls (more precisely rpc.call ops) being served by the OpenStack cloud dictates the number of direct-based exchanges, related queues and direct consumers connected to them. * Throughput of API calls: the number of API calls (more precisely rpc.call ops) being served by the OpenStack cloud dictates the number of direct-based exchanges, related queues and direct consumers connected to them.
* Number of Workers: there is one queue shared amongst workers with the same personality; however there are as many exclusive queues as the number of workers; the number of workers dictates also the number of routing keys within the topic-based exchange, which is shared amongst all workers. * Number of Workers: there is one queue shared amongst workers with the same personality; however there are as many exclusive queues as the number of workers; the number of workers dictates also the number of routing keys within the topic-based exchange, which is shared amongst all workers.
The figure below shows the status of a RabbitMQ node after Cinder components' bootstrap in a test environment. Exchanges and queues being created by Cinder components are: The figure below shows the status of a RabbitMQ node after Manila components' bootstrap in a test environment. Exchanges and queues being created by Manila components are:
* Exchanges * Exchanges
1. cinder (topic exchange) 1. manila (topic exchange)
* Queues * Queues
1. compute.phantom (phantom is hostname) 1. compute.phantom (phantom is hostname)
2. compute 2. compute
@ -110,7 +110,7 @@ The figure below shows the status of a RabbitMQ node after Cinder components' bo
RabbitMQ Gotchas RabbitMQ Gotchas
---------------- ----------------
Cinder uses Kombu to connect to the RabbitMQ environment. Kombu is a Python library that in turn uses AMQPLib, a library that implements the standard AMQP 0.8 at the time of writing. When using Kombu, Invokers and Workers need the following parameters in order to instantiate a Connection object that connects to the RabbitMQ server (please note that most of the following material can be also found in the Kombu documentation; it has been summarized and revised here for sake of clarity): Manila uses Kombu to connect to the RabbitMQ environment. Kombu is a Python library that in turn uses AMQPLib, a library that implements the standard AMQP 0.8 at the time of writing. When using Kombu, Invokers and Workers need the following parameters in order to instantiate a Connection object that connects to the RabbitMQ server (please note that most of the following material can be also found in the Kombu documentation; it has been summarized and revised here for sake of clarity):
* Hostname: The hostname to the AMQP server. * Hostname: The hostname to the AMQP server.
* Userid: A valid username used to authenticate to the server. * Userid: A valid username used to authenticate to the server.

14
doc/source/devref/scheduler.rst
View File

@ -18,30 +18,30 @@
Scheduler Scheduler
========= =========
The :mod:`cinder.scheduler.manager` Module The :mod:`manila.scheduler.manager` Module
---------------------------------------- ----------------------------------------
.. automodule:: cinder.scheduler.manager .. automodule:: manila.scheduler.manager
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.scheduler.driver` Module The :mod:`manila.scheduler.driver` Module
--------------------------------------- ---------------------------------------
.. automodule:: cinder.scheduler.driver .. automodule:: manila.scheduler.driver
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.scheduler.simple` Driver The :mod:`manila.scheduler.simple` Driver
--------------------------------------- ---------------------------------------
.. automodule:: cinder.scheduler.simple .. automodule:: manila.scheduler.simple
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -54,7 +54,7 @@ Tests
The :mod:`scheduler_unittest` Module The :mod:`scheduler_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.scheduler_unittest .. automodule:: manila.tests.scheduler_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:

10
doc/source/devref/services.rst
View File

@ -20,25 +20,25 @@
Services, Managers and Drivers Services, Managers and Drivers
============================== ==============================
The responsibilities of Services, Managers, and Drivers, can be a bit confusing to people that are new to cinder. This document attempts to outline the division of responsibilities to make understanding the system a little bit easier. The responsibilities of Services, Managers, and Drivers, can be a bit confusing to people that are new to manila. This document attempts to outline the division of responsibilities to make understanding the system a little bit easier.
Currently, Managers and Drivers are specified by flags and loaded using utils.load_object(). This method allows for them to be implemented as singletons, classes, modules or objects. As long as the path specified by the flag leads to an object (or a callable that returns an object) that responds to getattr, it should work as a manager or driver. Currently, Managers and Drivers are specified by flags and loaded using utils.load_object(). This method allows for them to be implemented as singletons, classes, modules or objects. As long as the path specified by the flag leads to an object (or a callable that returns an object) that responds to getattr, it should work as a manager or driver.
The :mod:`cinder.service` Module The :mod:`manila.service` Module
------------------------------ ------------------------------
.. automodule:: cinder.service .. automodule:: manila.service
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.manager` Module The :mod:`manila.manager` Module
------------------------------ ------------------------------
.. automodule:: cinder.manager .. automodule:: manila.manager
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:

2
doc/source/devref/threading.rst
View File

@ -46,6 +46,6 @@ block, but this implementation resulted in a `bug`_ and was removed.
See this `mailing list thread`_ for a discussion of this issue, including See this `mailing list thread`_ for a discussion of this issue, including
a discussion of the `impact on performance`_. a discussion of the `impact on performance`_.
.. _bug: https://bugs.launchpad.net/cinder/+bug/838581 .. _bug: https://bugs.launchpad.net/manila/+bug/838581
.. _mailing list thread: https://lists.launchpad.net/openstack/msg08118.html .. _mailing list thread: https://lists.launchpad.net/openstack/msg08118.html
.. _impact on performance: https://lists.launchpad.net/openstack/msg08217.html .. _impact on performance: https://lists.launchpad.net/openstack/msg08217.html

18
doc/source/devref/unit_tests.rst
View File

@ -1,7 +1,7 @@
Unit Tests Unit Tests
========== ==========
Cinder contains a suite of unit tests, in the cinder/tests directory. Manila contains a suite of unit tests, in the manila/tests directory.
Any proposed code change will be automatically rejected by the OpenStack Any proposed code change will be automatically rejected by the OpenStack
Jenkins server [#f1]_ if the change causes unit test failures. Jenkins server [#f1]_ if the change causes unit test failures.
@ -28,7 +28,7 @@ flags by doing::
This will show the following help information:: This will show the following help information::
Usage: ./run_tests.sh [OPTION]... Usage: ./run_tests.sh [OPTION]...
Run Cinder's test suite(s) Run Manila's test suite(s)
-V, --virtual-env Always use virtualenv. Install automatically if not present -V, --virtual-env Always use virtualenv. Install automatically if not present
-N, --no-virtual-env Don't use virtualenv. Run tests in local environment -N, --no-virtual-env Don't use virtualenv. Run tests in local environment
@ -55,21 +55,21 @@ Running a subset of tests
Instead of running all tests, you can specify an individual directory, file, Instead of running all tests, you can specify an individual directory, file,
class, or method that contains test code. class, or method that contains test code.
To run the tests in the ``cinder/tests/scheduler`` directory:: To run the tests in the ``manila/tests/scheduler`` directory::
./run_tests.sh scheduler ./run_tests.sh scheduler
To run the tests in the ``cinder/tests/test_libvirt.py`` file:: To run the tests in the ``manila/tests/test_libvirt.py`` file::
./run_tests.sh test_libvirt ./run_tests.sh test_libvirt
To run the tests in the `HostStateTestCase` class in To run the tests in the `HostStateTestCase` class in
``cinder/tests/test_libvirt.py``:: ``manila/tests/test_libvirt.py``::
./run_tests.sh test_libvirt:HostStateTestCase ./run_tests.sh test_libvirt:HostStateTestCase
To run the `ToPrimitiveTestCase.test_dict` test method in To run the `ToPrimitiveTestCase.test_dict` test method in
``cinder/tests/test_utils.py``:: ``manila/tests/test_utils.py``::
./run_tests.sh test_utils:ToPrimitiveTestCase.test_dict ./run_tests.sh test_utils:ToPrimitiveTestCase.test_dict
@ -128,7 +128,7 @@ exists it can be reused by using the flag::
-n, --no-recreate-db -n, --no-recreate-db
Reusing an existing database may cause tests to fail if the schema has Reusing an existing database may cause tests to fail if the schema has
changed. If any files in the ``cinder/db/sqlalchemy`` have changed, it's a good changed. If any files in the ``manila/db/sqlalchemy`` have changed, it's a good
idea to recreate the test database. idea to recreate the test database.
Gotchas Gotchas
@ -139,7 +139,7 @@ Gotchas
If you are running the unit tests from a shared folder, you may see tests start If you are running the unit tests from a shared folder, you may see tests start
to fail or stop completely as a result of Python lockfile issues [#f4]_. You to fail or stop completely as a result of Python lockfile issues [#f4]_. You
can get around this by manually setting or updating the following line in can get around this by manually setting or updating the following line in
``cinder/tests/fake_flags.py``:: ``manila/tests/fake_flags.py``::
FLAGS['lock_path'].SetDefault('/tmp') FLAGS['lock_path'].SetDefault('/tmp')
@ -156,4 +156,4 @@ a shared folder.
.. [#f3] There is an effort underway to use a fake DB implementation for the .. [#f3] There is an effort underway to use a fake DB implementation for the
unit tests. See https://lists.launchpad.net/openstack/msg05604.html unit tests. See https://lists.launchpad.net/openstack/msg05604.html
.. [#f4] See Vish's comment in this bug report: https://bugs.launchpad.net/cinder/+bug/882933 .. [#f4] See Vish's comment in this bug report: https://bugs.launchpad.net/manila/+bug/882933

14
doc/source/devref/volume.rst
View File

@ -21,19 +21,19 @@ Storage Volumes, Disks
.. todo:: rework after iSCSI merge (see 'Old Docs') (todd or vish) .. todo:: rework after iSCSI merge (see 'Old Docs') (todd or vish)
The :mod:`cinder.volume.manager` Module The :mod:`manila.volume.manager` Module
------------------------------------- -------------------------------------
.. automodule:: cinder.volume.manager .. automodule:: manila.volume.manager
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
The :mod:`cinder.volume.driver` Module The :mod:`manila.volume.driver` Module
------------------------------------- -------------------------------------
.. automodule:: cinder.volume.driver .. automodule:: manila.volume.driver
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -46,7 +46,7 @@ Tests
The :mod:`volume_unittest` Module The :mod:`volume_unittest` Module
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: cinder.tests.volume_unittest .. automodule:: manila.tests.volume_unittest
:noindex: :noindex:
:members: :members:
:undoc-members: :undoc-members:
@ -55,9 +55,9 @@ The :mod:`volume_unittest` Module
Old Docs Old Docs
-------- --------
Cinder uses iSCSI to export storage volumes from multiple storage nodes. These iSCSI exports are attached (using libvirt) directly to running instances. Manila uses iSCSI to export storage volumes from multiple storage nodes. These iSCSI exports are attached (using libvirt) directly to running instances.
Cinder volumes are exported over the primary system VLAN (usually VLAN 1), and not over individual VLANs. Manila volumes are exported over the primary system VLAN (usually VLAN 1), and not over individual VLANs.
The underlying volumes by default are LVM logical volumes, created on demand within a single large volume group. The underlying volumes by default are LVM logical volumes, created on demand within a single large volume group.

4
doc/source/images/rpc/arch.svg
View File

@ -139,14 +139,14 @@
<text x="0.41" y="409.22" class="st6" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>http</text> </g> <text x="0.41" y="409.22" class="st6" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>http</text> </g>
<g id="shape11-37" v:mID="11" v:groupContext="shape" transform="translate(0.24,-314.457)"> <g id="shape11-37" v:mID="11" v:groupContext="shape" transform="translate(0.24,-314.457)">
<title>Circle</title> <title>Circle</title>
<desc>Cinder-Manage</desc> <desc>Manila-Manage</desc>
<v:userDefs> <v:userDefs>
<v:ud v:nameU="visVersion" v:val="VT0(11):26"/> <v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
</v:userDefs> </v:userDefs>
<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/> <v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
<v:textRect cx="42.5197" cy="343.043" width="85.04" height="28.3465"/> <v:textRect cx="42.5197" cy="343.043" width="85.04" height="28.3465"/>
<path d="M0 343.04 A42.5197 14.1732 0 0 1 85.04 343.04 A42.5197 14.1732 0 0 1 0 343.04 Z" class="st7"/> <path d="M0 343.04 A42.5197 14.1732 0 0 1 85.04 343.04 A42.5197 14.1732 0 0 1 0 343.04 Z" class="st7"/>
<text x="4.83" y="346.64" class="st8" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>Cinder-Manage</text> </g> <text x="4.83" y="346.64" class="st8" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>Manila-Manage</text> </g>
<g id="shape12-40" v:mID="12" v:groupContext="shape" transform="translate(0.24,-101.858)"> <g id="shape12-40" v:mID="12" v:groupContext="shape" transform="translate(0.24,-101.858)">
<title>Circle.15</title> <title>Circle.15</title>
<desc>Euca2ools</desc> <desc>Euca2ools</desc>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

10
doc/source/index.rst
View File

@ -15,20 +15,20 @@
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
Welcome to Cinder's developer documentation! Welcome to Manila's developer documentation!
========================================== ==========================================
Cinder is an OpenStack project to provide "block storage as a service". Manila is an OpenStack project to provide "block storage as a service".
* **Component based architecture**: Quickly add new behaviors * **Component based architecture**: Quickly add new behaviors
* **Highly available**: Scale to very serious workloads * **Highly available**: Scale to very serious workloads
* **Fault-Tolerant**: Isolated processes avoid cascading failures * **Fault-Tolerant**: Isolated processes avoid cascading failures
* **Recoverable**: Failures should be easy to diagnose, debug, and rectify * **Recoverable**: Failures should be easy to diagnose, debug, and rectify
* **Open Standards**: Be a reference implementation for a community-driven api * **Open Standards**: Be a reference implementation for a community-driven api
* **API Compatibility**: Cinder strives to provide API-compatible with popular systems like Amazon EC2 * **API Compatibility**: Manila strives to provide API-compatible with popular systems like Amazon EC2
This documentation is generated by the Sphinx toolkit and lives in the source This documentation is generated by the Sphinx toolkit and lives in the source
tree. Additional draft and project documentation on Cinder and other components of OpenStack can tree. Additional draft and project documentation on Manila and other components of OpenStack can
be found on the `OpenStack wiki`_. Cloud administrators, refer to `docs.openstack.org`_. be found on the `OpenStack wiki`_. Cloud administrators, refer to `docs.openstack.org`_.
.. _`OpenStack wiki`: http://wiki.openstack.org .. _`OpenStack wiki`: http://wiki.openstack.org
@ -46,7 +46,7 @@ Developer Docs
API Extensions API Extensions
============== ==============
Go to http://api.openstack.org for information about Cinder API extensions. Go to http://api.openstack.org for information about Manila API extensions.
Outstanding Documentation Tasks Outstanding Documentation Tasks
=============================== ===============================

154
doc/source/man/cinder-manage.rst
View File

@ -1,5 +1,5 @@
=========== ===========
cinder-manage manila-manage
=========== ===========
------------------------------------------------------ ------------------------------------------------------
@ -16,195 +16,195 @@ control and manage cloud computer instances and images
SYNOPSIS SYNOPSIS
======== ========
cinder-manage <category> <action> [<args>] manila-manage <category> <action> [<args>]
DESCRIPTION DESCRIPTION
=========== ===========
cinder-manage controls cloud computing instances by managing cinder users, cinder projects, cinder roles, shell selection, vpn connections, and floating IP address configuration. More information about OpenStack Cinder is at http://cinder.openstack.org. manila-manage controls cloud computing instances by managing manila users, manila projects, manila roles, shell selection, vpn connections, and floating IP address configuration. More information about OpenStack Manila is at http://manila.openstack.org.
OPTIONS OPTIONS
======= =======
The standard pattern for executing a cinder-manage command is: The standard pattern for executing a manila-manage command is:
``cinder-manage <category> <command> [<args>]`` ``manila-manage <category> <command> [<args>]``
For example, to obtain a list of all projects: For example, to obtain a list of all projects:
``cinder-manage project list`` ``manila-manage project list``
Run without arguments to see a list of available command categories: Run without arguments to see a list of available command categories:
``cinder-manage`` ``manila-manage``
Categories are user, project, role, shell, vpn, and floating. Detailed descriptions are below. Categories are user, project, role, shell, vpn, and floating. Detailed descriptions are below.
You can also run with a category argument such as user to see a list of all commands in that category: You can also run with a category argument such as user to see a list of all commands in that category:
``cinder-manage user`` ``manila-manage user``
These sections describe the available categories and arguments for cinder-manage. These sections describe the available categories and arguments for manila-manage.
Cinder Db Manila Db
~~~~~~~ ~~~~~~~
``cinder-manage db version`` ``manila-manage db version``
Print the current database version. Print the current database version.
``cinder-manage db sync`` ``manila-manage db sync``
Sync the database up to the most recent version. This is the standard way to create the db as well. Sync the database up to the most recent version. This is the standard way to create the db as well.
Cinder User Manila User
~~~~~~~~~ ~~~~~~~~~
``cinder-manage user admin <username>`` ``manila-manage user admin <username>``
Create an admin user with the name <username>. Create an admin user with the name <username>.
``cinder-manage user create <username>`` ``manila-manage user create <username>``
Create a normal user with the name <username>. Create a normal user with the name <username>.
``cinder-manage user delete <username>`` ``manila-manage user delete <username>``
Delete the user with the name <username>. Delete the user with the name <username>.
``cinder-manage user exports <username>`` ``manila-manage user exports <username>``
Outputs a list of access key and secret keys for user to the screen Outputs a list of access key and secret keys for user to the screen
``cinder-manage user list`` ``manila-manage user list``
Outputs a list of all the user names to the screen. Outputs a list of all the user names to the screen.
``cinder-manage user modify <accesskey> <secretkey> <admin?T/F>`` ``manila-manage user modify <accesskey> <secretkey> <admin?T/F>``
Updates the indicated user keys, indicating with T or F if the user is an admin user. Leave any argument blank if you do not want to update it. Updates the indicated user keys, indicating with T or F if the user is an admin user. Leave any argument blank if you do not want to update it.
Cinder Project Manila Project
~~~~~~~~~~~~ ~~~~~~~~~~~~
``cinder-manage project add <projectname>`` ``manila-manage project add <projectname>``
Add a cinder project with the name <projectname> to the database. Add a manila project with the name <projectname> to the database.
``cinder-manage project create <projectname>`` ``manila-manage project create <projectname>``
Create a new cinder project with the name <projectname> (you still need to do cinder-manage project add <projectname> to add it to the database). Create a new manila project with the name <projectname> (you still need to do manila-manage project add <projectname> to add it to the database).
``cinder-manage project delete <projectname>`` ``manila-manage project delete <projectname>``
Delete a cinder project with the name <projectname>. Delete a manila project with the name <projectname>.
``cinder-manage project environment <projectname> <username>`` ``manila-manage project environment <projectname> <username>``
Exports environment variables for the named project to a file named cinderrc. Exports environment variables for the named project to a file named manilarc.
``cinder-manage project list`` ``manila-manage project list``
Outputs a list of all the projects to the screen. Outputs a list of all the projects to the screen.
``cinder-manage project quota <projectname>`` ``manila-manage project quota <projectname>``
Outputs the size and specs of the project's instances including gigabytes, instances, floating IPs, volumes, and cores. Outputs the size and specs of the project's instances including gigabytes, instances, floating IPs, volumes, and cores.
``cinder-manage project remove <projectname>`` ``manila-manage project remove <projectname>``
Deletes the project with the name <projectname>. Deletes the project with the name <projectname>.
``cinder-manage project zipfile`` ``manila-manage project zipfile``
Compresses all related files for a created project into a zip file cinder.zip. Compresses all related files for a created project into a zip file manila.zip.
Cinder Role Manila Role
~~~~~~~~~ ~~~~~~~~~
``cinder-manage role add <username> <rolename> <(optional) projectname>`` ``manila-manage role add <username> <rolename> <(optional) projectname>``
Add a user to either a global or project-based role with the indicated <rolename> assigned to the named user. Role names can be one of the following five roles: cloudadmin, itsec, sysadmin, netadmin, developer. If you add the project name as the last argument then the role is assigned just for that project, otherwise the user is assigned the named role for all projects. Add a user to either a global or project-based role with the indicated <rolename> assigned to the named user. Role names can be one of the following five roles: cloudadmin, itsec, sysadmin, netadmin, developer. If you add the project name as the last argument then the role is assigned just for that project, otherwise the user is assigned the named role for all projects.
``cinder-manage role has <username> <projectname>`` ``manila-manage role has <username> <projectname>``
Checks the user or project and responds with True if the user has a global role with a particular project. Checks the user or project and responds with True if the user has a global role with a particular project.
``cinder-manage role remove <username> <rolename>`` ``manila-manage role remove <username> <rolename>``
Remove the indicated role from the user. Remove the indicated role from the user.
Cinder Logs Manila Logs
~~~~~~~~~ ~~~~~~~~~
``cinder-manage logs errors`` ``manila-manage logs errors``
Displays cinder errors from log files. Displays manila errors from log files.
``cinder-manage logs syslog <number>`` ``manila-manage logs syslog <number>``
Displays cinder alerts from syslog. Displays manila alerts from syslog.
Cinder Shell Manila Shell
~~~~~~~~~~ ~~~~~~~~~~
``cinder-manage shell bpython`` ``manila-manage shell bpython``
Starts a new bpython shell. Starts a new bpython shell.
``cinder-manage shell ipython`` ``manila-manage shell ipython``
Starts a new ipython shell. Starts a new ipython shell.
``cinder-manage shell python`` ``manila-manage shell python``
Starts a new python shell. Starts a new python shell.
``cinder-manage shell run`` ``manila-manage shell run``
Starts a new shell using python. Starts a new shell using python.
``cinder-manage shell script <path/scriptname>`` ``manila-manage shell script <path/scriptname>``
Runs the named script from the specified path with flags set. Runs the named script from the specified path with flags set.
Cinder VPN Manila VPN
~~~~~~~~ ~~~~~~~~
``cinder-manage vpn list`` ``manila-manage vpn list``
Displays a list of projects, their IP prot numbers, and what state they're in. Displays a list of projects, their IP prot numbers, and what state they're in.
``cinder-manage vpn run <projectname>`` ``manila-manage vpn run <projectname>``
Starts the VPN for the named project. Starts the VPN for the named project.
``cinder-manage vpn spawn`` ``manila-manage vpn spawn``
Runs all VPNs. Runs all VPNs.
Cinder Floating IPs Manila Floating IPs
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
``cinder-manage floating create <ip_range> [--pool <pool>] [--interface <interface>]`` ``manila-manage floating create <ip_range> [--pool <pool>] [--interface <interface>]``
Creates floating IP addresses for the given range, optionally specifying Creates floating IP addresses for the given range, optionally specifying
a floating pool and a network interface. a floating pool and a network interface.
``cinder-manage floating delete <ip_range>`` ``manila-manage floating delete <ip_range>``
Deletes floating IP addresses in the range given. Deletes floating IP addresses in the range given.
``cinder-manage floating list`` ``manila-manage floating list``
Displays a list of all floating IP addresses. Displays a list of all floating IP addresses.
Cinder Flavor Manila Flavor
~~~~~~~~~~~ ~~~~~~~~~~~
``cinder-manage flavor list`` ``manila-manage flavor list``
Outputs a list of all active flavors to the screen. Outputs a list of all active flavors to the screen.
``cinder-manage flavor list --all`` ``manila-manage flavor list --all``
Outputs a list of all flavors (active and inactive) to the screen. Outputs a list of all flavors (active and inactive) to the screen.
``cinder-manage flavor create <name> <memory> <vCPU> <local_storage> <flavorID> <(optional) swap> <(optional) RXTX Quota> <(optional) RXTX Cap>`` ``manila-manage flavor create <name> <memory> <vCPU> <local_storage> <flavorID> <(optional) swap> <(optional) RXTX Quota> <(optional) RXTX Cap>``
creates a flavor with the following positional arguments: creates a flavor with the following positional arguments:
* memory (expressed in megabytes) * memory (expressed in megabytes)
@ -215,67 +215,67 @@ Cinder Flavor
* RXTX quotas (expressed in gigabytes, defaults to zero, optional) * RXTX quotas (expressed in gigabytes, defaults to zero, optional)
* RXTX cap (expressed in gigabytes, defaults to zero, optional) * RXTX cap (expressed in gigabytes, defaults to zero, optional)
``cinder-manage flavor delete <name>`` ``manila-manage flavor delete <name>``
Delete the flavor with the name <name>. This marks the flavor as inactive and cannot be launched. However, the record stays in the database for archival and billing purposes. Delete the flavor with the name <name>. This marks the flavor as inactive and cannot be launched. However, the record stays in the database for archival and billing purposes.
``cinder-manage flavor delete <name> --purge`` ``manila-manage flavor delete <name> --purge``
Purges the flavor with the name <name>. This removes this flavor from the database. Purges the flavor with the name <name>. This removes this flavor from the database.
Cinder Instance_type Manila Instance_type
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
The instance_type command is provided as an alias for the flavor command. All the same subcommands and arguments from cinder-manage flavor can be used. The instance_type command is provided as an alias for the flavor command. All the same subcommands and arguments from manila-manage flavor can be used.
Cinder Images Manila Images
~~~~~~~~~~~ ~~~~~~~~~~~
``cinder-manage image image_register <path> <owner>`` ``manila-manage image image_register <path> <owner>``
Registers an image with the image service. Registers an image with the image service.
``cinder-manage image kernel_register <path> <owner>`` ``manila-manage image kernel_register <path> <owner>``
Registers a kernel with the image service. Registers a kernel with the image service.
``cinder-manage image ramdisk_register <path> <owner>`` ``manila-manage image ramdisk_register <path> <owner>``
Registers a ramdisk with the image service. Registers a ramdisk with the image service.
``cinder-manage image all_register <image_path> <kernel_path> <ramdisk_path> <owner>`` ``manila-manage image all_register <image_path> <kernel_path> <ramdisk_path> <owner>``
Registers an image kernel and ramdisk with the image service. Registers an image kernel and ramdisk with the image service.
``cinder-manage image convert <directory>`` ``manila-manage image convert <directory>``
Converts all images in directory from the old (Bexar) format to the new format. Converts all images in directory from the old (Bexar) format to the new format.
Cinder VM Manila VM
~~~~~~~~~~~ ~~~~~~~~~~~
``cinder-manage vm list [host]`` ``manila-manage vm list [host]``
Show a list of all instances. Accepts optional hostname (to show only instances on specific host). Show a list of all instances. Accepts optional hostname (to show only instances on specific host).
``cinder-manage live-migration <ec2_id> <destination host name>`` ``manila-manage live-migration <ec2_id> <destination host name>``
Live migrate instance from current host to destination host. Requires instance id (which comes from euca-describe-instance) and destination host name (which can be found from cinder-manage service list). Live migrate instance from current host to destination host. Requires instance id (which comes from euca-describe-instance) and destination host name (which can be found from manila-manage service list).
FILES FILES
======== ========
The cinder-manage.conf file contains configuration information in the form of python-gflags. The manila-manage.conf file contains configuration information in the form of python-gflags.
SEE ALSO SEE ALSO
======== ========
* `OpenStack Cinder <http://cinder.openstack.org>`__ * `OpenStack Manila <http://manila.openstack.org>`__
* `OpenStack Swift <http://swift.openstack.org>`__ * `OpenStack Swift <http://swift.openstack.org>`__
BUGS BUGS
==== ====
* Cinder is sourced in Launchpad so you can view current bugs at `OpenStack Cinder <http://cinder.openstack.org>`__ * Manila is sourced in Launchpad so you can view current bugs at `OpenStack Manila <http://manila.openstack.org>`__

12
manila.egg-info/PKG-INFO
View File

@ -6,27 +6,27 @@ Home-page: http://www.openstack.org/
Author: OpenStack Author: OpenStack
Author-email: openstack-dev@lists.openstack.org Author-email: openstack-dev@lists.openstack.org
License: UNKNOWN License: UNKNOWN
Description: The Choose Your Own Adventure README for Cinder Description: The Choose Your Own Adventure README for Manila
=============================================== ===============================================
You have come across a storage service for an open cloud computing service. You have come across a storage service for an open cloud computing service.
It has identified itself as "Cinder." It was abstracted from the Nova project. It has identified itself as "Manila." It was abstracted from the Nova project.
To monitor it from a distance: follow `@openstack <http://twitter.com/openstack>`_ on twitter. To monitor it from a distance: follow `@openstack <http://twitter.com/openstack>`_ on twitter.
To tame it for use in your own cloud: read http://docs.openstack.org To tame it for use in your own cloud: read http://docs.openstack.org
To study its anatomy: read http://cinder.openstack.org To study its anatomy: read http://manila.openstack.org
To dissect it in detail: visit http://github.com/openstack/cinder To dissect it in detail: visit http://github.com/openstack/manila
To taunt it with its weaknesses: use http://bugs.launchpad.net/cinder To taunt it with its weaknesses: use http://bugs.launchpad.net/manila
To watch it: http://jenkins.openstack.org To watch it: http://jenkins.openstack.org
To hack at it: read HACKING To hack at it: read HACKING
To cry over its pylint problems: http://jenkins.openstack.org/job/cinder-pylint/violations To cry over its pylint problems: http://jenkins.openstack.org/job/manila-pylint/violations
Platform: UNKNOWN Platform: UNKNOWN

926
manila.egg-info/SOURCES.txt
View File

@ -11,457 +11,457 @@ run_tests.sh
setup.cfg setup.cfg
setup.py setup.py
tox.ini tox.ini
bin/cinder-all bin/manila-all
bin/cinder-api bin/manila-api
bin/cinder-backup bin/manila-backup
bin/cinder-clear-rabbit-queues bin/manila-clear-rabbit-queues
bin/cinder-manage bin/manila-manage
bin/cinder-rootwrap bin/manila-rootwrap
bin/cinder-rpc-zmq-receiver bin/manila-rpc-zmq-receiver
bin/cinder-scheduler bin/manila-scheduler
bin/cinder-share bin/manila-share
bin/cinder-volume bin/manila-volume
bin/cinder-volume-usage-audit bin/manila-volume-usage-audit
cinder/__init__.py manila/__init__.py
cinder/context.py manila/context.py
cinder/exception.py manila/exception.py
cinder/flags.py manila/flags.py
cinder/manager.py manila/manager.py
cinder/policy.py manila/policy.py
cinder/quota.py manila/quota.py
cinder/service.py manila/service.py
cinder/test.py manila/test.py
cinder/utils.py manila/utils.py
cinder/version.py manila/version.py
cinder/wsgi.py manila/wsgi.py
cinder/api/__init__.py manila/api/__init__.py
cinder/api/auth.py manila/api/auth.py
cinder/api/common.py manila/api/common.py
cinder/api/extensions.py manila/api/extensions.py
cinder/api/sizelimit.py manila/api/sizelimit.py
cinder/api/urlmap.py manila/api/urlmap.py
cinder/api/versions.py manila/api/versions.py
cinder/api/xmlutil.py manila/api/xmlutil.py
cinder/api/contrib/__init__.py manila/api/contrib/__init__.py
cinder/api/contrib/admin_actions.py manila/api/contrib/admin_actions.py
cinder/api/contrib/backups.py manila/api/contrib/backups.py
cinder/api/contrib/extended_snapshot_attributes.py manila/api/contrib/extended_snapshot_attributes.py
cinder/api/contrib/hosts.py manila/api/contrib/hosts.py
cinder/api/contrib/image_create.py manila/api/contrib/image_create.py
cinder/api/contrib/quota_classes.py manila/api/contrib/quota_classes.py
cinder/api/contrib/quotas.py manila/api/contrib/quotas.py
cinder/api/contrib/services.py manila/api/contrib/services.py
cinder/api/contrib/share_actions.py manila/api/contrib/share_actions.py
cinder/api/contrib/share_snapshots.py manila/api/contrib/share_snapshots.py
cinder/api/contrib/shares.py manila/api/contrib/shares.py
cinder/api/contrib/types_extra_specs.py manila/api/contrib/types_extra_specs.py
cinder/api/contrib/types_manage.py manila/api/contrib/types_manage.py
cinder/api/contrib/volume_actions.py manila/api/contrib/volume_actions.py
cinder/api/contrib/volume_host_attribute.py manila/api/contrib/volume_host_attribute.py
cinder/api/contrib/volume_image_metadata.py manila/api/contrib/volume_image_metadata.py
cinder/api/contrib/volume_tenant_attribute.py manila/api/contrib/volume_tenant_attribute.py
cinder/api/middleware/__init__.py manila/api/middleware/__init__.py
cinder/api/middleware/auth.py manila/api/middleware/auth.py
cinder/api/middleware/fault.py manila/api/middleware/fault.py
cinder/api/middleware/sizelimit.py manila/api/middleware/sizelimit.py
cinder/api/openstack/__init__.py manila/api/openstack/__init__.py
cinder/api/openstack/urlmap.py manila/api/openstack/urlmap.py
cinder/api/openstack/wsgi.py manila/api/openstack/wsgi.py
cinder/api/openstack/volume/__init__.py manila/api/openstack/volume/__init__.py
cinder/api/openstack/volume/versions.py manila/api/openstack/volume/versions.py
cinder/api/schemas/atom-link.rng manila/api/schemas/atom-link.rng
cinder/api/schemas/v1.1/extension.rng manila/api/schemas/v1.1/extension.rng
cinder/api/schemas/v1.1/extensions.rng manila/api/schemas/v1.1/extensions.rng
cinder/api/schemas/v1.1/limits.rng manila/api/schemas/v1.1/limits.rng
cinder/api/schemas/v1.1/metadata.rng manila/api/schemas/v1.1/metadata.rng
cinder/api/v1/__init__.py manila/api/v1/__init__.py
cinder/api/v1/limits.py manila/api/v1/limits.py
cinder/api/v1/router.py manila/api/v1/router.py
cinder/api/v1/snapshot_metadata.py manila/api/v1/snapshot_metadata.py
cinder/api/v1/snapshots.py manila/api/v1/snapshots.py
cinder/api/v1/types.py manila/api/v1/types.py
cinder/api/v1/volume_metadata.py manila/api/v1/volume_metadata.py
cinder/api/v1/volumes.py manila/api/v1/volumes.py
cinder/api/v2/__init__.py manila/api/v2/__init__.py
cinder/api/v2/limits.py manila/api/v2/limits.py
cinder/api/v2/router.py manila/api/v2/router.py
cinder/api/v2/snapshot_metadata.py manila/api/v2/snapshot_metadata.py
cinder/api/v2/snapshots.py manila/api/v2/snapshots.py
cinder/api/v2/types.py manila/api/v2/types.py
cinder/api/v2/volumes.py manila/api/v2/volumes.py
cinder/api/v2/views/__init__.py manila/api/v2/views/__init__.py
cinder/api/v2/views/volumes.py manila/api/v2/views/volumes.py
cinder/api/views/__init__.py manila/api/views/__init__.py
cinder/api/views/backups.py manila/api/views/backups.py
cinder/api/views/limits.py manila/api/views/limits.py
cinder/api/views/share_snapshots.py manila/api/views/share_snapshots.py
cinder/api/views/shares.py manila/api/views/shares.py
cinder/api/views/types.py manila/api/views/types.py
cinder/api/views/versions.py manila/api/views/versions.py
cinder/backup/__init__.py manila/backup/__init__.py
cinder/backup/api.py manila/backup/api.py
cinder/backup/manager.py manila/backup/manager.py
cinder/backup/rpcapi.py manila/backup/rpcapi.py
cinder/backup/services/__init__.py manila/backup/services/__init__.py
cinder/backup/services/swift.py manila/backup/services/swift.py
cinder/brick/__init__.py manila/brick/__init__.py
cinder/brick/iscsi/__init__.py manila/brick/iscsi/__init__.py
cinder/brick/iscsi/iscsi.py manila/brick/iscsi/iscsi.py
cinder/brick/local_dev/__init__.py manila/brick/local_dev/__init__.py
cinder/brick/local_dev/lvm.py manila/brick/local_dev/lvm.py
cinder/common/__init__.py manila/common/__init__.py
cinder/common/sqlalchemyutils.py manila/common/sqlalchemyutils.py
cinder/compute/__init__.py manila/compute/__init__.py
cinder/compute/aggregate_states.py manila/compute/aggregate_states.py
cinder/db/__init__.py manila/db/__init__.py
cinder/db/api.py manila/db/api.py
cinder/db/base.py manila/db/base.py
cinder/db/migration.py manila/db/migration.py
cinder/db/sqlalchemy/__init__.py manila/db/sqlalchemy/__init__.py
cinder/db/sqlalchemy/api.py manila/db/sqlalchemy/api.py
cinder/db/sqlalchemy/migration.py manila/db/sqlalchemy/migration.py
cinder/db/sqlalchemy/models.py manila/db/sqlalchemy/models.py
cinder/db/sqlalchemy/session.py manila/db/sqlalchemy/session.py
cinder/db/sqlalchemy/migrate_repo/README manila/db/sqlalchemy/migrate_repo/README
cinder/db/sqlalchemy/migrate_repo/__init__.py manila/db/sqlalchemy/migrate_repo/__init__.py
cinder/db/sqlalchemy/migrate_repo/manage.py manila/db/sqlalchemy/migrate_repo/manage.py
cinder/db/sqlalchemy/migrate_repo/migrate.cfg manila/db/sqlalchemy/migrate_repo/migrate.cfg
cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py manila/db/sqlalchemy/migrate_repo/versions/001_manila_init.py
cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py manila/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py manila/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py manila/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py
cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py manila/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py
cinder/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql manila/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql
cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py manila/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py
cinder/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py manila/db/sqlalchemy/migrate_repo/versions/007_add_volume_snapshot_fk.py
cinder/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql manila/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql
cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py manila/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py manila/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
cinder/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py manila/db/sqlalchemy/migrate_repo/versions/010_add_share_tables.py
cinder/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py manila/db/sqlalchemy/migrate_repo/versions/011_add_share_snapshot_table.py
cinder/db/sqlalchemy/migrate_repo/versions/__init__.py manila/db/sqlalchemy/migrate_repo/versions/__init__.py
cinder/image/__init__.py manila/image/__init__.py
cinder/image/glance.py manila/image/glance.py
cinder/image/image_utils.py manila/image/image_utils.py
cinder/locale/cinder.pot manila/locale/manila.pot
cinder/locale/bg_BG/LC_MESSAGES/cinder.po manila/locale/bg_BG/LC_MESSAGES/manila.po
cinder/locale/bs/LC_MESSAGES/cinder.po manila/locale/bs/LC_MESSAGES/manila.po
cinder/locale/cs/LC_MESSAGES/cinder.po manila/locale/cs/LC_MESSAGES/manila.po
cinder/locale/da/LC_MESSAGES/cinder.po manila/locale/da/LC_MESSAGES/manila.po
cinder/locale/de/LC_MESSAGES/cinder.po manila/locale/de/LC_MESSAGES/manila.po
cinder/locale/en_AU/LC_MESSAGES/cinder.po manila/locale/en_AU/LC_MESSAGES/manila.po
cinder/locale/en_GB/LC_MESSAGES/cinder.po manila/locale/en_GB/LC_MESSAGES/manila.po
cinder/locale/en_US/LC_MESSAGES/cinder.po manila/locale/en_US/LC_MESSAGES/manila.po
cinder/locale/es/LC_MESSAGES/cinder.po manila/locale/es/LC_MESSAGES/manila.po
cinder/locale/fi_FI/LC_MESSAGES/cinder.po manila/locale/fi_FI/LC_MESSAGES/manila.po
cinder/locale/fr/LC_MESSAGES/cinder.po manila/locale/fr/LC_MESSAGES/manila.po
cinder/locale/it/LC_MESSAGES/cinder.po manila/locale/it/LC_MESSAGES/manila.po
cinder/locale/ja/LC_MESSAGES/cinder.po manila/locale/ja/LC_MESSAGES/manila.po
cinder/locale/ko/LC_MESSAGES/cinder.po manila/locale/ko/LC_MESSAGES/manila.po
cinder/locale/ko_KR/LC_MESSAGES/cinder.po manila/locale/ko_KR/LC_MESSAGES/manila.po
cinder/locale/pt_BR/LC_MESSAGES/cinder.po manila/locale/pt_BR/LC_MESSAGES/manila.po
cinder/locale/ru/LC_MESSAGES/cinder.po manila/locale/ru/LC_MESSAGES/manila.po
cinder/locale/tl/LC_MESSAGES/cinder.po manila/locale/tl/LC_MESSAGES/manila.po
cinder/locale/tr/LC_MESSAGES/cinder.po manila/locale/tr/LC_MESSAGES/manila.po
cinder/locale/uk/LC_MESSAGES/cinder.po manila/locale/uk/LC_MESSAGES/manila.po
cinder/locale/vi_VN/LC_MESSAGES/cinder.po manila/locale/vi_VN/LC_MESSAGES/manila.po
cinder/locale/zh_CN/LC_MESSAGES/cinder.po manila/locale/zh_CN/LC_MESSAGES/manila.po
cinder/locale/zh_TW/LC_MESSAGES/cinder.po manila/locale/zh_TW/LC_MESSAGES/manila.po
cinder/openstack/__init__.py manila/openstack/__init__.py
cinder/openstack/common/README manila/openstack/common/README
cinder/openstack/common/__init__.py manila/openstack/common/__init__.py
cinder/openstack/common/context.py manila/openstack/common/context.py
cinder/openstack/common/eventlet_backdoor.py manila/openstack/common/eventlet_backdoor.py
cinder/openstack/common/exception.py manila/openstack/common/exception.py
cinder/openstack/common/excutils.py manila/openstack/common/excutils.py
cinder/openstack/common/fileutils.py manila/openstack/common/fileutils.py
cinder/openstack/common/gettextutils.py manila/openstack/common/gettextutils.py
cinder/openstack/common/importutils.py manila/openstack/common/importutils.py
cinder/openstack/common/jsonutils.py manila/openstack/common/jsonutils.py
cinder/openstack/common/local.py manila/openstack/common/local.py
cinder/openstack/common/lockutils.py manila/openstack/common/lockutils.py
cinder/openstack/common/log.py manila/openstack/common/log.py
cinder/openstack/common/loopingcall.py manila/openstack/common/loopingcall.py
cinder/openstack/common/network_utils.py manila/openstack/common/network_utils.py
cinder/openstack/common/policy.py manila/openstack/common/policy.py
cinder/openstack/common/processutils.py manila/openstack/common/processutils.py
cinder/openstack/common/service.py manila/openstack/common/service.py
cinder/openstack/common/strutils.py manila/openstack/common/strutils.py
cinder/openstack/common/threadgroup.py manila/openstack/common/threadgroup.py
cinder/openstack/common/timeutils.py manila/openstack/common/timeutils.py
cinder/openstack/common/uuidutils.py manila/openstack/common/uuidutils.py
cinder/openstack/common/notifier/__init__.py manila/openstack/common/notifier/__init__.py
cinder/openstack/common/notifier/api.py manila/openstack/common/notifier/api.py
cinder/openstack/common/notifier/log_notifier.py manila/openstack/common/notifier/log_notifier.py
cinder/openstack/common/notifier/no_op_notifier.py manila/openstack/common/notifier/no_op_notifier.py
cinder/openstack/common/notifier/rabbit_notifier.py manila/openstack/common/notifier/rabbit_notifier.py
cinder/openstack/common/notifier/rpc_notifier.py manila/openstack/common/notifier/rpc_notifier.py
cinder/openstack/common/notifier/rpc_notifier2.py manila/openstack/common/notifier/rpc_notifier2.py
cinder/openstack/common/notifier/test_notifier.py manila/openstack/common/notifier/test_notifier.py
cinder/openstack/common/rootwrap/__init__.py manila/openstack/common/rootwrap/__init__.py
cinder/openstack/common/rootwrap/cmd.py manila/openstack/common/rootwrap/cmd.py
cinder/openstack/common/rootwrap/filters.py manila/openstack/common/rootwrap/filters.py
cinder/openstack/common/rootwrap/wrapper.py manila/openstack/common/rootwrap/wrapper.py
cinder/openstack/common/rpc/__init__.py manila/openstack/common/rpc/__init__.py
cinder/openstack/common/rpc/amqp.py manila/openstack/common/rpc/amqp.py
cinder/openstack/common/rpc/common.py manila/openstack/common/rpc/common.py
cinder/openstack/common/rpc/dispatcher.py manila/openstack/common/rpc/dispatcher.py
cinder/openstack/common/rpc/impl_fake.py manila/openstack/common/rpc/impl_fake.py
cinder/openstack/common/rpc/impl_kombu.py manila/openstack/common/rpc/impl_kombu.py
cinder/openstack/common/rpc/impl_qpid.py manila/openstack/common/rpc/impl_qpid.py
cinder/openstack/common/rpc/impl_zmq.py manila/openstack/common/rpc/impl_zmq.py
cinder/openstack/common/rpc/matchmaker.py manila/openstack/common/rpc/matchmaker.py
cinder/openstack/common/rpc/matchmaker_redis.py manila/openstack/common/rpc/matchmaker_redis.py
cinder/openstack/common/rpc/proxy.py manila/openstack/common/rpc/proxy.py
cinder/openstack/common/rpc/service.py manila/openstack/common/rpc/service.py
cinder/openstack/common/rpc/zmq_receiver.py manila/openstack/common/rpc/zmq_receiver.py
cinder/openstack/common/scheduler/__init__.py manila/openstack/common/scheduler/__init__.py
cinder/openstack/common/scheduler/filter.py manila/openstack/common/scheduler/filter.py
cinder/openstack/common/scheduler/weight.py manila/openstack/common/scheduler/weight.py
cinder/openstack/common/scheduler/filters/__init__.py manila/openstack/common/scheduler/filters/__init__.py
cinder/openstack/common/scheduler/filters/availability_zone_filter.py manila/openstack/common/scheduler/filters/availability_zone_filter.py
cinder/openstack/common/scheduler/filters/capabilities_filter.py manila/openstack/common/scheduler/filters/capabilities_filter.py
cinder/openstack/common/scheduler/filters/extra_specs_ops.py manila/openstack/common/scheduler/filters/extra_specs_ops.py
cinder/openstack/common/scheduler/filters/json_filter.py manila/openstack/common/scheduler/filters/json_filter.py
cinder/openstack/common/scheduler/weights/__init__.py manila/openstack/common/scheduler/weights/__init__.py
cinder/scheduler/__init__.py manila/scheduler/__init__.py
cinder/scheduler/chance.py manila/scheduler/chance.py
cinder/scheduler/driver.py manila/scheduler/driver.py
cinder/scheduler/filter_scheduler.py manila/scheduler/filter_scheduler.py
cinder/scheduler/host_manager.py manila/scheduler/host_manager.py
cinder/scheduler/manager.py manila/scheduler/manager.py
cinder/scheduler/rpcapi.py manila/scheduler/rpcapi.py
cinder/scheduler/scheduler_options.py manila/scheduler/scheduler_options.py
cinder/scheduler/simple.py manila/scheduler/simple.py
cinder/scheduler/filters/__init__.py manila/scheduler/filters/__init__.py
cinder/scheduler/filters/capacity_filter.py manila/scheduler/filters/capacity_filter.py
cinder/scheduler/filters/retry_filter.py manila/scheduler/filters/retry_filter.py
cinder/scheduler/weights/__init__.py manila/scheduler/weights/__init__.py
cinder/scheduler/weights/capacity.py manila/scheduler/weights/capacity.py
cinder/share/__init__.py manila/share/__init__.py
cinder/share/api.py manila/share/api.py
cinder/share/configuration.py manila/share/configuration.py
cinder/share/driver.py manila/share/driver.py
cinder/share/manager.py manila/share/manager.py
cinder/share/rpcapi.py manila/share/rpcapi.py
cinder/share/drivers/__init__.py manila/share/drivers/__init__.py
cinder/share/drivers/lvm.py manila/share/drivers/lvm.py
cinder/share/drivers/netapp.py manila/share/drivers/netapp.py
cinder/testing/README.rst manila/testing/README.rst
cinder/tests/__init__.py manila/tests/__init__.py
cinder/tests/declare_flags.py manila/tests/declare_flags.py
cinder/tests/fake_driver.py manila/tests/fake_driver.py
cinder/tests/fake_flags.py manila/tests/fake_flags.py
cinder/tests/fake_utils.py manila/tests/fake_utils.py
cinder/tests/policy.json manila/tests/policy.json
cinder/tests/runtime_flags.py manila/tests/runtime_flags.py
cinder/tests/test_HpSanISCSIDriver.py manila/tests/test_HpSanISCSIDriver.py
cinder/tests/test_api.py manila/tests/test_api.py
cinder/tests/test_backup.py manila/tests/test_backup.py
cinder/tests/test_backup_swift.py manila/tests/test_backup_swift.py
cinder/tests/test_context.py manila/tests/test_context.py
cinder/tests/test_coraid.py manila/tests/test_coraid.py
cinder/tests/test_drivers_compatibility.py manila/tests/test_drivers_compatibility.py
cinder/tests/test_emc.py manila/tests/test_emc.py
cinder/tests/test_exception.py manila/tests/test_exception.py
cinder/tests/test_flags.py manila/tests/test_flags.py
cinder/tests/test_glusterfs.py manila/tests/test_glusterfs.py
cinder/tests/test_hp3par.py manila/tests/test_hp3par.py
cinder/tests/test_huawei.py manila/tests/test_huawei.py
cinder/tests/test_iscsi.py manila/tests/test_iscsi.py
cinder/tests/test_migrations.conf manila/tests/test_migrations.conf
cinder/tests/test_migrations.py manila/tests/test_migrations.py
cinder/tests/test_misc.py manila/tests/test_misc.py
cinder/tests/test_netapp.py manila/tests/test_netapp.py
cinder/tests/test_netapp_nfs.py manila/tests/test_netapp_nfs.py
cinder/tests/test_nexenta.py manila/tests/test_nexenta.py
cinder/tests/test_nfs.py manila/tests/test_nfs.py
cinder/tests/test_policy.py manila/tests/test_policy.py
cinder/tests/test_quota.py manila/tests/test_quota.py
cinder/tests/test_rbd.py manila/tests/test_rbd.py
cinder/tests/test_scality.py manila/tests/test_scality.py
cinder/tests/test_service.py manila/tests/test_service.py
cinder/tests/test_share.py manila/tests/test_share.py
cinder/tests/test_share_api.py manila/tests/test_share_api.py
cinder/tests/test_share_driver.py manila/tests/test_share_driver.py
cinder/tests/test_share_lvm.py manila/tests/test_share_lvm.py
cinder/tests/test_share_netapp.py manila/tests/test_share_netapp.py
cinder/tests/test_share_rpcapi.py manila/tests/test_share_rpcapi.py
cinder/tests/test_sheepdog.py manila/tests/test_sheepdog.py
cinder/tests/test_skip_examples.py manila/tests/test_skip_examples.py
cinder/tests/test_solidfire.py manila/tests/test_solidfire.py
cinder/tests/test_storwize_svc.py manila/tests/test_storwize_svc.py
cinder/tests/test_test.py manila/tests/test_test.py
cinder/tests/test_test_utils.py manila/tests/test_test_utils.py
cinder/tests/test_utils.py manila/tests/test_utils.py
cinder/tests/test_volume.py manila/tests/test_volume.py
cinder/tests/test_volume_configuration.py manila/tests/test_volume_configuration.py
cinder/tests/test_volume_glance_metadata.py manila/tests/test_volume_glance_metadata.py
cinder/tests/test_volume_rpcapi.py manila/tests/test_volume_rpcapi.py
cinder/tests/test_volume_types.py manila/tests/test_volume_types.py
cinder/tests/test_volume_types_extra_specs.py manila/tests/test_volume_types_extra_specs.py
cinder/tests/test_volume_utils.py manila/tests/test_volume_utils.py
cinder/tests/test_windows.py manila/tests/test_windows.py
cinder/tests/test_wsgi.py manila/tests/test_wsgi.py
cinder/tests/test_xenapi_sm.py manila/tests/test_xenapi_sm.py
cinder/tests/test_xiv.py manila/tests/test_xiv.py
cinder/tests/test_zadara.py manila/tests/test_zadara.py
cinder/tests/utils.py manila/tests/utils.py
cinder/tests/api/__init__.py manila/tests/api/__init__.py
cinder/tests/api/common.py manila/tests/api/common.py
cinder/tests/api/fakes.py manila/tests/api/fakes.py
cinder/tests/api/test_common.py manila/tests/api/test_common.py
cinder/tests/api/test_extensions.py manila/tests/api/test_extensions.py
cinder/tests/api/test_router.py manila/tests/api/test_router.py
cinder/tests/api/test_wsgi.py manila/tests/api/test_wsgi.py
cinder/tests/api/test_xmlutil.py manila/tests/api/test_xmlutil.py
cinder/tests/api/contrib/__init__.py manila/tests/api/contrib/__init__.py
cinder/tests/api/contrib/stubs.py manila/tests/api/contrib/stubs.py
cinder/tests/api/contrib/test_admin_actions.py manila/tests/api/contrib/test_admin_actions.py
cinder/tests/api/contrib/test_backups.py manila/tests/api/contrib/test_backups.py
cinder/tests/api/contrib/test_extended_snapshot_attributes.py manila/tests/api/contrib/test_extended_snapshot_attributes.py
cinder/tests/api/contrib/test_hosts.py manila/tests/api/contrib/test_hosts.py
cinder/tests/api/contrib/test_services.py manila/tests/api/contrib/test_services.py
cinder/tests/api/contrib/test_share_actions.py manila/tests/api/contrib/test_share_actions.py
cinder/tests/api/contrib/test_share_snapshots.py manila/tests/api/contrib/test_share_snapshots.py
cinder/tests/api/contrib/test_shares.py manila/tests/api/contrib/test_shares.py
cinder/tests/api/contrib/test_types_extra_specs.py manila/tests/api/contrib/test_types_extra_specs.py
cinder/tests/api/contrib/test_types_manage.py manila/tests/api/contrib/test_types_manage.py
cinder/tests/api/contrib/test_volume_actions.py manila/tests/api/contrib/test_volume_actions.py
cinder/tests/api/contrib/test_volume_host_attribute.py manila/tests/api/contrib/test_volume_host_attribute.py
cinder/tests/api/contrib/test_volume_image_metadata.py manila/tests/api/contrib/test_volume_image_metadata.py
cinder/tests/api/contrib/test_volume_tenant_attribute.py manila/tests/api/contrib/test_volume_tenant_attribute.py
cinder/tests/api/extensions/__init__.py manila/tests/api/extensions/__init__.py
cinder/tests/api/extensions/foxinsocks.py manila/tests/api/extensions/foxinsocks.py
cinder/tests/api/middleware/__init__.py manila/tests/api/middleware/__init__.py
cinder/tests/api/middleware/test_auth.py manila/tests/api/middleware/test_auth.py
cinder/tests/api/middleware/test_faults.py manila/tests/api/middleware/test_faults.py
cinder/tests/api/middleware/test_sizelimit.py manila/tests/api/middleware/test_sizelimit.py
cinder/tests/api/openstack/__init__.py manila/tests/api/openstack/__init__.py
cinder/tests/api/openstack/test_wsgi.py manila/tests/api/openstack/test_wsgi.py
cinder/tests/api/v1/__init__.py manila/tests/api/v1/__init__.py
cinder/tests/api/v1/stubs.py manila/tests/api/v1/stubs.py
cinder/tests/api/v1/test_limits.py manila/tests/api/v1/test_limits.py
cinder/tests/api/v1/test_snapshot_metadata.py manila/tests/api/v1/test_snapshot_metadata.py
cinder/tests/api/v1/test_snapshots.py manila/tests/api/v1/test_snapshots.py
cinder/tests/api/v1/test_types.py manila/tests/api/v1/test_types.py
cinder/tests/api/v1/test_volume_metadata.py manila/tests/api/v1/test_volume_metadata.py
cinder/tests/api/v1/test_volumes.py manila/tests/api/v1/test_volumes.py
cinder/tests/api/v2/__init__.py manila/tests/api/v2/__init__.py
cinder/tests/api/v2/stubs.py manila/tests/api/v2/stubs.py
cinder/tests/api/v2/test_limits.py manila/tests/api/v2/test_limits.py
cinder/tests/api/v2/test_snapshot_metadata.py manila/tests/api/v2/test_snapshot_metadata.py
cinder/tests/api/v2/test_snapshots.py manila/tests/api/v2/test_snapshots.py
cinder/tests/api/v2/test_types.py manila/tests/api/v2/test_types.py
cinder/tests/api/v2/test_volumes.py manila/tests/api/v2/test_volumes.py
cinder/tests/backup/__init__.py manila/tests/backup/__init__.py
cinder/tests/backup/fake_service.py manila/tests/backup/fake_service.py
cinder/tests/backup/fake_swift_client.py manila/tests/backup/fake_swift_client.py
cinder/tests/brick/__init__.py manila/tests/brick/__init__.py
cinder/tests/brick/test_brick_lvm.py manila/tests/brick/test_brick_lvm.py
cinder/tests/db/__init__.py manila/tests/db/__init__.py
cinder/tests/db/fakes.py manila/tests/db/fakes.py
cinder/tests/glance/__init__.py manila/tests/glance/__init__.py
cinder/tests/glance/stubs.py manila/tests/glance/stubs.py
cinder/tests/image/__init__.py manila/tests/image/__init__.py
cinder/tests/image/fake.py manila/tests/image/fake.py
cinder/tests/image/test_glance.py manila/tests/image/test_glance.py
cinder/tests/integrated/__init__.py manila/tests/integrated/__init__.py
cinder/tests/integrated/integrated_helpers.py manila/tests/integrated/integrated_helpers.py
cinder/tests/integrated/test_extensions.py manila/tests/integrated/test_extensions.py
cinder/tests/integrated/test_login.py manila/tests/integrated/test_login.py
cinder/tests/integrated/test_volumes.py manila/tests/integrated/test_volumes.py
cinder/tests/integrated/test_xml.py manila/tests/integrated/test_xml.py
cinder/tests/integrated/api/__init__.py manila/tests/integrated/api/__init__.py
cinder/tests/integrated/api/client.py manila/tests/integrated/api/client.py
cinder/tests/monkey_patch_example/__init__.py manila/tests/monkey_patch_example/__init__.py
cinder/tests/monkey_patch_example/example_a.py manila/tests/monkey_patch_example/example_a.py
cinder/tests/monkey_patch_example/example_b.py manila/tests/monkey_patch_example/example_b.py
cinder/tests/scheduler/__init__.py manila/tests/scheduler/__init__.py
cinder/tests/scheduler/fakes.py manila/tests/scheduler/fakes.py
cinder/tests/scheduler/test_capacity_weigher.py manila/tests/scheduler/test_capacity_weigher.py
cinder/tests/scheduler/test_filter_scheduler.py manila/tests/scheduler/test_filter_scheduler.py
cinder/tests/scheduler/test_host_filters.py manila/tests/scheduler/test_host_filters.py
cinder/tests/scheduler/test_host_manager.py manila/tests/scheduler/test_host_manager.py
cinder/tests/scheduler/test_rpcapi.py manila/tests/scheduler/test_rpcapi.py
cinder/tests/scheduler/test_scheduler.py manila/tests/scheduler/test_scheduler.py
cinder/tests/scheduler/test_scheduler_options.py manila/tests/scheduler/test_scheduler_options.py
cinder/tests/var/ca.crt manila/tests/var/ca.crt
cinder/tests/var/certificate.crt manila/tests/var/certificate.crt
cinder/tests/var/privatekey.key manila/tests/var/privatekey.key
cinder/tests/windows/__init__.py manila/tests/windows/__init__.py
cinder/tests/windows/basetestcase.py manila/tests/windows/basetestcase.py
cinder/tests/windows/db_fakes.py manila/tests/windows/db_fakes.py
cinder/tests/windows/mockproxy.py manila/tests/windows/mockproxy.py
cinder/tests/windows/windowsutils.py manila/tests/windows/windowsutils.py
cinder/tests/windows/stubs/README.rst manila/tests/windows/stubs/README.rst
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_check_for_setup_errors_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_check_for_setup_errors_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_export_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_snapshot_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_from_snapshot_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_create_volume_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_snapshot_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_delete_volume_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_ensure_export_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_initialize_connection_wmi.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_os.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_os.p.gz
cinder/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_wmi.p.gz manila/tests/windows/stubs/test_windows.TestWindowsDriver.test_remove_export_wmi.p.gz
cinder/tests/xenapi/__init__.py manila/tests/xenapi/__init__.py
cinder/volume/__init__.py manila/volume/__init__.py
cinder/volume/api.py manila/volume/api.py
cinder/volume/configuration.py manila/volume/configuration.py
cinder/volume/driver.py manila/volume/driver.py
cinder/volume/manager.py manila/volume/manager.py
cinder/volume/rpcapi.py manila/volume/rpcapi.py
cinder/volume/utils.py manila/volume/utils.py
cinder/volume/volume_types.py manila/volume/volume_types.py
cinder/volume/drivers/__init__.py manila/volume/drivers/__init__.py
cinder/volume/drivers/coraid.py manila/volume/drivers/coraid.py
cinder/volume/drivers/glusterfs.py manila/volume/drivers/glusterfs.py
cinder/volume/drivers/lvm.py manila/volume/drivers/lvm.py
cinder/volume/drivers/nfs.py manila/volume/drivers/nfs.py
cinder/volume/drivers/rbd.py manila/volume/drivers/rbd.py
cinder/volume/drivers/scality.py manila/volume/drivers/scality.py
cinder/volume/drivers/sheepdog.py manila/volume/drivers/sheepdog.py
cinder/volume/drivers/solidfire.py manila/volume/drivers/solidfire.py
cinder/volume/drivers/storwize_svc.py manila/volume/drivers/storwize_svc.py
cinder/volume/drivers/windows.py manila/volume/drivers/windows.py
cinder/volume/drivers/xiv.py manila/volume/drivers/xiv.py
cinder/volume/drivers/zadara.py manila/volume/drivers/zadara.py
cinder/volume/drivers/emc/__init__.py manila/volume/drivers/emc/__init__.py
cinder/volume/drivers/emc/cinder_emc_config.xml.sample manila/volume/drivers/emc/manila_emc_config.xml.sample
cinder/volume/drivers/emc/emc_smis_common.py manila/volume/drivers/emc/emc_smis_common.py
cinder/volume/drivers/emc/emc_smis_iscsi.py manila/volume/drivers/emc/emc_smis_iscsi.py
cinder/volume/drivers/huawei/__init__.py manila/volume/drivers/huawei/__init__.py
cinder/volume/drivers/huawei/cinder_huawei_conf.xml.sample manila/volume/drivers/huawei/manila_huawei_conf.xml.sample
cinder/volume/drivers/huawei/huawei_iscsi.py manila/volume/drivers/huawei/huawei_iscsi.py
cinder/volume/drivers/netapp/__init__.py manila/volume/drivers/netapp/__init__.py
cinder/volume/drivers/netapp/api.py manila/volume/drivers/netapp/api.py
cinder/volume/drivers/netapp/iscsi.py manila/volume/drivers/netapp/iscsi.py
cinder/volume/drivers/netapp/nfs.py manila/volume/drivers/netapp/nfs.py
cinder/volume/drivers/nexenta/__init__.py manila/volume/drivers/nexenta/__init__.py
cinder/volume/drivers/nexenta/jsonrpc.py manila/volume/drivers/nexenta/jsonrpc.py
cinder/volume/drivers/nexenta/volume.py manila/volume/drivers/nexenta/volume.py
cinder/volume/drivers/san/__init__.py manila/volume/drivers/san/__init__.py
cinder/volume/drivers/san/hp_lefthand.py manila/volume/drivers/san/hp_lefthand.py
cinder/volume/drivers/san/san.py manila/volume/drivers/san/san.py
cinder/volume/drivers/san/solaris.py manila/volume/drivers/san/solaris.py
cinder/volume/drivers/san/hp/__init__.py manila/volume/drivers/san/hp/__init__.py
cinder/volume/drivers/san/hp/hp_3par_common.py manila/volume/drivers/san/hp/hp_3par_common.py
cinder/volume/drivers/san/hp/hp_3par_fc.py manila/volume/drivers/san/hp/hp_3par_fc.py
cinder/volume/drivers/san/hp/hp_3par_iscsi.py manila/volume/drivers/san/hp/hp_3par_iscsi.py
cinder/volume/drivers/xenapi/__init__.py manila/volume/drivers/xenapi/__init__.py
cinder/volume/drivers/xenapi/lib.py manila/volume/drivers/xenapi/lib.py
cinder/volume/drivers/xenapi/sm.py manila/volume/drivers/xenapi/sm.py
cinder/volume/drivers/xenapi/tools.py manila/volume/drivers/xenapi/tools.py
contrib/redhat-eventlet.patch contrib/redhat-eventlet.patch
doc/.gitignore doc/.gitignore
doc/Makefile doc/Makefile
@ -469,8 +469,8 @@ doc/README.rst
doc/find_autodoc_modules.sh doc/find_autodoc_modules.sh
doc/generate_autodoc_index.sh doc/generate_autodoc_index.sh
doc/ext/__init__.py doc/ext/__init__.py
doc/ext/cinder_autodoc.py doc/ext/manila_autodoc.py
doc/ext/cinder_todo.py doc/ext/manila_todo.py
doc/source/conf.py doc/source/conf.py
doc/source/index.rst doc/source/index.rst
doc/source/_ga/layout.html doc/source/_ga/layout.html
@ -488,7 +488,7 @@ doc/source/devref/addmethod.openstackapi.rst
doc/source/devref/api.rst doc/source/devref/api.rst
doc/source/devref/architecture.rst doc/source/devref/architecture.rst
doc/source/devref/auth.rst doc/source/devref/auth.rst
doc/source/devref/cinder.rst doc/source/devref/manila.rst
doc/source/devref/database.rst doc/source/devref/database.rst
doc/source/devref/development.environment.rst doc/source/devref/development.environment.rst
doc/source/devref/fakes.rst doc/source/devref/fakes.rst
@ -512,14 +512,14 @@ doc/source/images/rpc/flow2.svg
doc/source/images/rpc/rabt.png doc/source/images/rpc/rabt.png
doc/source/images/rpc/rabt.svg doc/source/images/rpc/rabt.svg
doc/source/images/rpc/state.png doc/source/images/rpc/state.png
doc/source/man/cinder-manage.rst doc/source/man/manila-manage.rst
etc/cinder/api-paste.ini etc/manila/api-paste.ini
etc/cinder/cinder.conf.sample etc/manila/manila.conf.sample
etc/cinder/logging_sample.conf etc/manila/logging_sample.conf
etc/cinder/policy.json etc/manila/policy.json
etc/cinder/rootwrap.conf etc/manila/rootwrap.conf
etc/cinder/rootwrap.d/share.filters etc/manila/rootwrap.d/share.filters
etc/cinder/rootwrap.d/volume.filters etc/manila/rootwrap.d/volume.filters
manila/__init__.py manila/__init__.py
manila/context.py manila/context.py
manila/exception.py manila/exception.py
@ -623,7 +623,7 @@ manila/db/sqlalchemy/models.py
manila/db/sqlalchemy/session.py manila/db/sqlalchemy/session.py
manila/db/sqlalchemy/migrate_repo/__init__.py manila/db/sqlalchemy/migrate_repo/__init__.py
manila/db/sqlalchemy/migrate_repo/manage.py manila/db/sqlalchemy/migrate_repo/manage.py
manila/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py manila/db/sqlalchemy/migrate_repo/versions/001_manila_init.py
manila/db/sqlalchemy/migrate_repo/versions/002_quota_class.py manila/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
manila/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py manila/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
manila/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py manila/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py

16
manila.egg-info/entry_points.txt
View File

@ -1,10 +1,10 @@
[cinder.scheduler.filters] [manila.scheduler.filters]
CapabilitiesFilter = cinder.openstack.common.scheduler.filters.capabilities_filter:CapabilitiesFilter CapabilitiesFilter = manila.openstack.common.scheduler.filters.capabilities_filter:CapabilitiesFilter
RetryFilter = cinder.scheduler.filters.retry_filter:RetryFilter RetryFilter = manila.scheduler.filters.retry_filter:RetryFilter
CapacityFilter = cinder.scheduler.filters.capacity_filter:CapacityFilter CapacityFilter = manila.scheduler.filters.capacity_filter:CapacityFilter
JsonFilter = cinder.openstack.common.scheduler.filters.json_filter:JsonFilter JsonFilter = manila.openstack.common.scheduler.filters.json_filter:JsonFilter
AvailabilityZoneFilter = cinder.openstack.common.scheduler.filters.availability_zone_filter:AvailabilityZoneFilter AvailabilityZoneFilter = manila.openstack.common.scheduler.filters.availability_zone_filter:AvailabilityZoneFilter
[cinder.scheduler.weights] [manila.scheduler.weights]
CapacityWeigher = cinder.scheduler.weights.capacity:CapacityWeigher CapacityWeigher = manila.scheduler.weights.capacity:CapacityWeigher

12
manila/testing/README.rst
View File

@ -1,21 +1,21 @@
===================================== =====================================
OpenStack Cinder Testing Infrastructure OpenStack Manila Testing Infrastructure
===================================== =====================================
A note of clarification is in order, to help those who are new to testing in A note of clarification is in order, to help those who are new to testing in
OpenStack cinder: OpenStack manila:
- actual unit tests are created in the "tests" directory; - actual unit tests are created in the "tests" directory;
- the "testing" directory is used to house the infrastructure needed to support - the "testing" directory is used to house the infrastructure needed to support
testing in OpenStack Cinder. testing in OpenStack Manila.
This README file attempts to provide current and prospective contributors with This README file attempts to provide current and prospective contributors with
everything they need to know in order to start creating unit tests and everything they need to know in order to start creating unit tests and
utilizing the convenience code provided in cinder.testing. utilizing the convenience code provided in manila.testing.
Note: the content for the rest of this file will be added as the work items in Note: the content for the rest of this file will be added as the work items in
the following blueprint are completed: the following blueprint are completed:
https://blueprints.launchpad.net/cinder/+spec/consolidate-testing-infrastructure https://blueprints.launchpad.net/manila/+spec/consolidate-testing-infrastructure
Test Types: Unit vs. Functional vs. Integration Test Types: Unit vs. Functional vs. Integration
@ -35,7 +35,7 @@ TBD
test.TestCase test.TestCase
------------- -------------
The TestCase class from cinder.test (generally imported as test) will The TestCase class from manila.test (generally imported as test) will
automatically manage self.stubs using the stubout module and self.mox automatically manage self.stubs using the stubout module and self.mox
using the mox module during the setUp step. They will automatically using the mox module during the setUp step. They will automatically
verify and clean up during the tearDown step. verify and clean up during the tearDown step.

2
openstack-common.conf
View File

@ -29,4 +29,4 @@ module=timeutils
module=uuidutils module=uuidutils
# The base module to hold the copy of openstack.common # The base module to hold the copy of openstack.common
base=cinder base=manila

4
pylintrc
View File

@ -19,8 +19,8 @@ argument-rgx=[a-z_][a-z0-9_]{1,30}$
# and be lowecased with underscores # and be lowecased with underscores
method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$ method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$
# Module names matching cinder-* are ok (files in bin/) # Module names matching manila-* are ok (files in bin/)
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(cinder-[a-z0-9_-]+))$ module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(manila-[a-z0-9_-]+))$
# Don't require docstrings on tests. # Don't require docstrings on tests.
no-docstring-rgx=((__.*__)|([tT]est.*)|setUp|tearDown)$ no-docstring-rgx=((__.*__)|([tT]est.*)|setUp|tearDown)$

16
run_tests.sh
View File

@ -4,7 +4,7 @@ set -u
function usage { function usage {
echo "Usage: $0 [OPTION]..." echo "Usage: $0 [OPTION]..."
echo "Run Cinder's test suite(s)" echo "Run Manila's test suite(s)"
echo "" echo ""
echo " -V, --virtual-env Always use virtualenv. Install automatically if not present" echo " -V, --virtual-env Always use virtualenv. Install automatically if not present"
echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment" echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment"
@ -76,10 +76,10 @@ done
# If enabled, tell nose to collect coverage data # If enabled, tell nose to collect coverage data
if [ $coverage -eq 1 ]; then if [ $coverage -eq 1 ]; then
noseopts="$noseopts --with-coverage --cover-package=cinder" noseopts="$noseopts --with-coverage --cover-package=manila"
fi fi
if [ $coverage_xml -eq 1 ]; then if [ $coverage_xml -eq 1 ]; then
noseopts="$noseopts --with-xcoverage --cover-package=cinder --xcoverage-file=`pwd`/coverage.xml" noseopts="$noseopts --with-xcoverage --cover-package=manila --xcoverage-file=`pwd`/coverage.xml"
fi fi
if [ $no_site_packages -eq 1 ]; then if [ $no_site_packages -eq 1 ]; then
@ -96,21 +96,21 @@ function run_tests {
} }
# Files of interest # Files of interest
# NOTE(lzyeval): Avoid selecting cinder-api-paste.ini and cinder.conf in cinder/bin # NOTE(lzyeval): Avoid selecting manila-api-paste.ini and manila.conf in manila/bin
# when running on devstack. # when running on devstack.
# NOTE(lzyeval): Avoid selecting *.pyc files to reduce pep8 check-up time # NOTE(lzyeval): Avoid selecting *.pyc files to reduce pep8 check-up time
# when running on devstack. # when running on devstack.
# NOTE(dprince): Exclude xenapi plugins. They are Python 2.4 code and as such # NOTE(dprince): Exclude xenapi plugins. They are Python 2.4 code and as such
# cannot be expected to work with tools/hacking checks. # cannot be expected to work with tools/hacking checks.
xen_net_path="plugins/xenserver/networking/etc/xensource/scripts" xen_net_path="plugins/xenserver/networking/etc/xensource/scripts"
srcfiles=`find cinder -type f -name "*.py" ! -path "cinder/openstack/common/*"` srcfiles=`find manila -type f -name "*.py" ! -path "manila/openstack/common/*"`
srcfiles+=" `find bin -type f ! -name "cinder.conf*" ! -name "*api-paste.ini*"`" srcfiles+=" `find bin -type f ! -name "manila.conf*" ! -name "*api-paste.ini*"`"
srcfiles+=" `find tools -type f -name "*.py"`" srcfiles+=" `find tools -type f -name "*.py"`"
srcfiles+=" setup.py" srcfiles+=" setup.py"
function run_pep8 { function run_pep8 {
echo "Running PEP8 and HACKING compliance check..." echo "Running PEP8 and HACKING compliance check..."
bash -c "${wrapper} flake8 cinder* bin" bash -c "${wrapper} flake8 manila* bin"
} }
@ -176,7 +176,7 @@ fi
if [ $coverage -eq 1 ]; then if [ $coverage -eq 1 ]; then
echo "Generating coverage report in covhtml/" echo "Generating coverage report in covhtml/"
# Don't compute coverage for common code, which is tested elsewhere # Don't compute coverage for common code, which is tested elsewhere
${wrapper} coverage html --include='cinder/*' --omit='cinder/openstack/common/*' -d covhtml -i ${wrapper} coverage html --include='manila/*' --omit='manila/openstack/common/*' -d covhtml -i
fi fi
exit $RET exit $RET

2
tools/enable-pre-commit-hook.sh
View File

@ -27,7 +27,7 @@ make_hook() {
fi fi
} }
# NOTE(jk0): Make sure we are in cinder's root directory before adding the hook. # NOTE(jk0): Make sure we are in manila's root directory before adding the hook.
if [ ! -d ".git" ]; then if [ ! -d ".git" ]; then
echo "unable to find .git; moving up a directory" echo "unable to find .git; moving up a directory"
cd .. cd ..

2
tox.ini
View File

@ -22,7 +22,7 @@ commands =
[testenv:pep8] [testenv:pep8]
commands = commands =
flake8 flake8
flake8 --filename=cinder* bin flake8 --filename=manila* bin
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}