Charm Helpers

Merge lp:~axwalk/charm-helpers/storage-defaults-None into lp:charm-helpers

  1. storage-defaults-None
  2. Merge into devel
Proposed by Andrew Wilkins
Status: Merged
Merged at revision: 490
Proposed branch: lp:~axwalk/charm-helpers/storage-defaults-None
Merge into: lp:charm-helpers
Diff against target: 21 lines (+2/-2)
1 file modified
charmhelpers/core/hookenv.py (+2/-2)
To merge this branch: bzr merge lp:~axwalk/charm-helpers/storage-defaults-None
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+278272@code.launchpad.net

Description of the change

Use None for the value of optional arguments in storage_list and storage_get, as requested in https://code.launchpad.net/~axwalk/charms/trusty/ceph/trunk/+merge/276727/comments/703998.

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/core/hookenv.py'
2--- charmhelpers/core/hookenv.py 2015-10-26 10:22:43 +0000
3+++ charmhelpers/core/hookenv.py 2015-11-23 01:49:10 +0000
4@@ -637,7 +637,7 @@
5
6
7 @cached
8-def storage_get(attribute="", storage_id=""):
9+def storage_get(attribute=None, storage_id=None):
10 """Get storage attributes"""
11 _args = ['storage-get', '--format=json']
12 if storage_id:
13@@ -651,7 +651,7 @@
14
15
16 @cached
17-def storage_list(storage_name=""):
18+def storage_list(storage_name=None):
19 """List the storage IDs for the unit"""
20 _args = ['storage-list', '--format=json']
21 if storage_name:

Subscribers

People subscribed via source and target branches