Charm Helpers

Merge lp:~james-page/charm-helpers/fixup-ceph-pool-creation into lp:charm-helpers

  1. fixup-ceph-pool-creation
  2. Merge into devel
Proposed by James Page
Status: Merged
Merged at revision: 78
Proposed branch: lp:~james-page/charm-helpers/fixup-ceph-pool-creation
Merge into: lp:charm-helpers
Diff against target: 85 lines (+15/-14)
2 files modified
charmhelpers/contrib/storage/linux/ceph.py (+7/-6)
tests/contrib/storage/test_linux_ceph.py (+8/-8)
To merge this branch: bzr merge lp:~james-page/charm-helpers/fixup-ceph-pool-creation
Reviewer Review Type Date Requested Status
Charm Helper Maintainers Pending
Review via email: mp+187260@code.launchpad.net

Description of the change

Misc fixes for ceph pool creation functions.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
2--- charmhelpers/contrib/storage/linux/ceph.py 2013-08-23 14:07:52 +0000
3+++ charmhelpers/contrib/storage/linux/ceph.py 2013-09-24 14:48:01 +0000
4@@ -97,12 +97,13 @@
5 return name in out
6
7
8-def get_osds():
9+def get_osds(service):
10 '''
11 Return a list of all Ceph Object Storage Daemons
12 currently in the cluster
13 '''
14- return json.loads(check_output(['ceph', 'osd', 'ls', '--format=json']))
15+ return json.loads(check_output(['ceph', '--id', service,
16+ 'osd', 'ls', '--format=json']))
17
18
19 def create_pool(service, name, replicas=2):
20@@ -113,17 +114,17 @@
21 return
22 # Calculate the number of placement groups based
23 # on upstream recommended best practices.
24- pgnum = (len(get_osds()) * 100 / replicas)
25+ pgnum = (len(get_osds(service)) * 100 / replicas)
26 cmd = [
27 'ceph', '--id', service,
28 'osd', 'pool', 'create',
29- name, pgnum
30+ name, str(pgnum)
31 ]
32 check_call(cmd)
33 cmd = [
34 'ceph', '--id', service,
35- 'osd', 'set', name,
36- 'size', replicas
37+ 'osd', 'pool', 'set', name,
38+ 'size', str(replicas)
39 ]
40 check_call(cmd)
41
42
43=== modified file 'tests/contrib/storage/test_linux_ceph.py'
44--- tests/contrib/storage/test_linux_ceph.py 2013-09-23 10:50:53 +0000
45+++ tests/contrib/storage/test_linux_ceph.py 2013-09-24 14:48:01 +0000
46@@ -92,11 +92,11 @@
47
48 def test_get_osds(self):
49 self.check_output.return_value = json.dumps([1, 2, 3])
50- self.assertEquals(ceph_utils.get_osds(), [1, 2, 3])
51+ self.assertEquals(ceph_utils.get_osds('test'), [1, 2, 3])
52
53 def test_get_osds_none(self):
54 self.check_output.return_value = json.dumps(None)
55- self.assertEquals(ceph_utils.get_osds(), None)
56+ self.assertEquals(ceph_utils.get_osds('test'), None)
57
58 @patch.object(ceph_utils, 'get_osds')
59 @patch.object(ceph_utils, 'pool_exists')
60@@ -107,9 +107,9 @@
61 ceph_utils.create_pool(service='cinder', name='foo')
62 self.check_call.assert_has_calls([
63 call(['ceph', '--id', 'cinder', 'osd', 'pool',
64- 'create', 'foo', 150]),
65- call(['ceph', '--id', 'cinder', 'osd', 'set',
66- 'foo', 'size', 2])
67+ 'create', 'foo', '150']),
68+ call(['ceph', '--id', 'cinder', 'osd', 'pool', 'set',
69+ 'foo', 'size', '2'])
70 ])
71
72 @patch.object(ceph_utils, 'get_osds')
73@@ -121,9 +121,9 @@
74 ceph_utils.create_pool(service='cinder', name='foo', replicas=3)
75 self.check_call.assert_has_calls([
76 call(['ceph', '--id', 'cinder', 'osd', 'pool',
77- 'create', 'foo', 100]),
78- call(['ceph', '--id', 'cinder', 'osd', 'set',
79- 'foo', 'size', 3])
80+ 'create', 'foo', '100']),
81+ call(['ceph', '--id', 'cinder', 'osd', 'pool', 'set',
82+ 'foo', 'size', '3'])
83 ])
84
85 def test_create_pool_already_exists(self):

Subscribers

People subscribed via source and target branches