Fix handling for missing params. +CreateFileSystems

alenz33 · Mar 31, 2015 · 18dbfcb · 18dbfcb
1 parent 82e7c19
commit 18dbfcb
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/conduct/buildsteps.py b/conduct/buildsteps.py
@@ -34,7 +34,7 @@
 from conduct.param import Parameter, oneof, none_or, dictof, listof, tupleof
 
 __all__ = ['BuildStep', 'SystemCall', 'Config', 'TmpDir', 'RmPath',
-           'Partitioning', 'DevMapper']
+           'Partitioning', 'DevMapper', 'CreateFileSystem']
 
 
 class BuildStepMeta(type):
@@ -236,8 +236,13 @@ def _initLogger(self):
         self.log.setLevel(LOGLEVELS[self.loglevel])
 
     def _applyParams(self, paramValues):
-        for name, value in paramValues.iteritems():
-            setattr(self, name, value)
+
+        for name, paramDef in self.parameters.iteritems():
+            if name in paramValues:
+                setattr(self, name, paramValues[name])
+            elif paramDef.default is None:
+                raise RuntimeError('%s: Mandatory parameter %s is missing'
+                                   % (self.name, name))
 
 
 class SystemCall(BuildStep):
@@ -474,6 +479,31 @@ def cleanup(self):
                    captureOutput=True,
                    log=self.log)
 
+class CreateFileSystem(BuildStep):
+    '''
+    This build step creates the desired file system on the given device.
+    Used tool: mkfs
+    '''
+
+    parameters = {
+        'dev' : Parameter(type=str,
+                                 description='Path to the device file'),
+        'fstype' : Parameter(type=oneof('bfs',
+                                        'cramfs',
+                                        'ext2',
+                                        'ext3',
+                                        'ext4',
+                                        'fat',
+                                        'ntfs',
+                                        'vfat'),
+                                 description='Desired file system'),
+    }
+
+    def run(self):
+        systemCall('mkfs -t %s %s' % (self.fstype, self.dev),
+                   captureOutput=True,
+                   log=self.log)
+
 
 
 

diff --git a/etc/chains/frm2/boximg.py b/etc/chains/frm2/boximg.py
@@ -57,4 +57,14 @@
                         description='Map new image partitions to device files',
                         dev='{steps.tmpdir.tmpdir}/{chain.imgname}.img')
 
+steps.mkfs1   = Step('conduct.CreateFileSystem',
+                        description='Create ext2 file systems for first image partition',
+                        dev='{steps.devmap.mapped[0]}',
+                        fstype='ext2')
+
+steps.mkfs2   = Step('conduct.CreateFileSystem',
+                        description='Create ext2 file systems for second image partition',
+                        dev='{steps.devmap.mapped[1]}',
+                        fstype='ext2')
+