foreman_fog_proxmox 0.12.2 → 0.13.3

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_volume.js

@@ -0,0 +1,39 @@
+// Copyright 2018 Tristan Robert
+
+// This file is part of ForemanFogProxmox.
+
+// ForemanFogProxmox is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// ForemanFogProxmox is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+function getIndex(item) {
+  var index_id = $(item).attr('id');
+  var pattern = /(host_compute_attributes_volumes_attributes_||compute_attribute_vm_attrs_volumes_attributes_)(\d+)[_](.*)/i;
+  pattern_a = pattern.exec(index_id);
+  var index = pattern_a[2];
+  return index;
+}
+
+function volumeId(type,index){
+  var volume_id = '#volume_' + type + '_' + index;
+  return volume_id;
+}
+
+function enableField(item) {
+  $(item).show();
+  $(item).removeAttr('disabled');
+}
+
+function disableField(item) {  
+  $(item).hide();
+  $(item).attr('disabled','disabled');
+}

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cdrom.js

@@ -0,0 +1,63 @@
+// Copyright 2018 Tristan Robert
+
+// This file is part of ForemanFogProxmox.
+
+// ForemanFogProxmox is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// ForemanFogProxmox is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+function cdromSelected(item) {
+  var selected = $(item).val();
+  var index = getIndex(item);
+  var cdrom_image_form_id = '#cdrom_image_form_' + index;
+
+  switch (selected) {
+    case 'none':
+      initCdromStorage(index);
+      initCdromOptions(index,'volid');
+      disableField(cdrom_image_form_id);
+      break;
+    case 'cdrom':
+      initCdromStorage(index);
+      initCdromOptions(index,'volid');
+      disableField(cdrom_image_form_id);
+      break;
+    case 'image':
+      initCdromStorage(index);
+      initCdromOptions(index,'volid');
+      enableField(cdrom_image_form_id);
+      break;
+    default:
+      break;
+  }
+  return false;
+}
+
+function initCdromStorage(index) {
+  var select = '#host_compute_attributes_volumes_attributes_' + index + '_storage';
+  $(select + ' option:selected').prop('selected', false);
+  $(select).val('');
+}
+
+function initCdromOptions(index, name) {
+  var select = '#host_compute_attributes_volumes_attributes_' + index + '_' + name;
+  $(select).empty();
+  $(select).append($("<option></option>").val('').text(''));
+  $(select).val('');
+}
+
+function storageIsoSelected(item) {
+  var index = getIndex(item);
+  var storage = $(item).val();
+  var node_id = $('#host_compute_attributes_node_id').val();
+  updateOptions('isos', 'compute_attributes_volumes_attributes_' + index , 'volid', undefined, undefined, 'volid', node_id, storage);
+}

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cloudinit.js

@@ -0,0 +1,25 @@
+// Copyright 2018 Tristan Robert
+
+// This file is part of ForemanFogProxmox.
+
+// ForemanFogProxmox is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// ForemanFogProxmox is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+function cloudinitControllerSelected(item) {
+  var controller = $(item).val();
+  var index = getIndex(item);
+  var max = computeControllerMaxDevice(controller);
+  var device_selector = 'host_compute_attributes_volumes_attributes_' + index + 'device';
+  $(device_selector).attr('data-soft-max', max);
+  tfm.numFields.initAll();
+}

data/app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb

@@ -27,7 +27,7 @@ module ForemanFogProxmox
           def compute_resource_params_filter
             super.tap do |filter|
               filter.permit :ssl_verify_peer,
-                            :ssl_certs, :disable_proxy, :cr_id, :renew
+                            :ssl_certs, :disable_proxy, :auth_method, :token_id, :token
             end
           end
 

data/app/controllers/foreman_fog_proxmox/compute_resources_controller.rb

@@ -19,59 +19,57 @@
 
 module ForemanFogProxmox
   class ComputeResourcesController < ::ApplicationController
-    before_action :load_compute_resource
-
-    # GET foreman_fog_proxmox/isos/:node_id/:storage
-    def isos_by_node_and_storage
-      volumes = @compute_resource.images_by_storage(params[:node_id], params[:storage], 'iso')
+    # GET foreman_fog_proxmox/isos/:compute_resource_id/:node_id/:storage
+    def isos_by_id_and_node_and_storage
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'iso')
       respond_to do |format|
         format.json { render :json => volumes }
       end
     end
 
-    # GET foreman_fog_proxmox/ostemplates/:node_id/:storage
-    def ostemplates_by_node_and_storage
-      volumes = @compute_resource.images_by_storage(params[:node_id], params[:storage], 'vztmpl')
+    # GET foreman_fog_proxmox/ostemplates/:compute_resource_id/:node_id/:storage
+    def ostemplates_by_id_and_node_and_storage
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'vztmpl')
       respond_to do |format|
         format.json { render :json => volumes }
       end
     end
 
-    # GET foreman_fog_proxmox/isos/:node_id
-    def isos_by_node
-      volumes = @compute_resource.images_by_storage(params[:node_id], params[:storage], 'iso')
+    # GET foreman_fog_proxmox/isos/:compute_resource_id/:node_id
+    def isos_by_id_and_node
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'iso')
       respond_to do |format|
         format.json { render :json => volumes }
       end
     end
 
-    # GET foreman_fog_proxmox/ostemplates/:node_id
-    def ostemplates_by_node
-      storages = @compute_resource.storages(params[:node_id], 'vztmpl')
+    # GET foreman_fog_proxmox/ostemplates/:compute_resource_id/:node_id
+    def ostemplates_by_id_and_node
+      storages = load_compute_resource(params[:compute_resource_id]).storages(params[:node_id], 'vztmpl')
       respond_to do |format|
         format.json { render :json => storages }
       end
     end
 
-    # GET foreman_fog_proxmox/storages/:node_id
-    def storages_by_node
-      storages = @compute_resource.storages(params[:node_id])
+    # GET foreman_fog_proxmox/storages/:compute_resource_id/:node_id
+    def storages_by_id_and_node
+      storages = load_compute_resource(params[:compute_resource_id]).storages(params[:node_id])
       respond_to do |format|
         format.json { render :json => storages }
       end
     end
 
-    # GET foreman_fog_proxmox/isostorages/:node_id
-    def iso_storages_by_node
-      storages = @compute_resource.storages(params[:node_id], 'iso')
+    # GET foreman_fog_proxmox/isostorages/:compute_resource_id/:node_id
+    def iso_storages_by_id_and_node
+      storages = load_compute_resource(params[:compute_resource_id]).storages(params[:node_id], 'iso')
       respond_to do |format|
         format.json { render :json => storages }
       end
     end
 
-    # GET foreman_fog_proxmox/bridges/:node_id
-    def bridges_by_node
-      bridges = @compute_resource.bridges(params[:node_id])
+    # GET foreman_fog_proxmox/bridges/:compute_resource_id/:node_id
+    def bridges_by_id_and_node
+      bridges = load_compute_resource(params[:compute_resource_id]).bridges(params[:node_id])
       respond_to do |format|
         format.json { render :json => bridges }
       end
@@ -79,8 +77,8 @@ module ForemanFogProxmox
 
     private
 
-    def load_compute_resource
-      @compute_resource = ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
+    def load_compute_resource(compute_resource_id)
+      ComputeResource.find(compute_resource_id)
     end
   end
 end

data/app/helpers/proxmox_compute_controllers_helper.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module ProxmoxComputeControllersHelper
+  def proxmox_controllers_map
+    proxmox_controllers_cloudinit_map << ForemanFogProxmox::OptionsSelect.new(name: 'VirtIO Block', id: 'virtio', range: 15)
+  end
+
+  def proxmox_controllers_cloudinit_map
+    [ForemanFogProxmox::OptionsSelect.new(id: 'ide', name: 'IDE', range: 3),
+     ForemanFogProxmox::OptionsSelect.new(id: 'sata', name: 'SATA', range: 5),
+     ForemanFogProxmox::OptionsSelect.new(id: 'scsi', name: 'SCSI', range: 13)]
+  end
+
+  def proxmox_scsi_controllers_map
+    [OpenStruct.new(id: 'lsi', name: 'LSI 53C895A (Default)'),
+     OpenStruct.new(id: 'lsi53c810', name: 'LSI 53C810'),
+     OpenStruct.new(id: 'virtio-scsi-pci', name: 'VirtIO SCSI'),
+     OpenStruct.new(id: 'virtio-scsi-single', name: 'VirtIO SCSI Single'),
+     OpenStruct.new(id: 'megasas', name: 'MegaRAID SAS 8708EM2'),
+     OpenStruct.new(id: 'pvscsi', name: 'VMware PVSCSI')]
+  end
+end

data/app/helpers/proxmox_compute_resources_helper.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module ProxmoxComputeResourcesHelper
+  def user_token_expiration_date(compute_resource)
+    expire = compute_resource.current_user_token_expire
+  rescue ::Foreman::Exception => e
+    return 'Has already expired. Please edit the compute resource to set a new valid one.' if e.message == 'User token expired'
+  rescue StandardError => e
+    logger.warn(format(_('failed to get identity client version: %<e>s'), e: e))
+    raise e
+  else
+    return 'Never' if expire == 0
+
+    Time.at(expire).utc
+  end
+
+  def cluster_nodes(compute_resource)
+    nodes = compute_resource.nodes ? compute_resource.nodes.collect(&:node) : []
+  rescue ::Foreman::Exception => e
+    return [] if e.message == 'User token expired'
+  rescue StandardError => e
+    logger.warn(format(_('failed to get cluster nodes: %<e>s'), e: e))
+    raise e
+  else
+    nodes
+  end
+
+  def proxmox_auth_methods_map
+    [OpenStruct.new(id: 'access_ticket', name: '(Default) Access ticket'),
+     OpenStruct.new(id: 'user_token', name: 'User token')]
+  end
+end

data/app/helpers/proxmox_compute_selectors_helper.rb

@@ -40,22 +40,6 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'unmanaged', name: 'Unmanaged')]
   end
 
-  def proxmox_controllers_map
-    [ForemanFogProxmox::OptionsSelect.new(id: 'ide', name: 'IDE', range: 3),
-     ForemanFogProxmox::OptionsSelect.new(id: 'sata', name: 'SATA', range: 5),
-     ForemanFogProxmox::OptionsSelect.new(id: 'scsi', name: 'SCSI', range: 13),
-     ForemanFogProxmox::OptionsSelect.new(name: 'VirtIO Block', id: 'virtio', range: 15)]
-  end
-
-  def proxmox_scsi_controllers_map
-    [OpenStruct.new(id: 'lsi', name: 'LSI 53C895A (Default)'),
-     OpenStruct.new(id: 'lsi53c810', name: 'LSI 53C810'),
-     OpenStruct.new(id: 'virtio-scsi-pci', name: 'VirtIO SCSI'),
-     OpenStruct.new(id: 'virtio-scsi-single', name: 'VirtIO SCSI Single'),
-     OpenStruct.new(id: 'megasas', name: 'MegaRAID SAS 8708EM2'),
-     OpenStruct.new(id: 'pvscsi', name: 'VMware PVSCSI')]
-  end
-
   def proxmox_operating_systems_map
     [OpenStruct.new(id: 'other', name: 'Unspecified OS'),
      OpenStruct.new(id: 'wxp', name: 'Microsoft Windows XP'),
@@ -84,34 +68,6 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'serial3', name: 'Serial terminal 3')]
   end
 
-  def proxmox_keyboards_map
-    [OpenStruct.new(id: 'de', name: 'Deutsch'),
-     OpenStruct.new(id: 'de-ch', name: 'Deutsch (Swiss)'),
-     OpenStruct.new(id: 'da', name: 'Danish'),
-     OpenStruct.new(id: 'en-gb', name: 'English (UK)'),
-     OpenStruct.new(id: 'en-us', name: 'English (US)'),
-     OpenStruct.new(id: 'es', name: 'Spanish'),
-     OpenStruct.new(id: 'fi', name: 'Finnish'),
-     OpenStruct.new(id: 'fr', name: 'French'),
-     OpenStruct.new(id: 'fr-be', name: 'French (Belgium)'),
-     OpenStruct.new(id: 'fr-ca', name: 'French (Canadian)'),
-     OpenStruct.new(id: 'fr-ch', name: 'French (Swiss)'),
-     OpenStruct.new(id: 'hu', name: 'Hungarian'),
-     OpenStruct.new(id: 'is', name: 'Israelian'),
-     OpenStruct.new(id: 'it', name: 'Italian'),
-     OpenStruct.new(id: 'ja', name: 'Japanese'),
-     OpenStruct.new(id: 'lt', name: 'Lituanian'),
-     OpenStruct.new(id: 'mk', name: ''),
-     OpenStruct.new(id: 'nl', name: 'Nederland'),
-     OpenStruct.new(id: 'no', name: 'Norway'),
-     OpenStruct.new(id: 'pl', name: 'Polish'),
-     OpenStruct.new(id: 'pt', name: 'Portugese'),
-     OpenStruct.new(id: 'pt-br', name: 'Portugese (Brasilian)'),
-     OpenStruct.new(id: 'sv', name: 'Sv'),
-     OpenStruct.new(id: 'sl', name: 'Slovakian'),
-     OpenStruct.new(id: 'tr', name: 'Tr')]
-  end
-
   def get_controller(id)
     proxmox_controllers_map.find { |controller| controller.id == id }
   end
@@ -161,6 +117,12 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'host', name: 'host')]
   end
 
+  def proxmox_cpu_flags_map
+    [OpenStruct.new(id: '-1', name: 'Off'),
+     OpenStruct.new(id: '0', name: 'Default'),
+     OpenStruct.new(id: '+1', name: 'On')]
+  end
+
   def proxmox_scsihw_map
     [OpenStruct.new(id: 'lsi', name: 'lsi'),
      OpenStruct.new(id: 'lsi53c810', name: 'lsi53c810'),

data/app/helpers/proxmox_form_helper.rb

@@ -29,8 +29,7 @@ module ProxmoxFormHelper
         options[:value] = value if value.present?
         addClass options, 'form-control'
         pass = f.password_field(attr, options) +
-               content_tag(:span, '', class: 'glyphicon glyphicon-warning-sign input-addon',
-                                      title: 'Caps lock ON', style: 'display:none')
+               tag(:span, '', class: 'glyphicon glyphicon-warning-sign input-addon', title: 'Caps lock ON', style: 'display:none')
         if unset_button
           button = link_to_function(icon_text('edit', '', :kind => 'pficon'), 'toggle_input_group(this)', :id => 'disable-pass-btn', :class => 'btn btn-default', :title => _('Change the password'))
           input_group(pass, input_group_btn(button))
@@ -54,7 +53,7 @@ module ProxmoxFormHelper
     options[:form_builder_local] ||= :f
     options[:form_builder_attrs] ||= {}
 
-    content_tag(:div, :class => "#{options[:type]}_#{association}_fields_template form_template ", :style => 'display: none;') do
+    content_tag(:div, :class => "#{options[:type]}_#{association}_fields_template form_template", :style => 'display: none;') do
       form_builder.fields_for(association, options[:object], :child_index => "new_#{options[:type]}_#{association}") do |f|
         render(:partial => options[:partial], :layout => options[:layout],
                :locals => { options[:form_builder_local] => f }.merge(options[:form_builder_attrs]))
@@ -65,6 +64,15 @@ module ProxmoxFormHelper
   def add_child_link_typed(name, association, type, opts = {})
     opts[:class] = [opts[:class], 'add_nested_fields btn btn-primary'].compact.join(' ')
     opts[:"data-association"] = (type + '_' + association.to_s).to_sym
-    link_to_function(name.to_s, 'add_child_node(this);tfm.numFields.initAll();', opts)
+    hide = ''
+    hide += '$("[data-association=' + type + '_volumes]").hide();' unless ['hard_disk', 'mp'].include?(type)
+    link_to_function(name.to_s, 'add_child_node(this);tfm.numFields.initAll();' + hide, opts)
+  end
+
+  def remove_child_link_typed(name, f, type, opts = {})
+    opts[:class] = [opts[:class], 'remove_nested_fields'].compact.join(' ')
+    hide = ''
+    hide += '$("[data-association=' + type + '_volumes]").show();' unless ['hard_disk', 'mp'].include?(type)
+    f.hidden_field(opts[:method] || :_destroy) + link_to_function(name, 'remove_child_node(this);' + hide, opts)
   end
 end

data/app/{models/concerns/fog_extensions/proxmox/volume.rb → helpers/proxmox_storages_helper.rb}

@@ -17,13 +17,10 @@
 # You should have received a copy of the GNU General Public License
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-module FogExtensions
-  module Proxmox
-    module Volume
-      extend ActiveSupport::Concern
-      def templated?
-        volid ? volid.match(/^([\w-]+)[:]base-(\d+)-disk-(\d+)/) : false
-      end
-    end
+module ProxmoxStoragesHelper
+  def proxmox_storages_types_map
+    [OpenStruct.new(id: 'hard_disk', name: 'Hard disk'),
+     OpenStruct.new(id: 'cdrom', name: 'CD-ROM'),
+     OpenStruct.new(id: 'cloud_init', name: 'Cloud-init')]
   end
 end