Merge lp:~hopem/charm-helpers/lp1257491 into lp:charm-helpers

[Edward Hope-Morley]

[James Page (james-page)]

Hi Ed

Please update the associated test as well;

======================================================================
FAIL: It calls sgdisk correctly to zap disk
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/jamespage/src/charms/charm-helpers/charm-helpers/tests/contrib/storage/test_linux_storage_utils.py", line 15, in test_zap_disk
    check_call.assert_called_with(['sgdisk', '--zap-all', '/dev/foo'])
  File "/usr/lib/python2.7/dist-packages/mock.py", line 835, in assert_called_with
    raise AssertionError(msg)
AssertionError: Expected call: check_call(['sgdisk', '--zap-all', '/dev/foo'])
Actual call: check_call(['sgdisk', '--zap-all', '--mbrtogpt', '/dev/foo'])

I was also pondering whether target format should be an option (MBR or GPT) but I guess this covers 100% of use cases right now.

Ta

review: Needs Fixing

=== modified file 'charmhelpers/contrib/storage/linux/utils.py'
--- charmhelpers/contrib/storage/linux/utils.py	2013-06-24 22:39:29 +0000
+++ charmhelpers/contrib/storage/linux/utils.py	2013-12-09 14:09:24 +0000
@@ -22,4 +22,4 @@
 
     :param block_device: str: Full path of block device to clean.
     '''
-    check_call(['sgdisk', '--zap-all', block_device])
+    check_call(['sgdisk', '--zap-all', '--mbrtogpt', block_device])
 
=== modified file 'tests/contrib/storage/test_linux_storage_utils.py'
--- tests/contrib/storage/test_linux_storage_utils.py	2013-06-24 22:39:29 +0000
+++ tests/contrib/storage/test_linux_storage_utils.py	2013-12-09 14:09:24 +0000
@@ -12,7 +12,8 @@
         '''It calls sgdisk correctly to zap disk'''
         with patch(STORAGE_LINUX_UTILS + '.check_call') as check_call:
             storage_utils.zap_disk('/dev/foo')
-            check_call.assert_called_with(['sgdisk', '--zap-all', '/dev/foo'])
+            check_call.assert_called_with(['sgdisk', '--zap-all', '--mbrtogpt',
+                                           '/dev/foo'])
 
     @patch(STORAGE_LINUX_UTILS + '.stat')
     @patch(STORAGE_LINUX_UTILS + '.S_ISBLK')