foreman_osc 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f8bb15df38ccfcefdef7d948c883bfddcb5af21
-  data.tar.gz: 2470f847ad9d566defd8e3667961cbf7bc7372b2
+  metadata.gz: ec9d24873a21e45a7fa9df7f109e935698f9cd0b
+  data.tar.gz: 3571576c186a4932f9db9b0a44e5f0b4a9699f7c
 SHA512:
-  metadata.gz: 6d48e449ec474b80ca413d23994c19c34cd4f180c573c37fee186d31165c64cc9b074cb4cf0f72abfc1b5ecf019814c71015e381ad3a4ffd0ba1c279740e9af3
-  data.tar.gz: a9432eee24cd03162259c4eb23582a5f678d74a2e0a7b158c3580c3537136ea44df693f5150bfe26daf8fa27f111fec14e5c5f4f4a2d38a0e7b8ed5fd33df7c4
+  metadata.gz: 43fc88df8054b96a28fcae7b9d506cb36d8083fbfc1ea33d62ec76a38eab218e852996406ca58c6cb0c5aeb22d76b9e389183176adb896b522de88c47b3afef7
+  data.tar.gz: 5be375d10c724a43f42966b8d4d2f612d1202ef13f41e020cc9dfae1d35c0db13f5a0b09e27d15417d2dba762dba00a24caafa6446dcef63760b5a3880344cb3

data/app/models/concerns/foreman_osc/host_parameter_extensions.rb

@@ -0,0 +1,22 @@
+module ForemanOsc
+  module HostParameterExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      validate :rw_nfsroot_path_unique, if: :rw_host_nfsroot_path?
+    end
+
+    def rw_nfsroot_path_unique
+      rw_hosts = self.host.hostgroup.hosts
+      other_params = self.class.where.not(id: self.id).where(name: 'nfsroot_path', value: value, host: rw_hosts)
+      if ! other_params.empty?
+        errors.add(:value, "should be unique for RW hosts")
+      end
+    end
+
+    def rw_host_nfsroot_path?
+      self.name == 'nfsroot_path' && self.host.hostgroup.present? && self.host.hostgroup.name == 'rw'
+    end
+
+  end
+end

data/lib/foreman_osc/engine.rb

@@ -18,14 +18,13 @@ module ForemanOsc
       load 'osc.rake'
     end
 
-=begin
     config.to_prepare do
       begin
-        Parameter.send(:include, ForemanOsc::ParameterExtensions)
+        #Parameter.send(:include, ForemanOsc::ParameterExtensions)
+        #HostParameter.send(:include, ForemanOsc::HostParameterExtensions)
       rescue => e
         Rails.logger.warn "ForemanOsc: skipping engine hook (#{e})"
       end
     end
-=end
   end
 end

data/lib/foreman_osc/version.rb

@@ -1,3 +1,3 @@
 module ForemanOsc
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/osc.rake

@@ -24,6 +24,8 @@ Example:
         exit 1
       end
 
+      User.current = User.find_by_login('admin')
+
       Host.search_for(search).each do |host|
         next unless host.provision_interface.present?
         next unless host.tftp?
@@ -61,6 +63,8 @@ Example:
         exit 1
       end
 
+      User.current = User.find_by_login('admin')
+
       Host.search_for(search).each do |host|
         next unless host.dns?
         host.interfaces.each do |interface|
@@ -100,6 +104,8 @@ Example:
         exit 1
       end
 
+      User.current = User.find_by_login('admin')
+
       Host.search_for(search).each do |host|
         next unless host.dhcp?
 

data/test/factories/foreman_osc_factories.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
-  factory :host do
-    name 'foreman_osc'
-  end
-end
+#FactoryGirl.define do
+#  factory :host do
+#    name 'foreman_osc'
+#  end
+#end

data/test/test_plugin_helper.rb

@@ -2,5 +2,5 @@
 require 'test_helper'
 
 # Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
+#FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+#FactoryGirl.reload

data/test/unit/foreman_osc_test.rb

@@ -3,9 +3,64 @@ require 'test_plugin_helper'
 class ForemanOscTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by_login 'admin'
+    disable_orchestration
   end
 
-  test 'the truth' do
-    assert true
+  context 'HostParameterExtensions' do
+    setup do
+      @parent_hostgroup = FactoryGirl.create(:hostgroup, name: 'owens')
+      @normal_hostgroup = FactoryGirl.create(:hostgroup, name: 'compute', parent: @parent_hostgroup)
+      @rw_hostgroup = FactoryGirl.create(:hostgroup, name: 'rw', parent: @parent_hostgroup)
+      @normal_host1 = FactoryGirl.create(:host, hostgroup: @normal_hostgroup)
+      @normal_host2 = FactoryGirl.create(:host, hostgroup: @normal_hostgroup)
+      @rw_host1 = FactoryGirl.create(:host, hostgroup: @rw_hostgroup)
+      @rw_host2 = FactoryGirl.create(:host, hostgroup: @rw_hostgroup)
+      @normal_parameter1 = FactoryGirl.create(:host_parameter, name: 'nfsroot_path', value: '/foo1', host: @normal_host1)
+      @normal_parameter2 = FactoryGirl.create(:host_parameter, name: 'nfsroot_path', value: '/foo2', host: @normal_host2)
+      @rw_parameter1 = FactoryGirl.create(:host_parameter, name: 'nfsroot_path', value: '/foo1', host: @rw_host1)
+      @rw_parameter2 = FactoryGirl.create(:host_parameter, name: 'nfsroot_path', value: '/foo2', host: @rw_host2)
+    end
+
+    test 'verify fixtures' do
+      assert_equal false, @normal_parameter1.rw_host_nfsroot_path?
+      assert_equal false, @normal_parameter2.rw_host_nfsroot_path?
+      assert_equal true, @rw_parameter1.rw_host_nfsroot_path?
+      assert_equal true, @rw_parameter2.rw_host_nfsroot_path?
+    end
+
+    test 'rw_host_nfsroot_path? - false if not nfsroot_path' do
+      param = FactoryGirl.build(:host_parameter, name: 'nfsroot_kernel_version', value: '2.6.32')
+      assert_equal false, param.rw_host_nfsroot_path?
+    end
+
+    test 'rw_host_nfsroot_path? - false if not RW host' do
+      host = FactoryGirl.create(:host, hostgroup: FactoryGirl.create(:hostgroup, name: 'foo'))
+      param = FactoryGirl.build(:host_parameter, name: 'nfsroot_path', value: '/foo1', host: host)
+      assert_equal false, param.rw_host_nfsroot_path?
+    end
+
+    test 'rw hosts valid when nfsroot_path is different' do
+      assert_valid @rw_parameter1
+      assert_valid @rw_parameter2
+    end
+
+    test 'rw hosts invalid when nfsroot_path is the same' do
+      @rw_parameter1.value = '/foo1'
+      @rw_parameter2.value = '/foo1'
+      #puts "DEBUG"
+      #puts @rw_parameter2.valid?
+      refute_valid @rw_parameter2
+      assert_includes @rw_parameter2.errors[:value], "should be unique for RW hosts"
+    end
+
+    test 'non-rw hosts are valid when nfsroot_path is different and the same' do
+      assert_valid @normal_parameter1
+      assert_valid @normal_parameter2
+      @normal_parameter1.value = '/foo1'
+      @normal_parameter2.value = '/foo1'
+      assert_valid @normal_parameter1
+      assert_valid @normal_parameter2
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_osc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Trey Dockendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -59,15 +59,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- Rakefile
+- app/models/concerns/foreman_osc/host_parameter_extensions.rb
 - app/models/concerns/foreman_osc/parameter_extensions.rb
-- lib/foreman_osc.rb
-- lib/foreman_osc/engine.rb
-- lib/foreman_osc/version.rb
 - lib/osc.rake
 - lib/tasks/foreman_osc_tasks.rake
+- lib/foreman_osc/engine.rb
+- lib/foreman_osc/version.rb
+- lib/foreman_osc.rb
+- LICENSE
+- Rakefile
+- README.md
 - test/factories/foreman_osc_factories.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_osc_test.rb
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: OSC Foreman Plugin