foreman_acd 0.6.0 → 0.9.1

data/app/views/foreman_acd/app_instances/index.html.erb

@@ -53,21 +53,25 @@
           <div class="modal-content">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-              <h4 class="modal-title"><%= _('Confirmation Box')%></h4>
+              <h4 class="modal-title"><%= _('Confirmation')%></h4>
             </div>
             <div class="modal-body">
-              <p> <%= _("Confirm to delete ") %> <%= app_instance %></p>
+              <p> <%= _("Confirm to delete application instance: ") %> <%= app_instance %></p>
               <%= form_tag destroy_with_hosts_app_instance_path(:id => app_instance.id), :method => :delete do %>
-                <% if app_instance.foreman_hosts.where.not(:host_id => [nil, false]).any? %>
-                  <p><%= _("Select the hosts to delete along with ") %> <%= app_instance %>: </p>
-                <% end %>
-                <% app_instance.foreman_hosts.each do |foreman_host|%>
+                <% showSelectHostsNote = true %>
+                <% app_instance.foreman_hosts.select(&:fresh_host?).each do |foreman_host|%>
                   <% if foreman_host.host_id? %>
-                    <%= check_box_tag 'foreman_host_ids[]', foreman_host.host_id -%>
-                    <%= h foreman_host.host.name -%>
-                    </br>
+                    <% if showSelectHostsNote %>
+                      <p><%= _("Select the hosts to delete along with ") %> <%= app_instance %>: </p>
+                      <% showSelectHostsNote = false %>
+                    <% end %>
+                      <%= check_box_tag 'foreman_host_ids[]', foreman_host.host_id, false, class: 'acd_host' -%> <%= h foreman_host.host.name -%>
+                      </br>
                   <% end %>
                 <% end %>
+                <hr width="90%">
+                <p> <%= check_box_tag "check_all", "", false, { :onchange => "toggleCheckboxesBySelector('.acd_host')" } %> Select / unselect all hosts</p>
+                <br /><p><%= _("Note: Hosts which already existed and were added to the application instance are not shown in this dialog!") %></p> 
             </div>
             <div class="modal-footer">
                <button type="button" class="btn btn-primary" data-dismiss="modal"><%= _('Cancel') %></button>
@@ -89,10 +93,12 @@
             <div class="modal-body">
               <p><%= _('Confirm to deploy ') %><%= app_instance%></p>
               <%= form_tag deploy_app_instance_path(:id => app_instance.id), :method => :post do %>
-              <!-- TODO: Add safe-deploy method with delete all hosts option 
                 <% if app_instance.foreman_hosts.where.not(:host_id => [nil, false]).any? %>
-                  <%= check_box_tag 'delete_hosts'-%><%= _('Delete all hosts before deploying ') %><%= app_instance%>
-                <% end %> -->
+                  <ul>
+                  <li><%= check_box_tag 'delete_hosts'-%> <%= _('Delete all hosts before deploying ') %><%= app_instance%></li>
+                  <li><%= check_box_tag 'safe_deploy' -%> <%= _('Deploy only new and changed hosts for ') %><%= app_instance%></li>
+                  </ul>
+                <% end %>
             </div>
             <div class="modal-footer">
                <button type="button" class="btn btn-danger" data-dismiss="modal"><%= _('Cancel') %></button>

data/app/views/foreman_acd/app_instances/report.html.erb

@@ -9,14 +9,19 @@
 
 <%
   json = {
-    "mode": 'lastReport',
+    "deploymentState": @app_instance.deployment_state.to_s,
+    "initialConfigureState": @app_instance.initial_configure_state.to_s,
     "appInstanceName": @app_instance.name,
     "hosts": @report_hosts,
     "deployTaskUrl": foreman_tasks_task_path(@app_instance.last_deploy_task),
-    "configureJobUrl": job_invocations_path(search: "description ~ \"ACD application #{@app_instance.name}\"")
+    "configureJobUrl": job_invocations_path(search: "description ~ \"ACD application #{@app_instance.name}\""),
+    "reportDataUrl": ui_acd_report_data_path("__id__"),
+    "appInstanceId": @app_instance.id,
   }
+
+  json["initialConfigureJobUrl"] = job_invocation_path(@app_instance.initial_configure_job) unless @app_instance.initial_configure_job.nil?
 %>
 
 <div id='report'></div>
-  <%=  mount_react_component('ApplicationInstanceReport', "#report", json.to_json) %>
+  <%=  react_component('ApplicationInstanceReport', :data => json) %>
 </div

data/app/views/templates/job/run_acd_ansible_playbook.erb

@@ -3,7 +3,7 @@ kind: job_template
 name: Run ACD Ansible Playbook - ACD Default
 model: JobTemplate
 job_category: Application Centric Deployment
-description_format: "Run Ansible playbook %{playbook_name} for ACD application %{application_name}"
+description_format: "Run Ansible playbook to configure ACD application %{application_name}"
 feature: run_acd_ansible_playbook
 provider_type: ACD
 template_inputs:

data/app/views/ui_acd/host_report.json.rabl

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+collection @hosts
+attributes :id, :name, :build, :hostUrl, :isExistingHost, :progress_report, :powerStatusUrl

data/app/views/ui_acd/report_data.json.rabl

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+object @report_data
+attribute :deploymentState
+attribute :initialConfigureState
+attribute :initialConfigureJobUrl
+
+child :hosts => :hosts do
+  extends 'ui_acd/host_report'
+end

data/app/views/ui_acd/validate_hostname.json.rabl

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+object @host_validation
+attribute :hostname
+attribute :fqdn
+attribute :result

data/config/routes.rb

@@ -5,9 +5,12 @@ Rails.application.routes.draw do
     resources :ansible_playbooks, :controller => 'foreman_acd/ansible_playbooks' do
       collection do
         get 'auto_complete_search'
+        put 'sync_git_repo'
+        post 'sync_git_repo'
       end
 
       member do
+        post 'sync_git_repo'
         get 'import_vars'
       end
     end
@@ -15,6 +18,7 @@ Rails.application.routes.draw do
       collection do
         get 'auto_complete_search'
         get 'import'
+        post 'handle_file_upload'
       end
 
       member do
@@ -39,6 +43,8 @@ Rails.application.routes.draw do
     get 'ui_acd_app/:id', :to => 'ui_acd#app', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_app
     get 'ui_acd_foreman_data/:id', :to => 'ui_acd#foreman_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_foreman_data
     get 'ui_acd_ansible_data/:id', :to => 'ui_acd#ansible_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_ansible_data
+    get 'ui_acd_report_data/:id', :to => 'ui_acd#report_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_report_data
+    get 'ui_acd_validate_hostname', :to => 'ui_acd#validate_hostname', :as => :ui_acd_validate_hostname
 
     scope :api, :path => '/api', :defaults => { :format => 'json' } do
       scope '(:apiv)', :defaults => { :apiv => 'v2' },

data/db/migrate/20210316151145_add_git_commit_to_ansible_playbooks.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add git_commit column to ansible_playbook
+class AddGitCommitToAnsiblePlaybooks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :acd_ansible_playbooks, :git_commit, :string
+  end
+end

data/db/migrate/20210503122809_add_git_url_to_ansible_playbooks.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add git_url column to ansible_playbook
+class AddGitUrlToAnsiblePlaybooks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :acd_ansible_playbooks, :git_url, :string
+  end
+end

data/db/migrate/20210818125913_add_is_existing_host_to_foreman_host.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add is_existing_host to app instance
+class AddIsExistingHostToForemanHost < ActiveRecord::Migration[6.0]
+  def change
+    add_column :acd_foreman_hosts, :is_existing_host, :boolean, :default => false, :null => false
+  end
+end

data/db/migrate/20210902110645_add_initial_configure_task.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add AddInitialConfigureTask
+class AddInitialConfigureTask < ActiveRecord::Migration[5.2]
+  def change
+    add_column :acd_app_instances, :initial_configure_task_id, :uuid, :null => true
+  end
+end

data/db/seeds.d/75-job_templates.rb

@@ -4,7 +4,7 @@ User.as_anonymous_admin do
   JobTemplate.without_auditing do
     Dir[File.join("#{ForemanAcd::Engine.root}/app/views/templates/**/*.erb")].each do |template|
       sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
-      template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+      template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
 
       template.organizations << Organization.unscoped.all if template&.organizations&.empty?
       template.locations << Location.unscoped.all if template&.locations&.empty?

data/lib/foreman_acd/engine.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'foreman_remote_execution'
+require 'git'
 
+# The ForemanAcd module
 module ForemanAcd
   # This engine connects ForemanAcd with Foreman core
   class Engine < ::Rails::Engine
@@ -49,13 +51,33 @@ module ForemanAcd
     end
 
     config.to_prepare do
-      RemoteExecutionProvider.register(:ACD, AcdProvider)
       ::Taxonomy.include ForemanAcd::TaxonomyExtensions
       ::Host::Managed.prepend ForemanAcd::HostManagedExtensions
-    end
 
-    def self.with_katello?
-      defined?(::Katello)
+      RemoteExecutionProvider.register(:ACD, AcdProvider)
+      ForemanAcd.register_rex_feature
     end
   end
+
+  def self.with_katello?
+    defined?(::Katello)
+  end
+
+  def self.with_remote_execution?
+    RemoteExecutionFeature
+  rescue StandardError
+    false
+  end
+
+  def self.register_rex_feature
+    return unless ForemanAcd.with_remote_execution?
+    RemoteExecutionFeature.register(
+      :run_acd_ansible_playbook,
+      N_('Run playbook for ACD'),
+      {
+        :description => N_('Run an Ansible playbook to configure ACD application'),
+        :provided_inputs => %w[application_name playbook_name playbook_path inventory_path]
+      }
+    )
+  end
 end

data/lib/foreman_acd/plugin.rb

@@ -33,7 +33,7 @@ Foreman::Plugin.register :foreman_acd do
                :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
     permission :edit_ansible_playbooks,
-               { :'foreman_acd/ansible_playbooks' => [:update, :edit],
+               { :'foreman_acd/ansible_playbooks' => [:update, :edit, :sync_git_repo],
                  :'foreman_acd/api/v2/ansible_playbooks' => [:update] },
                :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
@@ -72,7 +72,7 @@ Foreman::Plugin.register :foreman_acd do
                :resource_type => 'ForemanAcd::AppDefinition'
 
     permission :export_app_definitions,
-               { :'foreman_acd/app_definitions' => [:export],
+               { :'foreman_acd/app_definitions' => [:export, :handle_file_upload],
                  :'foreman_acd/api/v2/app_definitions' => [:export] },
                :resource_type => 'ForemanAcd::AppDefinition'
 
@@ -111,16 +111,16 @@ Foreman::Plugin.register :foreman_acd do
                  :'foreman_acd/api/v2/app_instances' => [:report] },
                :resource_type => 'ForemanAcd::AppInstance'
 
-    permission :new_remote_execution,
+    permission :new_acd_configure_job,
                { :'foreman_acd/remote_execution' => [:new] },
-               :resource_type => 'ForemanAcd::RemoteExecution'
+               :resource_type => 'ForemanAcd::AppInstance'
 
-    permission :create_remote_execution,
+    permission :create_acd_configure_job,
                { :'foreman_acd/remote_execution' => [:create] },
-               :resource_type => 'ForemanAcd::RemoteExecution'
+               :resource_type => 'ForemanAcd::AppInstance'
 
     permission :view_ui_acd,
-               { :ui_acd => [:app, :foreman_data, :ansible_data] }
+               { :ui_acd => [:app, :foreman_data, :ansible_data, :validate_hostname, :report_data] }
 
     permission :acd_foreman_hosts,
                { :'foreman_acd/app_instances' => [:create, :edit, :update, :deploy, :destroy_with_hosts, :destroy] },
@@ -137,7 +137,7 @@ Foreman::Plugin.register :foreman_acd do
                                                   :create_app_instances, :view_app_instances, :edit_app_instances,
                                                   :destroy_app_instances,
                                                   :deploy_app_instances,
-                                                  :new_remote_execution, :create_remote_execution,
+                                                  :new_acd_configure_job, :create_acd_configure_job,
                                                   :report_app_instances,
                                                   :view_ui_acd,
                                                   :view_hosts, :build_hosts, :power_hosts, :create_hosts, :edit_hosts, :destroy_hosts, :console_hosts,
@@ -150,7 +150,7 @@ Foreman::Plugin.register :foreman_acd do
   role 'Application Centric Deployment User', [:create_app_instances, :view_app_instances, :edit_app_instances,
                                                :destroy_app_instances,
                                                :deploy_app_instances,
-                                               :new_remote_execution, :create_remote_execution,
+                                               :new_acd_configure_job, :create_acd_configure_job,
                                                :report_app_instances,
                                                :view_ui_acd,
                                                :view_hosts, :build_hosts, :power_hosts, :create_hosts, :edit_hosts, :destroy_hosts, :console_hosts,
@@ -160,13 +160,4 @@ Foreman::Plugin.register :foreman_acd do
                                                :acd_foreman_hosts, :view_smart_proxies]
 
   add_all_permissions_to_default_roles
-
-  RemoteExecutionFeature.register(
-    :run_acd_ansible_playbook,
-    N_('Run playbook for ACD'),
-    {
-      :description => N_('Run an Ansible playbook to configure ACD application'),
-      :provided_inputs => %w[application_name playbook_name playbook_path inventory_path]
-    }
-  )
 end

data/lib/foreman_acd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanAcd
-  VERSION = '0.6.0'
+  VERSION = '0.9.1'
 end

data/lib/foreman_acd.rb

@@ -4,4 +4,34 @@ require 'foreman_acd/engine'
 
 # Module required to start the Foreman Rails engine
 module ForemanAcd
+  RUN_CONFIGURATOR_DELAY = 240
+
+  class << self
+    def acd_base_path
+      '/var/lib/foreman/foreman_acd/'
+    end
+
+    def ansible_playbook_path
+      File.join(acd_base_path, 'ansible-playbooks')
+    end
+
+    def proxy_setting
+      HttpProxy.default_global_content_proxy&.full_url ||
+        Setting[:http_proxy]
+    end
+
+    def initiate_acd_app_configurator(app_instance)
+      return unless app_instance.hosts_deployment_finished?
+
+      ::Foreman::Logging.logger('foreman_acd').info("All hosts of app (#{app_instance.name}) were built. Schedule app configurator...")
+      start_acd_app_configurator(app_instance)
+    end
+
+    def start_acd_app_configurator(app_instance)
+      task = ForemanTasks.delay(::Actions::ForemanAcd::RunConfigurator,
+                                { :start_at => Time.zone.now + RUN_CONFIGURATOR_DELAY },
+                                app_instance)
+      app_instance.update(:initial_configure_task_id => task.id)
+    end
+  end
 end

data/lib/tasks/foreman_acd_tasks.rake

@@ -1,17 +1,5 @@
 # frozen_string_literal: true
 
-require 'rake/testtask'
-
-# Tasks
-namespace :foreman_acd do
-  namespace :example do
-    desc 'Example Task'
-    task :task => :environment do
-      # Task goes here
-    end
-  end
-end
-
 # Tests
 namespace :test do
   desc 'Test ForemanAcd'

data/package.json

@@ -1,42 +1,28 @@
 {
   "name": "foreman_acd",
-  "version": "0.3.0",
+  "version": "0.9.0",
   "description": "foreman application centric deployment",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "@theforeman/vendor": "^1.7.0",
+    "@theforeman/vendor": "^4.14.0",
     "react-intl": "^2.8.0"
   },
   "devDependencies": {
-    "@theforeman/vendor-dev": "^1.7.0",
-    "babel-eslint": "^8.2.1",
-    "babel-jest": "^23.6.0",
-    "babel-plugin-dynamic-import-node": "^2.0.0",
+    "@theforeman/builder": "^4.14.0",
+    "@theforeman/vendor-dev": "^4.14.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-assign": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
-    "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0",
-    "enzyme-to-json": "^3.3.5",
-    "eslint": "^4.18.1",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.2.0",
-    "eslint-plugin-patternfly-react": "^0.2.1",
-    "eslint-plugin-react": "^7.4.0",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.6",
+    "enzyme-to-json": "^3.6.1",
     "identity-obj-proxy": "^3.0.0",
-    "lodash": "^4.17.11",
     "jest": "^23.6.0",
-    "jest-cli": "^23.6.0",
     "jest-prop-type-error": "^1.1.0",
-    "react-redux-test-utils": "^0.1.1",
-    "sortabular": "~1.5.1",
-    "table-resolver": "~3.2.0"
+    "react-redux-test-utils": "^0.1.1"
   },
   "scripts": {
     "test": "node node_modules/.bin/jest --no-cache"

data/test/controllers/ansible_playbooks_controller_test.rb

@@ -11,7 +11,7 @@ module ForemanAcd
       @model = ForemanAcd::AnsiblePlaybook.first
     end
 
-    basic_index_test('ansible_playbook')
+    basic_index_test('ansible_playbooks')
     basic_new_test
     basic_edit_test('ansible_playbook')
 

data/test/controllers/app_instances_controller_test.rb

@@ -11,17 +11,22 @@ module ForemanAcd
       @model = ForemanAcd::AppInstance.first
     end
 
+    def set_session_user
+      org_a = Organization.find_by(:name => 'Organization 1')
+      loc_a = Location.find_by(:name => 'Location 1')
+      super.merge(:location_id => loc_a.id, :organization_id => org_a.id)
+    end
+
     basic_index_test('app_instances')
     basic_new_test
-    basic_edit_test('app_instance')
+    # basic_edit_test('app_instance')
 
     test 'should destroy app instance' do
       assert_difference('AppInstance.count', -1) do
-        delete :destroy,
+        delete :destroy_with_hosts,
                :params => { :id => @model.id },
                :session => set_session_user
       end
-      assert_redirected_to app_instances_url
     end
   end
 end

data/test/controllers/ui_acd_controller_test.rb

@@ -19,20 +19,39 @@ class UiAcdControllerTest < ActionController::TestCase
     get :app, :params => { :id => app_def.id }, :session => set_session_user
     assert_response :success
 
+    json_app_services = JSON.parse(app_def.services)
+    json_app_all = JSON.parse(app_def.ansible_vars_all)
+    parsed_services_response = JSON.parse(json_response['app_definition']['services'])
+    parsed_all_response = JSON.parse(json_response['app_definition']['ansible_vars_all'])
+
     assert_equal app_def.name, json_response['app_definition']['name']
-    assert_equal app_def.hostgroup_id, json_response['fdata']['hostgroup_id']
-    assert_equal app_def.hostgroup.domain.name, json_response['fdata']['domains'][0]['name']
-    assert_equal app_def.hostgroup.environment.name, json_response['fdata']['environments'][0]['name']
-    assert_equal app_def.hostgroup.ptable.name, json_response['fdata']['ptables'][0]['name']
+    assert_equal json_app_services.first['name'], parsed_services_response.first['name']
+    assert_equal json_app_services.first['ansibleGroup'], parsed_services_response.first['ansibleGroup']
+    assert_equal json_app_all.first['name'], parsed_all_response.first['name']
   end
 
-  test 'get fdata json' do
+  test 'get foreman data json foreman <3' do
+    # TODO: Get rid of the puppet dependency at all!
+    skip 'Puppet env was removed with foreman >= 3.x' unless defined?(ForemanPuppet)
+
     hostgroup = FactoryBot.create(:hostgroup, :with_domain, :with_os, :with_environment)
-    get :fdata, :params => { :id => hostgroup.id }, :session => set_session_user
+    get :foreman_data, :params => { :id => hostgroup.id }, :session => set_session_user
     assert_response :success
 
+    assert_equal hostgroup.id, json_response['hostgroup_id']
     assert_equal hostgroup.environment.name, json_response['environments'][0]['name']
     assert_equal hostgroup.domain.name, json_response['domains'][0]['name']
     assert_equal hostgroup.ptable.name, json_response['ptables'][0]['name']
   end
+
+  test 'get ansible data json' do
+    ansible_playbook = FactoryBot.create(:ansible_playbook)
+    get :ansible_data, :params => { :id => ansible_playbook.id }, :session => set_session_user
+    assert_response :success
+
+    json_playbook = JSON.parse(ansible_playbook.vars)
+    assert_equal ansible_playbook.name, json_response['name']
+    assert_equal json_playbook['dbservers']['mysqlservice'], json_response['groups']['dbservers']['mysqlservice']
+    assert_equal json_playbook['all']['repository'], json_response['groups']['all']['repository']
+  end
 end

data/test/factories/foreman_acd_factories.rb

@@ -1,17 +1,31 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
+  factory :ansible_playbook, :class => 'ForemanAcd::AnsiblePlaybook' do
+    sequence(:name) { |n| "ansible_playbook#{n}" }
+    sequence(:description) { |n| "description#{n}" }
+    scm_type { 'directory' }
+    path { '/home/vagrant/acd_examples/ansible-playbook' }
+    playfile { 'site.yml' }
+    vars { '{"dbservers":{"mysqlservice":"mysqld","mysql_port":3306,"dbuser":"webapp","dbname":"ANSAP01","upassword":"Bond@007","masterpassword":"MySQL@007"},"all":{"repository":"https://github.com/bennojoy/mywebapp.git"},"webservers":{"dummy_var":0}}' }
+  end
+
   factory :app_definition, :class => 'ForemanAcd::AppDefinition' do
     sequence(:name) { |n| "app_definition#{n}" }
     sequence(:description) { |n| "description#{n}" }
-    hostgroup { FactoryBot.create(:hostgroup, :with_domain, :with_os, :with_environment) }
-    parameters { '[{"id":0,"name":"Hostname","description":"","type":"hostname","value":"mysqllinux"},{"id":1,"name":"RootPW","description":"","type":"password","value":"sesam12345"},{"id":2,"name":"ansible_root","description":"","type":"hostparam","value":"/root/ansible"}]' }
+    ansible_playbook
+    services do
+      '[{"id":1,"name":"DB","description":"","hostgroup":"1","ansibleGroup":"dbservers","minCount":"","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"mysqlservice","value":"mysqld"},{"id":1,"name":"mysql_port","value":"3306"},{"id":2,"name":"dbuser","value":"webapp"},{"id":3,"name":"dbname","value":"ANSAP01"},{"id":4,"name":"upassword","value":"Bond@007"},{"id":5,"name":"masterpassword","value":"MySQL@007"}]},{"id":2,"name":"Web","description":"","hostgroup":"1","ansibleGroup":"webservers","minCount":"","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"dummy_var","value":"0"}]}]'
+    end
+    ansible_vars_all { '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]' }
   end
 
   factory :app_instance, :class => 'ForemanAcd::AppInstance' do
     sequence(:name) { |n| "app_instance#{n}" }
-    app_definition { FactoryBot.create(:app_definition) }
     sequence(:description) { |n| "description#{n}" }
-    parameters { '[{"id":0,"name":"Hostname","description":"","type":"hostname","value":"mysqllinux"},{"id":1,"name":"RootPW","description":"","type":"password","value":"sesam12345"},{"id":2,"name":"ansible_root","description":"","type":"hostparam","value":"/root/ansible"}]' }
+    app_definition
+    location { Location.find_by(:name => 'Location 1') }
+    organization { Organization.find_by(:name => 'Organization 1') }
+    ansible_vars_all { '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]' }
   end
 end

data/test/models/acd_provider_test.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanAcd
+  # ACD Provider Test
+  class AcdProviderTest < ActiveSupport::TestCase
+    describe '.provider_names' do
+      let(:provider_names) { AcdProvider.provider_names }
+
+      it 'returns only strings' do
+        provider_names.each do |name|
+          _(name).must_be_kind_of String
+        end
+      end
+
+      context 'provider is registetered under :custom symbol' do
+        before { AcdProvider.register(:ACD, String) }
+        it { _(provider_names).must_include 'ACD' }
+      end
+    end
+
+    describe AcdProvider do
+      before { User.current = FactoryBot.build(:user, :admin) }
+      after { User.current = nil }
+
+      before do
+        Setting::RemoteExecution.load_defaults
+      end
+
+      let(:job_invocation) { FactoryBot.create(:job_invocation, :with_template) }
+      let(:template_invocation) { job_invocation.pattern_template_invocations.first }
+      let(:host) { FactoryBot.create(:host) }
+      let(:proxy_options) { AcdProvider.proxy_command_options(template_invocation, host) }
+    end
+  end
+end

data/test/models/ansible_playbook_test.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanAcd
+  # Ansible Playbook Model tests
+  class AnsiblePlaybookTest < ActiveSupport::TestCase
+    should validate_presence_of(:name)
+    should validate_uniqueness_of(:name)
+  end
+end

data/test/models/app_definition_test.rb

@@ -7,7 +7,7 @@ module ForemanAcd
   class AppDefinitionTest < ActiveSupport::TestCase
     should validate_presence_of(:name)
     should validate_uniqueness_of(:name)
-    should belong_to(:hostgroup)
+    should belong_to(:ansible_playbook)
     should have_many(:app_instances).dependent(:destroy)
   end
 end

data/test/models/app_instance_test.rb

@@ -7,5 +7,7 @@ module ForemanAcd
   class AppInstanceTest < ActiveSupport::TestCase
     should validate_presence_of(:name)
     should belong_to(:app_definition)
+    should belong_to(:location)
+    should belong_to(:organization)
   end
 end

data/test/models/concerns/host_extensions_test.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanAcd
+  # Host Extensions Test
+  class HostExtensionsTest < ActiveSupport::TestCase
+    setup do
+      User.current = users :admin
+    end
+
+    test 'host was deployed via acd?' do
+      host = FactoryBot.create :host
+      app = FactoryBot.create :app_instance
+
+      foreman_host = app.foreman_hosts.create(:hostname => host.name,
+                                              :service => 'DB',
+                                              :description => 'Description',
+                                              :foremanParameters => nil,
+                                              :ansibleParameters => nil)
+      foreman_host.host = host
+      foreman_host.save
+      assert host.deployed_via_acd?
+    end
+  end
+end