Merge "Use anchor to require necessary packages"

lib/puppet/type/designate_api_paste_ini.rb

@@ -45,9 +45,8 @@ Puppet::Type.newtype(:designate_api_paste_ini) do
     defaultto('<SERVICE DEFAULT>')
   end
 
-
-  autorequire(:package) do
-    'designate-common'
+  autorequire(:anchor) do
+    ['designate::install::end']
   end
 
 end

lib/puppet/type/designate_config.rb

@@ -46,8 +46,8 @@ Puppet::Type.newtype(:designate_config) do
     defaultto('<SERVICE DEFAULT>')
   end
 
-  autorequire(:package) do
-    'designate-common'
+  autorequire(:anchor) do
+    ['designate::install::end']
   end
 
 end

lib/puppet/type/designate_rootwrap_config.rb

@@ -17,8 +17,8 @@ Puppet::Type.newtype(:designate_rootwrap_config) do
     newvalues(/^[\S ]*$/)
   end
 
-  autorequire(:package) do
-    'designate-common'
+  autorequire(:anchor) do
+    ['designate::install::end']
   end
 
 end

spec/unit/type/designate_api_paste_ini.rb

@@ -1,65 +1,24 @@
-autorequire 'puppet'
+require 'puppet'
 require 'puppet/type/designate_api_paste_ini'
+
 describe 'Puppet::Type.type(:designate_api_paste_ini)' do
   before :each do
     @designate_api_paste_ini = Puppet::Type.type(:designate_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
   end
 
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:designate_api_paste_ini).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-  it 'should not expect a name with whitespace' do
-    expect {
-      Puppet::Type.type(:designate_api_paste_ini).new(:name => 'f oo')
-    }.to raise_error(Puppet::Error, /Parameter name failed/)
-  end
-
-  it 'should fail when there is no section' do
-    expect {
-      Puppet::Type.type(:designate_api_paste_ini).new(:name => 'foo')
-    }.to raise_error(Puppet::Error, /Parameter name failed/)
-  end
-
-  it 'should not require a value when ensure is absent' do
-    expect {
-      Puppet::Type.type(:designate_api_paste_ini).new(:name => 'DEFAULT/foo', :ensure => :absent)
-    }.not_to raise_error
-  end
-
   it 'should accept a valid value' do
     @designate_api_paste_ini[:value] = 'bar'
     expect(@designate_api_paste_ini[:value]).to eq('bar')
   end
 
-  it 'should accept a value with whitespace' do
-    @designate_api_paste_ini[:value] = 'b ar'
-    expect(@designate_api_paste_ini[:value]).to eq('b ar')
-  end
-
-  it 'should accept valid ensure values' do
-    @designate_api_paste_ini[:ensure] = :present
-    expect(@designate_api_paste_ini[:ensure]).to eq(:present)
-    @designate_api_paste_ini[:ensure] = :absent
-    expect(@designate_api_paste_ini[:ensure]).to eq(:absent)
-  end
-
-  it 'should not accept invalid ensure values' do
-    expect {
-      @designate_api_paste_ini[:ensure] = :latest
-    }.to raise_error(Puppet::Error, /Invalid value/)
-  end
-
   it 'should autorequire the package that install the file' do
     catalog = Puppet::Resource::Catalog.new
-    package = Puppet::Type.type(:package).new(:name => 'designate-common')
-    catalog.add_resource package, @designate_api_paste_ini
+    anchor = Puppet::Type.type(:anchor).new(:name => 'designate::install::end')
+    catalog.add_resource anchor, @designate_api_paste_ini
     dependency = @designate_api_paste_ini.autorequire
     expect(dependency.size).to eq(1)
     expect(dependency[0].target).to eq(@designate_api_paste_ini)
-    expect(dependency[0].source).to eq(package)
+    expect(dependency[0].source).to eq(anchor)
   end
 
 end

spec/unit/type/designate_config_spec.rb

@@ -1,5 +1,6 @@
 require 'puppet'
 require 'puppet/type/designate_config'
+
 describe 'Puppet::Type.type(:designate_config)' do
   before :each do
     @designate_config = Puppet::Type.type(:designate_config).new(:name => 'DEFAULT/foo', :value => 'bar')
@@ -52,12 +53,12 @@ describe 'Puppet::Type.type(:designate_config)' do
 
   it 'should autorequire the package that install the file' do
     catalog = Puppet::Resource::Catalog.new
-    package = Puppet::Type.type(:package).new(:name => 'designate-common')
-    catalog.add_resource package, @designate_config
+    anchor = Puppet::Type.type(:anchor).new(:name => 'designate::install::end')
+    catalog.add_resource anchor, @designate_config
     dependency = @designate_config.autorequire
     expect(dependency.size).to eq(1)
     expect(dependency[0].target).to eq(@designate_config)
-    expect(dependency[0].source).to eq(package)
+    expect(dependency[0].source).to eq(anchor)
   end
 
 end

spec/unit/type/designate_rootwrap_config_spec.rb

@@ -54,12 +54,12 @@ describe 'Puppet::Type.type(:designate_rootwrap_config)' do
 
   it 'should autorequire the package that install the file' do
     catalog = Puppet::Resource::Catalog.new
-    package = Puppet::Type.type(:package).new(:name => 'designate-common')
-    catalog.add_resource package, @designate_rootwrap_config
+    anchor = Puppet::Type.type(:anchor).new(:name => 'designate::install::end')
+    catalog.add_resource anchor, @designate_rootwrap_config
     dependency = @designate_rootwrap_config.autorequire
     expect(dependency.size).to eq(1)
     expect(dependency[0].target).to eq(@designate_rootwrap_config)
-    expect(dependency[0].source).to eq(package)
+    expect(dependency[0].source).to eq(anchor)
   end
 
 end