Adding --type attribute to logical volumes.

add new test for type parameter
stub irrelevant methods in test cases

Co-Authored-By: Cam Cope <cam@dropbox.com>

Author: GiooDev

lib/puppet/provider/logical_volume/lvm.rb

@@ -103,6 +103,10 @@ def create
             args.push('--minor', @resource[:minor])
         end
 
+        if @resource[:type]
+            args.push('--type', @resource[:type])
+        end
+
         args << @resource[:volume_group]
         lvcreate(*args)
     end

lib/puppet/type/logical_volume.rb

@@ -84,7 +84,7 @@ def insync?(is)
   end
 
   newparam(:type) do
-    desc "Configures the logical volume type. AIX only"
+    desc "Configures the logical volume type."
   end
 
   newparam(:range) do

manifests/logical_volume.pp

@@ -19,6 +19,7 @@
   $readahead         = undef,
   $range             = undef,
   $size_is_minsize   = undef,
+  $type              = undef,
 ) {
 
   validate_bool($mountpath_require)
@@ -75,7 +76,8 @@
     readahead       => $readahead,
     extents         => $extents,
     range           => $range,
-    size_is_minsize => $size_is_minsize
+    size_is_minsize => $size_is_minsize,
+    type            => $type
   }
 
   if $createfs {

spec/unit/puppet/provider/logical_volume/lvm_spec.rb

@@ -5,7 +5,7 @@
 describe provider_class do
 
   before do
-    @resource = stub("resource")
+    @resource = stub_everything("resource")
     @provider = provider_class.new(@resource)
   end
 
@@ -33,32 +33,26 @@
         @resource.expects(:[]).with(:name).returns('mylv')
         @resource.expects(:[]).with(:volume_group).returns('myvg')
         @resource.expects(:[]).with(:size).returns('1g').at_least_once
-        @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-        @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
-        @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-        @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-        @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-        @resource.expects(:[]).with(:minor).returns(nil).at_least_once
         @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
         @provider.create
       end
     end
+    context 'with size and type' do
+      it "should execute 'lvcreate' with a '--size' option" do
+        @resource.expects(:[]).with(:name).returns('mylv')
+        @resource.expects(:[]).with(:volume_group).returns('myvg')
+        @resource.expects(:[]).with(:size).returns('1g').at_least_once
+        @resource.expects(:[]).with(:type).returns('linear').at_least_once
+        @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', '--type', 'linear', 'myvg')
+        @provider.create
+      end
+    end
     context 'with initial_size' do
       it "should execute 'lvcreate' with a '--size' option" do
         @resource.expects(:[]).with(:name).returns('mylv')
         @resource.expects(:[]).with(:volume_group).returns('myvg')
         @resource.expects(:[]).with(:initial_size).returns('1g').at_least_once
         @resource.expects(:[]).with(:size).returns(nil).at_least_once
-        @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-        @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
-        @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-        @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-        @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-        @resource.expects(:[]).with(:minor).returns(nil).at_least_once
         @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
         @provider.create
       end
@@ -70,13 +64,6 @@
         @resource.expects(:[]).with(:size).returns(nil).at_least_once
         @resource.expects(:[]).with(:initial_size).returns(nil).at_least_once
         @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-        @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
-        @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-        @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-        @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-        @resource.expects(:[]).with(:minor).returns(nil).at_least_once
         @provider.expects(:lvcreate).with('-n', 'mylv', '--extents', '100%FREE', 'myvg')
         @provider.create
       end
@@ -87,13 +74,6 @@
         @resource.expects(:[]).with(:volume_group).returns('myvg')
         @resource.expects(:[]).with(:size).returns('1g').at_least_once
         @resource.expects(:[]).with(:extents).returns('80%vg').at_least_once
-        @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-        @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
-        @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-        @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-        @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-        @resource.expects(:[]).with(:minor).returns(nil).at_least_once
         @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', '--extents', '80%vg', 'myvg')
         @provider.create
       end
@@ -103,14 +83,6 @@
         @resource.expects(:[]).with(:name).returns('mylv')
         @resource.expects(:[]).with(:volume_group).returns('myvg')
         @resource.expects(:[]).with(:size).returns('1g').at_least_once
-        @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-        @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
-        @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-        @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-        @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-        @resource.expects(:[]).with(:minor).returns(nil).at_least_once
         @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
         @provider.create
       end
@@ -120,18 +92,8 @@
         @resource.expects(:[]).with(:name).returns('mylv')
         @resource.expects(:[]).with(:volume_group).returns('myvg')
         @resource.expects(:[]).with(:initial_size).returns('1g').at_least_once
-        @resource.expects(:[]).with(:size).returns(nil).at_least_once
-        @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-        @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
         @resource.expects(:[]).with(:mirror).returns('1').at_least_once
         @resource.expects(:[]).with(:mirrorlog).returns('core').at_least_once
-        @resource.expects(:[]).with(:region_size).returns(nil).at_least_once
-        @resource.expects(:[]).with(:no_sync).returns(nil).at_least_once
-        @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-        @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-        @resource.expects(:[]).with(:minor).returns(nil).at_least_once
         @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', '--mirrors', '1', '--mirrorlog', 'core', 'myvg')
         @provider.create
       end
@@ -143,12 +105,6 @@
         @resource.expects(:[]).with(:size).returns('1g').at_least_once
         @resource.expects(:[]).with(:persistent).returns(:true).at_least_once
         @resource.expects(:[]).with(:minor).returns('100').at_least_once
-        @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-        @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-        @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
-        @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-        @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
         @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', '--persistent', 'y', '--minor', '100', 'myvg')
         @provider.create
       end
@@ -162,14 +118,6 @@
           @resource.expects(:[]).with(:name).returns('mylv').at_least_once
           @resource.expects(:[]).with(:volume_group).returns('myvg').at_least_once
           @resource.expects(:[]).with(:size).returns('1g').at_least_once
-          @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-          @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-          @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-          @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
-          @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-          @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-          @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-          @resource.expects(:[]).with(:minor).returns(nil).at_least_once
           @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
           @provider.create
           @provider.expects(:lvs).with('--noheading', '--unit', 'g', '/dev/myvg/mylv').returns(' 1.00g').at_least_once
@@ -185,13 +133,6 @@
           @resource.expects(:[]).with(:volume_group).returns('myvg').at_least_once
           @resource.expects(:[]).with(:size).returns('1g').at_least_once
           @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-          @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-          @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-          @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
-          @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-          @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-          @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-          @resource.expects(:[]).with(:minor).returns(nil).at_least_once
           @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
           @provider.create
           @provider.expects(:lvs).with('--noheading', '--unit', 'g', '/dev/myvg/mylv').returns(' 1.00g').at_least_once
@@ -206,15 +147,7 @@
           @resource.expects(:[]).with(:name).returns('mylv').at_least_once
           @resource.expects(:[]).with(:volume_group).returns('myvg').at_least_once
           @resource.expects(:[]).with(:size).returns('1g').at_least_once
-          @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-          @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-          @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-          @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
           @resource.expects(:[]).with(:size_is_minsize).returns(:false).at_least_once
-          @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-          @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-          @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-          @resource.expects(:[]).with(:minor).returns(nil).at_least_once
           @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
           @provider.create
           @provider.expects(:lvs).with('--noheading', '--unit', 'g', '/dev/myvg/mylv').returns(' 1.00g').at_least_once
@@ -229,15 +162,7 @@
           @resource.expects(:[]).with(:name).returns('mylv').at_least_once
           @resource.expects(:[]).with(:volume_group).returns('myvg').at_least_once
           @resource.expects(:[]).with(:size).returns('1g').at_least_once
-          @resource.expects(:[]).with(:extents).returns(nil).at_least_once
-          @resource.expects(:[]).with(:stripes).returns(nil).at_least_once
-          @resource.expects(:[]).with(:stripesize).returns(nil).at_least_once
-          @resource.expects(:[]).with(:readahead).returns(nil).at_least_once
           @resource.expects(:[]).with(:size_is_minsize).returns(:true).at_least_once
-          @resource.expects(:[]).with(:mirror).returns(nil).at_least_once
-          @resource.expects(:[]).with(:alloc).returns(nil).at_least_once
-          @resource.expects(:[]).with(:persistent).returns(nil).at_least_once
-          @resource.expects(:[]).with(:minor).returns(nil).at_least_once
           @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
           @provider.create
           @provider.expects(:lvs).with('--noheading', '--unit', 'g', '/dev/myvg/mylv').returns(' 1.00g').at_least_once