foreman_ansible 1.0 → 1.1

data/test/unit/helpers/foreman_ansible/ansible_reports_helper_test.rb

@@ -2,6 +2,7 @@ require 'test_plugin_helper'
 
 module ForemanAnsible
   module Helpers
+    # Tests for the view helper that concerns the Ansible reports styles
     class AnsibleReportsHelperTest < ActiveSupport::TestCase
       include ForemanAnsible::AnsibleReportsHelper
 

data/test/unit/host_ansible_role_test.rb

@@ -1,7 +1,17 @@
 require 'test_plugin_helper'
 
+# Tests for validators and such of the join model between Host and
+# AnsibleRole
 class HostAnsibleRoleTest < ActiveSupport::TestCase
   should belong_to(:host)
   should belong_to(:ansible_role)
   should validate_presence_of(:ansible_role_id)
+
+  describe 'uniqueness' do
+    subject do
+      HostAnsibleRole.new(:host => FactoryGirl.build(:host),
+                          :ansible_role => FactoryGirl.build(:ansible_role))
+    end
+    should validate_uniqueness_of(:ansible_role_id).scoped_to(:host_id)
+  end
 end

data/test/unit/hostgroup_ansible_role_test.rb

@@ -0,0 +1,19 @@
+require 'test_plugin_helper'
+
+# Tests for validators and such of the join model between Hostgroup and
+# AnsibleRole
+class HostgroupAnsibleRoleTest < ActiveSupport::TestCase
+  should belong_to(:hostgroup)
+  should belong_to(:ansible_role)
+  should validate_presence_of(:ansible_role_id)
+
+  describe 'uniqueness' do
+    subject do
+      HostgroupAnsibleRole.new(
+        :hostgroup => FactoryGirl.build(:hostgroup),
+        :ansible_role => FactoryGirl.build(:ansible_role)
+      )
+    end
+    should validate_uniqueness_of(:ansible_role_id).scoped_to(:hostgroup_id)
+  end
+end

data/test/unit/lib/foreman_ansible_core/playbook_runner_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class PlaybookRunnerTest < ActiveSupport::TestCase
+  context 'roles dir' do
+    test 'reads default when none provided' do
+      File.expects(:exist?).with('/etc/ansible').returns(true)
+      runner = ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
+      assert '/etc/ansible', runner.instance_variable_get('@ansible_dir')
+    end
+  end
+
+  context 'working_dir' do
+    test 'creates temp one if not provided' do
+      Dir.expects(:mktmpdir)
+      File.expects(:exist?).with('/etc/ansible').returns(true)
+      ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
+    end
+
+    test 'reads it when provided' do
+      settings = { :working_dir => '/foo', :ansible_dir => '/etc/foo' }
+      ForemanAnsibleCore.expects(:settings).returns(settings)
+      File.expects(:exist?).with(settings[:ansible_dir]).returns(true)
+      Dir.expects(:mktmpdir).never
+      runner = ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
+      assert '/foo', runner.instance_variable_get('@working_dir')
+    end
+  end
+end

data/test/unit/lib/proxy_api/ansible_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+# unit tests for ProxyAPI::Ansible
+class AnsibleTest < ActiveSupport::TestCase
+  setup do
+    @url = 'http://localhost:8443'
+    @proxy_api = ProxyAPI::Ansible.new(:url => @url)
+  end
+
+  test 'should get ansible roles from proxy' do
+    roles = ['some_role.some_author', 'test_role.test_author']
+    @proxy_api.expects(:get).returns(fake_rest_client_response(roles))
+    assert_equal roles, @proxy_api.roles
+  end
+
+  test 'should raise error with appropriate message' do
+    message = 'Connection refused'
+    @proxy_api.expects(:get).raises(Errno::ECONNREFUSED, message)
+    err = assert_raises ProxyAPI::ProxyException do
+      @proxy_api.roles
+    end
+    assert_match message, err.message
+  end
+end

data/test/unit/services/api_roles_importer_test.rb

@@ -0,0 +1,28 @@
+require 'test_plugin_helper'
+# unit tests for ApiRolesImporter
+class ApiRolesImporterTest < ActiveSupport::TestCase
+  setup do
+    @importer = ForemanAnsible::ApiRolesImporter.new
+    first_name = 'test_user.test_name'
+    second_name = 'some_user.some_role'
+    @test_roles = [AnsibleRole.new(:name => first_name),
+                   AnsibleRole.new(:name => second_name)]
+  end
+
+  test 'should import roles' do
+    @importer.stubs(:import_role_names).returns(:new => @test_roles)
+    res = @importer.import!
+    assert_equal 2, res.count
+    assert AnsibleRole.find_by :name => @test_roles.first.name
+    assert AnsibleRole.find_by :name => @test_roles.last.name
+  end
+
+  test 'should obsolete roles' do
+    @importer.stubs(:import_role_names).returns(:obsolete => @test_roles)
+    @test_roles.map(&:save)
+    res = @importer.obsolete!
+    assert_equal 2, res.count
+    refute AnsibleRole.find_by :name => @test_roles.first.name
+    refute AnsibleRole.find_by :name => @test_roles.last.name
+  end
+end

data/test/unit/services/proxy_selector_test.rb

@@ -0,0 +1,28 @@
+require 'test_plugin_helper'
+
+class ProxySelectorTest < ActiveSupport::TestCase
+  setup do
+    @host = FactoryGirl.create(:host)
+  end
+
+  test 'reuses proxies already assigned to host' do
+    mocked_scope = mock
+    mocked_scope.expects(:with_features).with('Ansible').returns('foo')
+    @host.expects(:smart_proxies).returns(mocked_scope)
+    proxy_selector = ForemanAnsible::ProxySelector.new
+    assert_equal 'foo',
+                 proxy_selector.available_proxies(@host)[:fallback]
+  end
+
+  test 'only finds proxies that are within host taxonomies' do
+    @host.organization = taxonomies(:organization1)
+    @ansible_proxy = FactoryGirl.create(:smart_proxy, :with_ansible,
+                                        :organizations => [@host.organization])
+    # Unreachable proxy, because of the organizations mismatch with Host
+    FactoryGirl.create(:smart_proxy, :with_ansible, :organizations => [])
+    proxy_selector = ForemanAnsible::ProxySelector.new
+    setup_user('view', 'smart_proxies')
+    assert_equal [@ansible_proxy],
+                 proxy_selector.available_proxies(@host)[:global]
+  end
+end

data/test/unit/services/roles_importer_test.rb

@@ -0,0 +1,17 @@
+require 'test_plugin_helper'
+# unit tests for RolesImporter
+class RolesImporterTest < ActiveSupport::TestCase
+  setup do
+    @role = FactoryGirl.create(:ansible_role)
+    @importer = ForemanAnsible::RolesImporter.new
+  end
+
+  test 'should detect changes when importing roles' do
+    role = FactoryGirl.build(:ansible_role)
+    changes = @importer.detect_changes [role]
+    assert_equal 1, changes[:new].length
+    assert_equal 1, changes[:obsolete].length
+    assert_equal role.name, changes[:new].first.name
+    assert_equal @role.name, changes[:obsolete].first.name
+  end
+end

data/test/unit/services/ui_roles_importer_test.rb

@@ -0,0 +1,30 @@
+require 'test_plugin_helper'
+# unit tests for UiRolesImporter
+class UiRolesImporterTest < ActiveSupport::TestCase
+  setup do
+    changed_roles
+    @importer = ForemanAnsible::UiRolesImporter.new
+  end
+
+  test 'should create new role' do
+    refute AnsibleRole.find_by(:name => @new_role[:name])
+    @importer.create_new_roles(@changes['new'])
+    assert AnsibleRole.find_by(:name => @new_role[:name])
+  end
+
+  test 'should delete old roles' do
+    assert AnsibleRole.find_by(:name => @role.name)
+    @importer.delete_old_roles(@changes['obsolete'])
+    refute AnsibleRole.find_by(:name => @role.name)
+  end
+
+  private
+
+  def changed_roles
+    @role = FactoryGirl.create(:ansible_role)
+    new_role_name = 'test_role.foreman'
+    @new_role = { :id => nil, :name => new_role_name }
+    @changes = { 'new' => { 'test_role.foreman' => @new_role.to_json },
+                 'obsolete' => { @role.name => @role.to_json } }
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.42'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.42'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,48 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: foreman-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: dynflow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.14
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.14
+- !ruby/object:Gem::Dependency
+  name: foreman_ansible_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ansible integration with Foreman
 email:
 - elobatocs@gmail.com
@@ -48,54 +90,90 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/ansible_roles_controller.rb
+- app/controllers/api/v2/ansible_roles_controller.rb
 - app/controllers/foreman_ansible/concerns/hosts_controller_extensions.rb
+- app/helpers/foreman_ansible/ansible_plugin_helper.rb
 - app/helpers/foreman_ansible/ansible_reports_helper.rb
 - app/helpers/foreman_ansible/ansible_roles_helper.rb
 - app/helpers/foreman_ansible/hosts_helper_extensions.rb
-- app/jobs/foreman_ansible/run_playbook_job.rb
+- app/lib/actions/foreman_ansible/play_host_roles.rb
+- app/lib/actions/foreman_ansible/play_hosts_roles.rb
+- app/lib/proxy_api/ansible.rb
 - app/models/ansible_role.rb
+- app/models/concerns/foreman_ansible/has_many_ansible_roles.rb
 - app/models/concerns/foreman_ansible/host_managed_extensions.rb
+- app/models/concerns/foreman_ansible/hostgroup_extensions.rb
 - app/models/foreman_ansible/fact_name.rb
 - app/models/host_ansible_role.rb
+- app/models/hostgroup_ansible_role.rb
 - app/overrides/ansible_roles_tab.rb
+- app/overrides/hostgroup_ansible_roles_tab.rb
 - app/overrides/report_output.rb
+- app/services/foreman_ansible/api_roles_importer.rb
 - app/services/foreman_ansible/fact_importer.rb
 - app/services/foreman_ansible/fact_parser.rb
 - app/services/foreman_ansible/fact_sparser.rb
 - app/services/foreman_ansible/inventory_creator.rb
 - app/services/foreman_ansible/playbook_creator.rb
-- app/services/foreman_ansible/role_player.rb
+- app/services/foreman_ansible/proxy_selector.rb
 - app/services/foreman_ansible/roles_importer.rb
+- app/services/foreman_ansible/ui_roles_importer.rb
+- app/views/ansible_roles/import.html.erb
+- app/views/ansible_roles/index.html.erb
+- app/views/ansible_roles/welcome.html.erb
+- app/views/api/v2/ansible_roles/import.json.rabl
+- app/views/api/v2/ansible_roles/index.json.rabl
+- app/views/api/v2/ansible_roles/obsolete.json.rabl
+- app/views/api/v2/ansible_roles/show.json.rabl
+- app/views/foreman_ansible/ansible_roles/_select_tab_content.html.erb
+- app/views/foreman_ansible/ansible_roles/_select_tab_title.html.erb
 - app/views/foreman_ansible/config_reports/_ansible.html.erb
 - app/views/foreman_ansible/config_reports/_output.html.erb
-- app/views/foreman_ansible/hosts/_tab_content.html.erb
-- app/views/foreman_ansible/hosts/_tab_title.html.erb
 - config/routes.rb
 - db/migrate/20160705082036_create_ansible_role.rb
 - db/migrate/20160706074540_create_join_table_hosts_ansible_roles.rb
 - db/migrate/20160707195442_create_host_ansible_roles.rb
-- db/seeds.d/62-ansible_proxy_feature.rb
+- db/migrate/20160729094457_add_columns_to_ansible_role.rb
+- db/migrate/20160802153302_create_join_table_hostgroup_ansible_roles.rb
+- db/migrate/20160805094233_add_primary_key_hostgroup_ansible_roles.rb
+- db/seeds.d/62_ansible_proxy_feature.rb
 - lib/foreman_ansible.rb
 - lib/foreman_ansible/engine.rb
 - lib/foreman_ansible/version.rb
-- lib/tasks/foreman_ansible_tasks.rake
 - locale/Makefile
 - locale/en/foreman_ansible.po
 - locale/foreman_ansible.pot
 - locale/gemspec.rb
+- test/factories/ansible_proxy.rb
 - test/factories/ansible_roles.rb
+- test/fixtures/ansible_permissions.yml
 - test/fixtures/sample_facts.json
+- test/functional/ansible_roles_controller_test.rb
+- test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/hosts_controller_test.rb
+- test/support/fixture_support.rb
+- test/support/foreman_tasks/task.rb
+- test/support/foreman_test_helper_additions.rb
 - test/test_plugin_helper.rb
 - test/unit/ansible_role_test.rb
+- test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/fact_importer_test.rb
 - test/unit/fact_parser_test.rb
 - test/unit/fact_sparser_test.rb
 - test/unit/helpers/foreman_ansible/ansible_reports_helper_test.rb
 - test/unit/host_ansible_role_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
+- test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/proxy_selector_test.rb
+- test/unit/services/roles_importer_test.rb
+- test/unit/services/ui_roles_importer_test.rb
 homepage: https://github.com/theforeman/foreman_ansible
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -113,18 +191,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
+- test/fixtures/ansible_permissions.yml
 - test/fixtures/sample_facts.json
+- test/factories/ansible_proxy.rb
 - test/factories/ansible_roles.rb
+- test/support/fixture_support.rb
+- test/support/foreman_test_helper_additions.rb
+- test/support/foreman_tasks/task.rb
+- test/functional/api/v2/ansible_roles_controller_test.rb
+- test/functional/ansible_roles_controller_test.rb
 - test/functional/hosts_controller_test.rb
 - test/test_plugin_helper.rb
 - test/unit/fact_parser_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
+- test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/services/proxy_selector_test.rb
+- test/unit/services/ui_roles_importer_test.rb
+- test/unit/services/roles_importer_test.rb
+- test/unit/services/api_roles_importer_test.rb
 - test/unit/host_ansible_role_test.rb
 - test/unit/ansible_role_test.rb
 - test/unit/fact_importer_test.rb
 - test/unit/fact_sparser_test.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
 - test/unit/helpers/foreman_ansible/ansible_reports_helper_test.rb

data/app/jobs/foreman_ansible/run_playbook_job.rb

@@ -1,28 +0,0 @@
-module ForemanAnsible
-  # Run the ansible-playbook binary, depends on a valid playbook and inventory
-  class RunPlaybookJob < ActiveJob::Base
-    queue_as :ansible
-    attr_reader :pid
-
-    after_perform do |job|
-      Foreman::Logging.
-        logger('foreman_ansible').
-        info('PID for playbook run for'\
-             " #{job.arguments.first} #{job.arguments.second}:"\
-             " #{pid}")
-    end
-
-    def perform(playbook_path, inventory_path)
-      @pid = spawn("ansible-playbook -i #{inventory_path} #{playbook_path}",
-                   :out => log_file,
-                   :err => log_file)
-    end
-
-    private
-
-    def log_file
-      "#{::Foreman::Logging.log_directory}/"\
-        "#{::Foreman::Logging.config[:filename]}"
-    end
-  end
-end