Merge pull request #202 from endocode/master

Datastore provider supports setting basepath.

Author: sebastiansucker

lib/puppet/provider/onedatastore/cli.rb

@@ -61,7 +61,12 @@ def exists?
   def self.get_datastore(xml)
     datastore_hash = Hash.new
     get_attributes.each do |node|
-      if node == :type
+      if node == :base_path
+        ## removes a char, one or more digits from the end
+        #  required to match basepath /tmp vs /tmp/102
+        text = xml.css("#{node.to_s.upcase}").first.text.sub!(/.\d+\z/, '')
+        datastore_hash[node] = text
+      elsif node == :type
         case xml.css("#{node.to_s.upcase}").first.text
           when '0' then text = 'IMAGE_DS'
           when '1' then text = 'SYSTEM_DS'

spec/acceptance/onedatastore_spec.rb

@@ -12,17 +12,66 @@ class { 'one':
   end
 
   describe 'when creating a System datastore' do
-    it 'should idempotently run' do
+
+    after(:each) do
       pp = <<-EOS
       onedatastore { 'nfs_ds':
-        tm_mad   => 'shared',
-        type     => 'system_ds',
+        ensure => absent,
       }
       EOS
 
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
+
+    context "with default values" do
+      it 'should idempotently run' do
+        pp = <<-EOS
+        onedatastore { 'nfs_ds':
+          tm_mad   => 'shared',
+          type     => 'system_ds',
+        }
+        EOS
+
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
+      end
+    end
+
+    context "with custom values" do
+      it 'should idempotently run' do
+        pp = <<-EOS
+        onedatastore { 'nfs_ds':
+          ensure    => present,
+          type      => 'system_ds',
+          tm_mad    => 'shared',
+          driver    => 'raw',
+          disk_type => 'file',
+        }
+        EOS
+
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
+      end
+    end
+
+    context "with custom basepath" do
+      it 'should idempotently run' do
+        pp = <<-EOS
+        onedatastore { 'nfs_ds':
+          ensure    => present,
+          type      => 'system_ds',
+          tm_mad    => 'shared',
+          driver    => 'raw',
+          disk_type => 'file',
+          base_path => '/tmp',
+        }
+        EOS
+
+        apply_manifest(pp, :catch_failures => true)
+        apply_manifest(pp, :catch_changes => true)
+      end
+    end
   end
 
   describe 'when creating a File datastore' do