This patch series is a preparation for my plan to add further code
related to file storage. The directory 'block' was named too specific
to block devices to make the file storage code fit in there. In order
to rename it to 'storage', I also integrated the storage.py in it.
There is certainly room for further consolidation, this is just code
moving around and no new functionality.

Helga Velroyen (3):
  Rename storage.py to container.py
  Rename dir 'block' to 'storage'
  Move 'container.py' to storage directory

 Makefile.am                                  |   28 +-
 lib/backend.py                               |    8 +-
 lib/block/__init__.py                        |   24 -
 lib/block/base.py                            |  352 -----
 lib/block/bdev.py                            | 1805 --------------------------
 lib/block/drbd.py                            | 1051 ---------------
 lib/block/drbd_cmdgen.py                     |  451 -------
 lib/block/drbd_info.py                       |  454 -------
 lib/bootstrap.py                             |    2 +-
 lib/server/noded.py                          |    8 +-
 lib/storage.py                               |  494 -------
 lib/storage/__init__.py                      |   24 +
 lib/storage/base.py                          |  352 +++++
 lib/storage/bdev.py                          | 1805 ++++++++++++++++++++++++++
 lib/storage/container.py                     |  494 +++++++
 lib/storage/drbd.py                          | 1051 +++++++++++++++
 lib/storage/drbd_cmdgen.py                   |  451 +++++++
 lib/storage/drbd_info.py                     |  454 +++++++
 lib/watcher/nodemaint.py                     |    2 +-
 test/py/ganeti.block.bdev_unittest.py        |  304 -----
 test/py/ganeti.block.drbd_unittest.py        |  430 ------
 test/py/ganeti.storage.bdev_unittest.py      |  304 +++++
 test/py/ganeti.storage.container_unittest.py |  113 ++
 test/py/ganeti.storage.drbd_unittest.py      |  430 ++++++
 test/py/ganeti.storage_unittest.py           |  113 --
 25 files changed, 5502 insertions(+), 5502 deletions(-)
 delete mode 100644 lib/block/__init__.py
 delete mode 100644 lib/block/base.py
 delete mode 100644 lib/block/bdev.py
 delete mode 100644 lib/block/drbd.py
 delete mode 100644 lib/block/drbd_cmdgen.py
 delete mode 100644 lib/block/drbd_info.py
 delete mode 100644 lib/storage.py
 create mode 100644 lib/storage/__init__.py
 create mode 100644 lib/storage/base.py
 create mode 100644 lib/storage/bdev.py
 create mode 100644 lib/storage/container.py
 create mode 100644 lib/storage/drbd.py
 create mode 100644 lib/storage/drbd_cmdgen.py
 create mode 100644 lib/storage/drbd_info.py
 delete mode 100755 test/py/ganeti.block.bdev_unittest.py
 delete mode 100755 test/py/ganeti.block.drbd_unittest.py
 create mode 100755 test/py/ganeti.storage.bdev_unittest.py
 create mode 100755 test/py/ganeti.storage.container_unittest.py
 create mode 100755 test/py/ganeti.storage.drbd_unittest.py
 delete mode 100755 test/py/ganeti.storage_unittest.py

-- 
1.8.2.1

Reply via email to