RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5742 from dachary/wip-user

Browse Source 
tests: ceph-disk: dmcrypt simplification

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Loic Dachary 2015-09-01 21:15:21 +02:00
commit b477fabe97
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qa/workunits/ceph-disk/ceph-disk-test.py
View File

@ -13,6 +13,12 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Library Public License for more details.
#
# When debugging these tests, here are a few useful commands:
#
# export PATH=..:$PATH
# python ceph-disk-test.py --verbose --destroy-osd 0
# py.test -s -v -k test_activate_dmcrypt_luks ceph-disk-test.py
#
import argparse
import json
import logging
@ -178,33 +184,14 @@ class TestCephDisk(object):
disk = c.unused_disks()[0]
osd_uuid = str(uuid.uuid1())
journal_uuid = str(uuid.uuid1())
d = tempfile.mkdtemp()
c.sh("ceph-disk zap " + disk)
c.sh("ceph-disk prepare " +
" --dmcrypt-key-dir " + d +
" --osd-uuid " + osd_uuid +
" --journal-uuid " + journal_uuid +
" --dmcrypt " +
" " + disk)
if type == 'plain':
c.sh("cryptsetup --key-file " + d + "/" + osd_uuid +
" --key-size 256 create " + osd_uuid +
" " + disk + "1")
else:
c.sh("cryptsetup --key-file " + d + "/" + osd_uuid + ".luks.key" +
" luksOpen " +
" " + disk + "1" +
" " + osd_uuid)
if type == 'plain':
c.sh("cryptsetup --key-file " + d + "/" + journal_uuid +
" --key-size 256 create " + journal_uuid +
" " + disk + "2")
else:
c.sh("cryptsetup --key-file " + d + "/" + journal_uuid + ".luks.key" +
" luksOpen " +
" " + disk + "2" +
" " + journal_uuid)
c.sh("ceph-disk activate /dev/mapper/" + osd_uuid)
data_partition = c.get_osd_partition(osd_uuid)
c.sh("ceph-disk activate --dmcrypt " + data_partition['path'])
data_partition = c.get_osd_partition(osd_uuid)
assert data_partition['type'] == 'data'
assert data_partition['state'] == 'active'