Merge pull request #173 from ruriky/fix/lvs_pattern

Cannot add a new volume if the volume group has the same name. Fix: Better regexp for parsing the output of lvs

Author: bmjen

lib/puppet/provider/logical_volume/lvm.rb

@@ -293,7 +293,9 @@ def mirrorlog=( new_mirror_log_location )
     private
 
     def lvs_pattern
-        /\s+#{Regexp.quote @resource[:name]}\s+/
+        # lvs output format:
+        # LV      VG       Attr       LSize   Pool Origin Data%  Meta%  Move Log Cpy%Sync Convert
+        /\s+#{Regexp.quote @resource[:name]}\s+#{Regexp.quote @resource[:volume_group]}\s+/
     end
 
     def path

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

@@ -13,6 +13,7 @@
   LV      VG       Attr       LSize   Pool Origin Data%  Meta%  Move Log Cpy%Sync Convert
   lv_root VolGroup -wi-ao----  18.54g
   lv_swap VolGroup -wi-ao---- 992.00m
+  data    data     -wi-ao---- 992.00m  
   EOS
 
   describe 'self.instances' do
@@ -27,6 +28,21 @@
     end
   end
 
+  describe 'when checking existence' do
+    it "should return 'true', lv 'data' in vg 'data' exists" do
+      @resource.expects(:[]).with(:name).returns('data')
+      @resource.expects(:[]).with(:volume_group).returns('data').at_least_once
+      @provider.class.stubs(:lvs).with('data').returns(lvs_output)
+      expect(@provider.exists?).to be > 10
+    end
+    it "should return 'nil', lv 'data' in vg 'myvg' does not exist" do
+      @resource.expects(:[]).with(:name).returns('data')
+      @resource.expects(:[]).with(:volume_group).returns('myvg').at_least_once
+      @provider.class.stubs(:lvs).with('myvg').returns(lvs_output)
+      expect(@provider.exists?).to be_nil
+    end
+  end
+
   describe 'when inspecting' do
     it "strips zeros from lvs output" do
       @resource.expects(:[]).with(:name).returns('mylv').at_least_once