foreman_acd 0.0.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc128735b86a6df24be3490ecec2792097945edd5de653d2cdfeeb8022d259e6
-  data.tar.gz: 47d6de7ab66f891bf07569ad795a77b2dc2db6070f4c32e198f6573c945c7305
+  metadata.gz: ef0b36ad161877bede4fe9a9df532a8201fc31710b1f42ab988152aeba863cac
+  data.tar.gz: a629384ff81f18c21883ea4a09a76828988bff02e6a709a7f2151e77fff46836
 SHA512:
-  metadata.gz: bc3220d4ccacc055d7b332f0761671ba4d82a04bdc8aeaa82cab5567e85e1bb9092edb2fa78423115b042ca7fdff3971b93a46b141f87f888e83e8fcdf42dfae
-  data.tar.gz: 496f08b50b1014605995e80dbe2311c9ec02bbc2ab3db147ba415090d28ee2ed194376891772c79ef4986f8418312b9319949471ee5f03c94c991380a980552e
+  metadata.gz: 8c8843594e0cbad7c6b85398c8b4d2c8fe18703ef7dc5c2ebd4fd46ccd0690a3cf30588e13dcef66e9d568fa4c5ca97fd272ebb5f5107e3f2ad1258f9fb9d35f
+  data.tar.gz: 99181b0218e89485fffedfdd1374b095c1830614718332246f72238af50adb65610e03fdaa0a035f6cd68208d8f72679b141eac2b558dc1824abb30b21120b56

data/app/controllers/foreman_acd/api/v2/app_definitions_controller.rb

@@ -24,8 +24,7 @@ module ForemanAcd
           param :app_definition, Hash, :required => true, :action_aware => true do
             param :name, String, :required => true
             param :description, String, :required => true
-            param :hostgroup_id, :number, :required => true
-            param :parameters, String, :required => true
+            param :services, String, :required => true
           end
         end
 

data/app/controllers/foreman_acd/app_definitions_controller.rb

@@ -6,7 +6,8 @@ module ForemanAcd
     include Foreman::Controller::AutoCompleteSearch
     include ::ForemanAcd::Concerns::AppDefinitionParameters
 
-    before_action :find_resource, :only => [:edit, :update, :destroy]
+    before_action :find_resource, :only => [:edit, :update, :destroy, :export]
+    before_action :handle_file_upload, :only => [:create]
 
     def index
       @app_definitions = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
@@ -49,5 +50,32 @@ module ForemanAcd
         process_error
       end
     end
+
+    def action_permission
+      case params[:action]
+      when 'export'
+        :export
+      else
+        super
+      end
+    end
+
+    def import
+      read_hostgroups
+      @app_definition = AppDefinition.new
+    end
+
+    def export
+      filename = "#{@app_definition.name}.yaml"
+      data = JSON.parse(@app_definition.services).to_yaml
+      send_data data, :type => 'text/yaml', :disposition => 'attachment', :filename => filename
+    end
+
+    private
+
+    def handle_file_upload
+      return unless params[:foreman_acd_app_definition] && raw_file = params[:foreman_acd_app_definition][:app_definition_file]
+      params[:foreman_acd_app_definition][:services] = YAML.load_file(raw_file.tempfile).to_json
+    end
   end
 end

data/app/controllers/foreman_acd/app_instances_controller.rb

@@ -6,7 +6,7 @@ module ForemanAcd
     include Foreman::Controller::AutoCompleteSearch
     include ::ForemanAcd::Concerns::AppInstanceParameters
 
-    before_action :find_resource, :only => [:edit, :update, :destroy, :deploy]
+    before_action :find_resource, :only => [:edit, :update, :destroy, :deploy, :report]
 
     def index
       @app_instances = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
@@ -54,26 +54,76 @@ module ForemanAcd
       case params[:action]
       when 'deploy'
         :deploy
+      when 'report'
+        :report
       else
         super
       end
     end
 
     def deploy
-      params = host_attributes(set_host_params)
-
-      # Print to log for debugging purposes
-      logger.info("Host creation parameters:\n#{params}\n")
-
-      @host = Host.new(params)
-      apply_compute_profile(@host)
-      @host.suggest_default_pxe_loader
-      @host.save
-      success _('Successfully initiated host creation')
-    rescue StandardError => e
-      logger.error("Failed to initiate host creation: #{e.backtrace.join($INPUT_RECORD_SEPARATOR)}")
-    ensure
-      redirect_to app_instances_path
+      services = JSON.parse(@app_instance.app_definition.services)
+      @deploy_hosts = []
+
+      app_hosts = JSON.parse(@app_instance.hosts)
+
+      app_hosts.each do |host_data|
+        begin
+          service_data = services.select { |k| k['id'] == host_data['service'].to_i }.first
+          host_params = set_host_params(host_data, service_data)
+
+          host = nil
+          if host_data.has_key?('foreman_host_id')
+            logger.debug("Try to find host with id #{host_data['foreman_host_id']}")
+            begin
+              host = Host.find(host_data['foreman_host_id'])
+            rescue ActiveRecord::RecordNotFound
+              logger.info("Host with id #{host_data['foreman_host_id']} couldn\'t be found, create a new one!")
+              host = nil
+            end
+          end
+
+          if host.nil?
+            logger.info("Host creation parameters for #{host_data['hostname']}:\n#{params}\n")
+            params = host_attributes(host_params)
+            host = Host.new(params)
+          else
+            logger.info("Update parameters and re-deploy host #{host_data['hostname']}")
+            host.attributes = host_attributes(host_params, host)
+            host.setBuild
+            host.power.reset
+          end
+
+          # REMOVE ME (but very nice for testing)
+          #host.mac = "00:11:22:33:44:55"
+
+          apply_compute_profile(host)
+          host.suggest_default_pxe_loader
+          host.save
+
+          # save the foreman host id
+          host_data['foreman_host_id'] = host.id
+
+          @deploy_hosts.push({ id: host.id, name: host_data['hostname'], hostname: host.hostname, hostUrl: host_path(h), progress_report_id: host.progress_report_id})
+        rescue StandardError => e
+          logger.error("Failed to initiate host creation: #{e.backtrace.join($INPUT_RECORD_SEPARATOR)}")
+        end
+      end
+
+      # save any change to the app_hosts json
+      @app_instance.hosts = app_hosts.to_json
+      @app_instance.save
+    end
+
+    def report
+      @report_hosts = []
+      app_hosts = JSON.parse(@app_instance.hosts)
+      app_hosts.each do |host_data|
+        h = Host.find(host_data['foreman_host_id'])
+        @report_hosts.push({id: h.id, name: host_data['hostname'], hostname: h.hostname, hostUrl: host_path(h), powerStatusUrl: power_api_host_path(h) })
+      end
+
+      logger.debug("deploy report hosts are: #{@report_hosts.inspect}")
     end
 
     private
@@ -117,10 +167,12 @@ module ForemanAcd
       result
     end
 
-    def set_host_params
+    def set_host_params(host_data, service_data)
       result = hardcoded_params
-      result['hostgroup_id'] = @app_instance.app_definition.hostgroup_id
-      JSON.parse(@app_instance.parameters).each do |param|
+      result['name'] = host_data['hostname']
+      result['hostgroup_id'] = service_data['hostgroup']
+
+      host_data['parameters'].each do |param|
         case param['type']
 
         when 'computeprofile'
@@ -129,9 +181,6 @@ module ForemanAcd
         when 'domain'
           result['domain_id'] = param['value']
 
-        when 'hostname'
-          result['name'] = param['value']
-
         when 'hostparam'
           result['host_parameters_attributes'].push(:name => param['name'], :value => param['value'])
 

data/app/controllers/foreman_acd/concerns/app_definition_parameters.rb

@@ -9,7 +9,7 @@ module ForemanAcd
       class_methods do
         def app_definition_params_filter
           Foreman::ParameterFilter.new(::ForemanAcd::AppDefinition).tap do |filter|
-            filter.permit(:name, :description, :hostgroup_id, :parameters)
+            filter.permit(:name, :description, :services)
           end
         end
       end

data/app/controllers/foreman_acd/concerns/app_instance_parameters.rb

@@ -9,7 +9,7 @@ module ForemanAcd
       class_methods do
         def app_instance_params_filter
           Foreman::ParameterFilter.new(::ForemanAcd::AppInstance).tap do |filter|
-            filter.permit(:name, :app_definition_id, :description, :parameters)
+            filter.permit(:name, :app_definition_id, :description, :hosts)
           end
         end
       end

data/app/controllers/ui_acd_controller.rb

@@ -6,7 +6,6 @@ class UiAcdController < ::Api::V2::BaseController
     @app_data = {}
     app_definition = ForemanAcd::AppDefinition.find(params[:id])
     @app_data['app_definition'] = app_definition
-    @app_data['fdata'] = collect_fdata(app_definition.hostgroup_id)
   end
 
   def fdata

data/app/models/foreman_acd/app_definition.rb

@@ -8,7 +8,6 @@ module ForemanAcd
     friendly_id :name
 
     validates :name, :presence => true, :uniqueness => true
-    belongs_to :hostgroup, :class_name => '::Hostgroup'
     has_many :app_instances, :inverse_of => :app_definition, :dependent => :destroy
     scoped_search :on => :name
 

data/app/views/foreman_acd/app_definitions/_form.html.erb

@@ -3,21 +3,13 @@
       "organization": current_organization,
       "location": current_location,
       "hostgroups": @hostgroups,
-      "loadForemanDataUrl": ui_acd_fdata_path("__id__")
+      "loadForemanDataUrl": ui_acd_fdata_path("__id__"),
+      "services": [],
     }
 
-    if @app_definition.name.empty?
-      json["mode"] = "newDefinition"
-    else
-      json["mode"] = "editDefinition"
-      json["appDefinition"] = {
-        "id": @app_definition.id,
-        "name": @app_definition.name,
-        "hostgroup_id": @app_definition.hostgroup_id,
-      }
-      json["parameters"] = JSON.parse(@app_definition.parameters)
+    if !@app_definition.name.empty?
+      json["services"] = JSON.parse(@app_definition.services)
     end
-
 %>
 
 <%= form_for @app_definition, :url => (@app_definition.new_record? ? app_definitions_path : app_definition_path(:id => @app_definition.id)) do |f| %>
@@ -31,8 +23,8 @@
       <%= text_f f, :name %>
       <%= text_f f, :description %>
 
-      <div id='param-selection'></div>
-      <%=  mount_react_component('ParameterSelection', "#param-selection", json.to_json) %>
+      <div id='app_definition'></div>
+      <%=  mount_react_component('ApplicationDefinition', "#app_definition", json.to_json) %>
     </div>
   </div>
 

data/app/views/foreman_acd/app_definitions/import.html.erb

@@ -0,0 +1,18 @@
+<% title _('Import Application Definition') %>
+
+<%= form_for @app_definition, :url => (app_definitions_path), :html => { :multipart => true } do |f| %>
+  <%= base_errors_for @app_definition %>
+  <ul class="nav nav-tabs" data-tabs="tabs">
+    <li class="active"><a href="#primary" data-toggle="tab"><%= _('Application Definitions') %></a></li>
+  </ul>
+
+  <div class="tab-content">
+    <div class="tab-pane active" id="primary">
+      <%= text_f f, :name %>
+      <%= text_f f, :description %>
+      <%= file_field_f f, :app_definition_file, :label_help => _("Application Definition file") %>
+    </div>
+  </div>
+
+  <%= submit_or_cancel f %>
+<% end %>

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

@@ -1,22 +1,26 @@
 <% title _('Application Definitions') %>
 
-<% title_actions button_group(new_link(_('New Application Definition'))) %>
+<% title_actions button_group(
+  new_link(_('New Application Definition')),
+  display_link_if_authorized(_("Import"), hash_for_import_app_definitions_path, :class => 'btn btn-default')
+) %>
 
 <table class="table table-bordered table-striped">
   <tr>
     <th><%= sort :name, :as => s_('AppDefinition|Name') %></th>
     <th><%= _('Description') %></th>
-    <th><%= sort :hostgroup, :as => _('Host groups'), :default => 'DESC' %></th>
     <th></th>
   </tr>
   <% for app_definition in @app_definitions %>
     <tr>
       <td><%=link_to_if_authorized h(app_definition.name), hash_for_edit_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer) %></td>
       <td><%= app_definition.description %></td>
-      <td><%= app_definition.hostgroup %></td>
       <td>
-          <%= action_buttons(display_delete_if_authorized(hash_for_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer),
-                                                          :data => { 'confirm': _('Delete %s?') % app_definition.name })) %>
+        <%= action_buttons(
+          display_delete_if_authorized(hash_for_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer),
+                                       :data => { 'confirm': _('Delete %s?') % app_definition.name }),
+          display_link_if_authorized(_("Export"), hash_for_export_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer))
+        ) %>
       </td>
     </tr>
   <% end %>

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

@@ -5,7 +5,7 @@
         "organization": current_organization,
         "location": current_location,
         "applications": @applications,
-        "loadParameterSelectionUrl": ui_acd_app_path("__id__"),
+        "loadAppDefinitionUrl": ui_acd_app_path("__id__"),
         "loadForemanDataUrl": ui_acd_fdata_path("__id__"),
       }
     else
@@ -13,13 +13,13 @@
         "mode": "editInstance",
         "organization": current_organization,
         "location": current_location,
+        "loadAppDefinitionUrl": ui_acd_app_path("__id__"),
         "loadForemanDataUrl": ui_acd_fdata_path("__id__"),
         "appDefinition": {
           "id": @app_instance.app_definition.id,
           "name": @app_instance.app_definition.name,
-          "hostgroup_id": @app_instance.app_definition.hostgroup_id,
         },
-        "parameters": JSON.parse(@app_instance.parameters),
+        "hosts": JSON.parse(@app_instance.hosts),
       }
     end
 %>
@@ -35,8 +35,8 @@
       <%= text_f f, :name %>
       <%= text_f f, :description %>
 
-      <div id='param-selection'></div>
-        <%=  mount_react_component('ParameterSelection', "#param-selection", json.to_json) %>
+      <div id='app_instance'></div>
+        <%=  mount_react_component('ApplicationInstance', "#app_instance", json.to_json) %>
       </div>
     </div>
   </div>

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

@@ -0,0 +1,19 @@
+<% title _("Deploy Application Instance #{@app_instance}") %>
+
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :foreman_acd %>
+<% end %>
+<% content_for(:stylesheets) do %>
+  <%= webpacked_plugins_css_for :foreman_acd %>
+<% end %>
+
+<%
+  json = {
+    "mode": 'liveReport',
+    "hosts": @deploy_hosts
+  }
+%>
+
+<div id='deploy'></div>
+  <%=  mount_react_component('ApplicationInstanceReport', "#deploy", json.to_json) %>
+</div

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

@@ -15,11 +15,12 @@
       <td><%= app_instance.app_definition %></td>
       <td><%= app_instance.description %></td>
       <td>
-          <%= action_buttons(display_delete_if_authorized(hash_for_app_instance_path(:id => app_instance).merge(:auth_object => app_instance, :authorizer => authorizer),
-                                                          :data => { 'confirm': _('Delete %s?') % app_instance.name }),
-                             display_link_if_authorized(_("Deploy"), hash_for_deploy_app_instance_path(:id => app_instance), :method => :post,
-                                                        :title => _("Deploy the application #{app_instance}"))
-                            ) %>
+        <%= action_buttons(display_link_if_authorized(_("Deploy"), hash_for_deploy_app_instance_path(:id => app_instance), :method => :post,
+                                                        :title => _("Deploy application #{app_instance}")),
+                           display_link_if_authorized(_("Report"), hash_for_report_app_instance_path(:id => app_instance), :method => :get,
+                                                        :title => _("Show last deployment report for application #{app_instance}")),
+                           display_delete_if_authorized(hash_for_app_instance_path(:id => app_instance).merge(:auth_object => app_instance, :authorizer => authorizer),
+                                                          :data => { 'confirm': _('Delete %s?') % app_instance.name })) %>
       </td>
     </tr>
   <% end %>

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

@@ -0,0 +1,19 @@
+<% title _("Deployment Report for Application Instance #{@app_instance}") %>
+
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :foreman_acd %>
+<% end %>
+<% content_for(:stylesheets) do %>
+  <%= webpacked_plugins_css_for :foreman_acd %>
+<% end %>
+
+<%
+  json = {
+    "mode": 'lastReport',
+    "hosts": @report_hosts
+  }
+%>
+
+<div id='report'></div>
+  <%=  mount_react_component('ApplicationInstanceReport', "#report", json.to_json) %>
+</div

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

@@ -2,4 +2,4 @@
 
 object @app_definition
 
-attributes :id, :name, :description, :hostgroup_id, :parameters, :created_at, :updated_at
+attributes :id, :name, :description, :services, :created_at, :updated_at

data/config/routes.rb

@@ -5,7 +5,13 @@ Rails.application.routes.draw do
     resources :app_definitions, :controller => 'foreman_acd/app_definitions' do
       collection do
         get 'auto_complete_search'
+        get 'import'
       end
+
+      member do
+        get 'export'
+      end
+
     end
 
     resources :app_instances, :controller => 'foreman_acd/app_instances' do
@@ -15,6 +21,7 @@ Rails.application.routes.draw do
 
       member do
         post 'deploy'
+        get 'report'
       end
     end
 

data/db/migrate/20190610202252_create_app_definitions.rb

@@ -6,11 +6,9 @@ class CreateAppDefinitions < ActiveRecord::Migration[5.2]
     create_table :app_definitions do |t|
       t.string :name, :default => '', :null => false, :limit => 255, :unique => true
       t.text :description
-      t.column :hostgroup_id, :integer
-      t.text :parameters
+      t.text :services
       t.timestamps :null => true
     end
-    add_foreign_key :app_definitions, :hostgroups
   end
 
   def down