renamed the project to os-brick

As per discussion in IRC, we have renamed brick to
os-brick, which creates the pacakge os_brick.  There was
a conflict in pypi for the 'brick' name.

brick/README.txt

@@ -1,9 +0,0 @@
-Brick is a new library that currently is maintained in Cinder for
-the Havana release.   It will eventually be moved external to Cinder,
-possibly oslo, or pypi.  Any defects found in Brick, should be submitted
-against Cinder and fixed there, then pulled into other projects that
-are using brick.
-
-* Brick is used outside of Cinder and therefore
-  cannot have any dependencies on Cinder and/or
-  it's database.

os_brick/exception.py

@@ -14,8 +14,8 @@
 
 """Exceptions for the Brick library."""
 
-from brick.i18n import _
-from brick.openstack.common import log as logging
+from os_brick.i18n import _
+from os_brick.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

os_brick/i18n.py

@@ -20,7 +20,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html .
 
 from oslo import i18n
 
-DOMAIN = 'brick'
+DOMAIN = 'os-brick'
 
 _translators = i18n.TranslatorFactory(domain=DOMAIN)
 

os_brick/initiator/connector.py

@@ -20,15 +20,15 @@ import time
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils as putils
 
-from brick import exception
-from brick import executor
-from brick.initiator import host_driver
-from brick.initiator import linuxfc
-from brick.initiator import linuxscsi
-from brick.remotefs import remotefs
-from brick.i18n import _, _LE, _LW
-from brick.openstack.common import log as logging
-from brick.openstack.common import loopingcall
+from os_brick import exception
+from os_brick import executor
+from os_brick.initiator import host_driver
+from os_brick.initiator import linuxfc
+from os_brick.initiator import linuxscsi
+from os_brick.remotefs import remotefs
+from os_brick.i18n import _, _LE, _LW
+from os_brick.openstack.common import log as logging
+from os_brick.openstack.common import loopingcall
 
 LOG = logging.getLogger(__name__)
 

os_brick/initiator/linuxfc.py

@@ -18,9 +18,9 @@ import errno
 
 from oslo_concurrency import processutils as putils
 
-from brick.i18n import _LW
-from brick.initiator import linuxscsi
-from brick.openstack.common import log as logging
+from os_brick.i18n import _LW
+from os_brick.initiator import linuxscsi
+from os_brick.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

os_brick/initiator/linuxscsi.py

@@ -21,9 +21,9 @@ import re
 
 from oslo_concurrency import processutils as putils
 
-from brick import executor
-from brick.i18n import _, _LW
-from brick.openstack.common import log as logging
+from os_brick import executor
+from os_brick.i18n import _, _LW
+from os_brick.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

os_brick/openstack/common/_i18n.py

@@ -24,7 +24,7 @@ try:
     # repository. It is OK to have more than one translation function
     # using the same domain, since there will still only be one message
     # catalog.
-    _translators = oslo.i18n.TranslatorFactory(domain='brick')
+    _translators = oslo.i18n.TranslatorFactory(domain='os-brick')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary

os_brick/openstack/common/log.py

@@ -46,8 +46,8 @@ from six import moves
 
 _PY26 = sys.version_info[0:2] == (2, 6)
 
-from brick.openstack.common._i18n import _
-from brick.openstack.common import local
+from os_brick.openstack.common._i18n import _
+from os_brick.openstack.common import local
 
 
 _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"

os_brick/openstack/common/loopingcall.py

@@ -21,8 +21,8 @@ import time
 from eventlet import event
 from eventlet import greenthread
 
-from brick.openstack.common._i18n import _LE, _LW
-from brick.openstack.common import log as logging
+from os_brick.openstack.common._i18n import _LE, _LW
+from os_brick.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

os_brick/remotefs/remotefs.py

@@ -22,9 +22,9 @@ import re
 from oslo_concurrency import processutils as putils
 import six
 
-from brick import exception
-from brick.i18n import _, _LI
-from brick.openstack.common import log as logging
+from os_brick import exception
+from os_brick.i18n import _, _LI
+from os_brick.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

os_brick/tests/base.py

@@ -23,7 +23,7 @@ import mock
 from oslo.utils import strutils
 from oslotest import base
 
-from brick.openstack.common import log as oslo_logging
+from os_brick.openstack.common import log as oslo_logging
 
 
 LOG = oslo_logging.getLogger(__name__)

os_brick/tests/initiator/test_connector.py

@@ -20,13 +20,13 @@ import mock
 from oslo_concurrency import processutils as putils
 import testtools
 
-from brick import exception
-from brick.i18n import _
-from brick.initiator import connector
-from brick.initiator import host_driver
-from brick.openstack.common import log as logging
-from brick.openstack.common import loopingcall
-from brick.tests import base
+from os_brick import exception
+from os_brick.i18n import _
+from os_brick.initiator import connector
+from os_brick.initiator import host_driver
+from os_brick.openstack.common import log as logging
+from os_brick.openstack.common import loopingcall
+from os_brick.tests import base
 
 
 LOG = logging.getLogger(__name__)

os_brick/tests/initiator/test_linuxfc.py

@@ -17,9 +17,9 @@ import string
 
 import mock
 
-from brick.initiator import linuxfc
-from brick.openstack.common import log as logging
-from brick.tests import base
+from os_brick.initiator import linuxfc
+from os_brick.openstack.common import log as logging
+from os_brick.tests import base
 
 LOG = logging.getLogger(__name__)
 

os_brick/tests/initiator/test_linuxscsi.py

@@ -17,9 +17,9 @@ import string
 
 import mock
 
-from brick.initiator import linuxscsi
-from brick.openstack.common import log as logging
-from brick.tests import base
+from os_brick.initiator import linuxscsi
+from os_brick.openstack.common import log as logging
+from os_brick.tests import base
 
 LOG = logging.getLogger(__name__)
 

os_brick/tests/test_brick.py

@@ -13,13 +13,13 @@
 # under the License.
 
 """
-test_brick
+test_os_brick
 ----------------------------------
 
-Tests for `brick` module.
+Tests for `os_brick` module.
 """
 
-from brick.tests import base
+from os_brick.tests import base
 
 
 class TestBrick(base.TestCase):

os_brick/tests/test_exception.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from brick import exception
-from brick.tests import base
+from os_brick import exception
+from os_brick.tests import base
 
 
 class BrickExceptionTestCase(base.TestCase):

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-name = brick
+name = os-brick
 summary = OpenStack Cinder brick library for managing local volume attaches
 description-file =
     README.rst
@@ -26,7 +26,7 @@ setup-hooks =
 
 [files]
 packages =
-    brick
+    os_brick
 
 [egg_info]
 tag_build =
@@ -42,15 +42,15 @@ all_files = 1
 upload-dir = doc/build/html
 
 [compile_catalog]
-directory = brick/locale
-domain = brick
+directory = os_brick/locale
+domain = os_brick
 
 [update_catalog]
-domain = brick
-output_dir = brick/locale
-input_file = brick/locale/brick.pot
+domain = os_brick
+output_dir = os_brick/locale
+input_file = os_brick/locale/os-brick.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = brick/locale/brick.pot
+output_file = os_brick/locale/os-brick.pot

tox.ini

@@ -59,4 +59,4 @@ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 max-complexity=30
 
 [hacking]
-import_exceptions = brick.i18n
+import_exceptions = os_brick.i18n