foreman_ovirt 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4461676fe7e225e1b5b6292b1fb665428b5cf0a98bf0aef7bf0b5fc1409cb5ef
-  data.tar.gz: da810148b9e06cef827731d734e4ac35f5ae4f782b41938f10d7e4a0a303f529
+  metadata.gz: 265b540a1760c3b80a0ada6c75748d6d70b01d58cfa769e45ddb320fac93f5c5
+  data.tar.gz: c7faf208698abeac35635409c83d14d87e7f0c40cdf8854c1456ec0750bcff04
 SHA512:
-  metadata.gz: 6da732ddbc996884be040adf7caeb7828ff8244cefd10e669c1aef5fc9dda17492643471ff7f9ae094a95557df9aef8dccf11ea492bfe15246b44d9d2db08524
-  data.tar.gz: 5a5f030508fa5027c6234a1ff0cd3bb100ab0308da5909a27eb4dbd72230bdbc477915de603e7a2b67ac51f0e17ea87bedb1b334ebdbb33ad20f1c919780714c
+  metadata.gz: ad89324d644b50989e6f8817b4368b4daee16a2caae9cfdc8012fdca7668dd27a9eeac95d015d712837c2f49544efa22e6fbd3ca2a47d0b52593705ab775b82f
+  data.tar.gz: 8aa6f8fb851acb66cd4163b02422cd3317e0d77e3ec6c0441fb39c785e1b3ebb208d90dc174676bbffaa33d2ba572818f5b7d0f67ec661b3bfdd6ef76fc95450

data/Rakefile

@@ -1,26 +1,11 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ForemanOvirt'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 
 Bundler::GemHelper.install_tasks
 

data/app/assets/javascripts/foreman_ovirt/ovirt.js

@@ -25,8 +25,8 @@ function templateSelected(item) {
     url,
     data: `template_id=${template}`,
     success(result) {
-      // As Instance Type values will take precence over templates values,
-      // we don't update memory/cores values if  instance type is already selected
+      // As Instance Type values will take precedence over template values,
+      // we don't update memory/cores values if an instance type is already selected.
       if (!$('#host_compute_attributes_instance_type').val()) {
         updateCoresAndSockets(result);
         setMemoryInputProps({ value: result.memory });
@@ -61,6 +61,11 @@ function templateSelected(item) {
 function instanceTypeSelected(item) {
   const instanceType = $(item).val();
 
+  // Ignore empty instance type values. Select2 can fire change on init.
+  if (!instanceType) {
+    return;
+  }
+
   if (!item.disabled) {
     const url = $(item).attr('data-url');
 
@@ -138,6 +143,10 @@ function addVolume({
     .hide();
 }
 
+// Update the memory FormField props and the hidden input value.
+// Memory input component keeps its own internal state on mount, so changing
+// reactProps alone may not update the hidden input used for form submission.
+// To be safe we set reactProps and also update the hidden input directly.
 function setMemoryInputProps(props) {
   const newProps = { ...props };
 
@@ -145,13 +154,32 @@ function setMemoryInputProps(props) {
     newProps.value = parseInt(newProps.value, 10);
   }
 
-  const memoryInputElement = getComponentByWrapperId('memory-input');
-  memoryInputElement.reactProps = {
-    ...memoryInputElement.reactProps,
-    ...newProps,
-  };
+  const wrapper = document.getElementById('memory-input');
+  if (!wrapper) return;
+
+  const element = wrapper.getElementsByTagName('foreman-react-component')[0];
+  if (element) {
+    element.reactProps = {
+      ...element.reactProps,
+      ...newProps,
+    };
+  }
+
+  // Also set the hidden input directly because the memory component keeps
+  // its own state and may not apply prop updates immediately.
+  if (newProps.value !== undefined) {
+    const hiddenInput = wrapper.querySelector('input[type="hidden"]');
+    if (hiddenInput) hiddenInput.value = newProps.value;
+  }
+
+  if (newProps.disabled !== undefined) {
+    const hiddenInput = wrapper.querySelector('input[type="hidden"]');
+    if (hiddenInput) hiddenInput.disabled = newProps.disabled;
+  }
 }
 
+// Update cores and sockets FormField props from AJAX result.
+// These are simple numeric fields so updating reactProps is sufficient.
 function updateCoresAndSockets(result) {
   const coresInputElement = getComponentByWrapperId('cores-input');
   coresInputElement.reactProps = {
@@ -202,6 +230,7 @@ function bootableRadio(item) {
     $(item).prop('checked', true);
   }
 }
+
 function clusterSelected(item) {
   const cluster = $(item).val();
   const url = $(item).data('url');
@@ -258,4 +287,4 @@ function vnicSelected(item) {
     );
     networkSelect.val(networkObj.id).trigger('change');
   }
-}
+}

data/app/controllers/concerns/foreman_ovirt/api_compute_resources_controller_extension.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ForemanOvirt
+  module ApiComputeResourcesControllerExtension
+    extend ActiveSupport::Concern
+
+    included do
+      # rubocop:disable Rails/LexicallyScopedActionFilter
+      before_action :convert_datacenter_to_uuid, only: %i[create update]
+      # rubocop:enable Rails/LexicallyScopedActionFilter
+    end
+
+    private
+
+    def convert_datacenter_to_uuid
+      datacenter = params[:compute_resource][:datacenter]
+      return if datacenter.blank? || Foreman.is_uuid?(datacenter)
+
+      case params[:action]
+      when 'create'
+        return unless compute_resource_params[:provider]&.downcase == 'ovirt'
+        @compute_resource = ComputeResource.new_provider(compute_resource_params.except(:datacenter))
+      when 'update'
+        return unless @compute_resource.is_a?(ForemanOvirt::Ovirt)
+      else
+        Rails.logger.error("Convert datacenter to UUID should not be called for action #{params[:action]}")
+        return
+      end
+
+      uuid = change_datacenter_to_uuid(datacenter)
+      params[:compute_resource][:datacenter] = uuid if uuid.present?
+    rescue Foreman::Exception => e
+      render_exception(e, status: :unprocessable_entity)
+      false
+    end
+
+    def change_datacenter_to_uuid(datacenter)
+      @compute_resource.test_connection
+      @compute_resource.get_datacenter_uuid(datacenter)
+    end
+  end
+end

data/app/controllers/concerns/foreman_ovirt/compute_resources_vms_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOvirt
   module ComputeResourcesVmsController
     extend ActiveSupport::Concern
@@ -19,7 +21,7 @@ module ForemanOvirt
               render partial: "compute_resources_vms/index/#{@compute_resource.provider.downcase}_json"
             else
               render json: _('JSON VM listing is not supported for this compute resource.'),
-                     status: :not_implemented
+                status: :not_implemented
             end
           end
         end

data/app/controllers/concerns/foreman_ovirt/parameters_extension.rb

@@ -23,11 +23,11 @@ module ForemanOvirt
         compute_resource_params_filter_without_ovirt.tap do |filter|
           # Now, add the oVirt specific parameters to the existing filter.
           filter.permit :datacenter,
-                        :ovirt_quota,
-                        :keyboard_layout,
-                        :use_v4,
-                        :public_key,
-                        :uuid
+            :ovirt_quota,
+            :keyboard_layout,
+            :use_v4,
+            :public_key,
+            :uuid
         end
       end
     end

data/app/controllers/foreman_ovirt/concerns/compute_resources_controller_extensions.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
 module ForemanOvirt
   module Concerns
     module ComputeResourcesControllerExtensions
       extend ActiveSupport::Concern
 
       prepended do
-        before_action :change_datacenter_to_uuid, only: [:create, :update]
+        # rubocop:disable Rails/LexicallyScopedActionFilter
+        before_action :change_datacenter_to_uuid, only: %i[create update]
+        # rubocop:enable Rails/LexicallyScopedActionFilter
         rescue_from ::ProxyAPI::Ovirt::Unauthorized, with: :render_ovirt_unauthorized_error
       end
 
@@ -38,7 +42,11 @@ module ForemanOvirt
       private
 
       def change_datacenter_to_uuid
-        return unless params[:compute_resource] && params[:compute_resource][:provider] == 'Ovirt' && params[:compute_resource][:datacenter]
+        unless params[:compute_resource] &&
+               params[:compute_resource][:provider] == 'Ovirt' &&
+               params[:compute_resource][:datacenter]
+          return
+        end
         proxy = find_resource(params[:id]) if params[:id].present?
         proxy ||= ::ProxyAPI::Ovirt.new(
           url: params[:compute_resource][:url],
@@ -48,12 +56,13 @@ module ForemanOvirt
         uuid = proxy.datacenter_uuid_by_name(params[:compute_resource][:datacenter])
         params[:compute_resource][:datacenter] = uuid
       rescue ::ProxyAPI::Ovirt::Unauthorized
+        # Do nothing, allow the process to continue or fail elsewhere
       rescue Foreman::Exception => e
         render_error e.message, status: :not_found
       end
 
       def render_ovirt_unauthorized_error
-        render_error "401 Unauthorized", status: :unauthorized
+        render_error '401 Unauthorized', status: :unauthorized
       end
     end
   end

data/app/helpers/ovirt_compute_resource_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OvirtComputeResourceHelper
   # Really counting vms is as expensive as loading them all, especially when
   # a filter is in place. So we create a fake count to get table pagination to work.
@@ -6,21 +8,33 @@ module OvirtComputeResourceHelper
   end
 
   def ovirt_storage_domains_for_select(compute_resource)
-    compute_resource.storage_domains.map { |sd| OpenStruct.new({ id: sd.id, label: "#{sd.name} (" + _("Available") + ": #{sd.available.to_i / 1.gigabyte} GiB, " + _("Used") + ": #{sd.used.to_i / 1.gigabyte} GiB)" }) }
+    compute_resource.storage_domains.map do |sd|
+      avail = sd.available.to_i / 1.gigabyte
+      used = sd.used.to_i / 1.gigabyte
+      OpenStruct.new({ id: sd.id,
+                       label: "#{sd.name} (" + _('Available') + ": #{avail} GiB, " + _('Used') + ": #{used} GiB)" })
+    end
   end
 
   def ovirt_vms_data
     data = @vms.map do |vm|
       [
-        link_to_if_authorized(html_escape(vm.name), hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.id).merge(:auth_object => @compute_resource, :auth_action => 'view', :authorizer => authorizer)),
+        link_to_if_authorized(html_escape(vm.name),
+          hash_for_compute_resource_vm_path(compute_resource_id: @compute_resource, id: vm.id).merge(
+            auth_object: @compute_resource, auth_action: 'view', authorizer: authorizer
+          )),
         vm.cores,
         number_to_human_size(vm.memory),
         "<span #{vm_power_class(vm.ready?)}>#{vm_state(vm)}</span>",
         action_buttons(vm_power_action(vm, authorizer),
           vm_import_action(vm), vm_associate_link(vm),
-          display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.id).merge(:auth_object => @compute_resource, :authorizer => authorizer))),
+          display_delete_if_authorized(
+            hash_for_compute_resource_vm_path(compute_resource_id: @compute_resource, id: vm.id).merge(
+              auth_object: @compute_resource, authorizer: authorizer
+            )
+          )),
       ]
     end
-    JSON.fast_generate(data).html_safe
+    JSON.fast_generate(data).html_safe # rubocop:disable Rails/OutputSafety
   end
 end

data/app/models/concerns/fog_extensions/ovirt/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FogExtensions
   module Ovirt
     module Server
@@ -22,7 +24,7 @@ module FogExtensions
       end
 
       def poweroff
-        service.vm_action(:id => id, :action => :shutdown)
+        service.vm_action(id: id, action: :shutdown)
       end
 
       def reset
@@ -30,12 +32,19 @@ module FogExtensions
       end
 
       def vm_description
-        _("%{cores} Cores and %{memory} memory") % {:cores => cores, :memory => number_to_human_size(memory.to_i)}
+        format(
+          _('%<cores>s Cores and %<memory>s memory'), cores: cores, memory: number_to_human_size(memory.to_i)
+        )
       end
 
       def select_nic(fog_nics, nic)
-        nic_network = @service.list_networks(@attributes[:cluster]).detect { |n| n.name == nic.compute_attributes['network'] }.try(:id) || nic.compute_attributes['network']
-        fog_nics.detect { |fn| fn.network == nic_network } # grab any nic on the same network
+        nic_network = @service.list_networks(@attributes[:cluster]).detect do |n|
+          n.name == nic.compute_attributes['network']
+        end.try(:id) || nic.compute_attributes['network']
+        # grab any nic on the same network
+        fog_nics.detect do |fn|
+          fn.network == nic_network
+        end
       end
     end
   end

data/app/models/concerns/fog_extensions/ovirt/template.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module FogExtensions
   module Ovirt
     module Template
       def full_name
-        version = full_version.present? ? " (#{full_version})" : ""
+        version = full_version.present? ? " (#{full_version})" : ''
         "#{name}#{version}"
       end
 

data/app/models/concerns/fog_extensions/ovirt/volume.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module FogExtensions
   module Ovirt
     module Volume
       extend ActiveSupport::Concern
-      def as_json(options = { })
+      def as_json(options = {})
         size_gb
         super options
       end