Fixes #2314 - fine grain for RAM selectors

(cherry picked from commit eabbbeb)

app/assets/javascripts/application.js

@@ -2,6 +2,7 @@
 //= require turbolinks
 //= require i18n
 //= require jquery.ui.autocomplete
+//= require jquery.ui.spinner
 //= require scoped_search
 //= require bootstrap
 //= require multi-select

app/assets/javascripts/host_edit.js

@@ -76,6 +76,7 @@ function computeResourceSelected(item){
         activate_select2('#compute_resource');
         if ($('#compute_resource').find('.alert-danger').length > 0) $('#compute_resource_tab a').addClass('tab-error');
         update_capabilities($('#capabilities').val());
+        tfm.initByteSpinner();
       }
     })
   }

app/assets/stylesheets/application.scss

@@ -3,6 +3,8 @@
 @import "jquery.ui.menu";
 //we need to import all the above because we are using jquery-ui-rails and it uses sprockets require instaed of sass import.
 @import "jquery.ui.autocomplete";
+@import "jquery.ui.spinner";
+@import "jquery.ui.spinner_custom";
 @import "../../../vendor/assets/stylesheets/vendor";
 @import "scoped_search";
 @import "multi-select";

app/assets/stylesheets/jquery.ui.spinner_custom.scss

@@ -0,0 +1,21 @@
+span.ui-spinner {
+  width: 100%;
+  border: none;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+
+input.ui-spinner-input {
+  margin: 0;
+}
+
+.ui-spinner a.ui-spinner-button {
+  border-radius: 0;
+  border: 1px solid #bababa;
+  background-color: #eee;
+  &.ui-spinner-up {
+    border-bottom: none;
+  }
+}

app/helpers/compute_resources_helper.rb

@@ -34,11 +34,6 @@ def vm_pause_action(vm, authorizer = nil)
     display_link_if_authorized pause_action, opts, html.merge(:method => :put)
   end
 
-  def memory_options(max_memory)
-    opts = [0.25, 0.5, 0.75, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32]
-    opts.map{|n| [number_to_human_size(n*Foreman::SIZE[:giga]), (n*Foreman::SIZE[:giga]).to_i] unless n > (max_memory / Foreman::SIZE[:giga])}.compact
-  end
-
   def password_placeholder(obj, attr = nil)
     pass = obj.read_attribute(attr).present? || obj.read_attribute(:password_hash).present?
     pass ? "********" : ''

app/helpers/form_helper.rb

@@ -192,6 +192,18 @@ def autocomplete_f(f, attr, options = {})
     end
   end
 
+  def byte_size_f(f, attr, options = {})
+    options[:class] = options[:class].to_s + ' byte_spinner'
+    options[:help_inline] ||= popover('', _("When specifying custom value, add 'MB' or 'GB' at the end. Field is not case sensitive and MB is default if unspecified."))
+    options[:help_block] ||= content_tag(:span, :class => 'maximum-limit hidden') do
+      content_tag(:i, '', :class => 'pficon-warning-triangle-o') +
+      content_tag(:span, ' ' + _('Specified value is higher than recommended maximum'), :class => 'error-message')
+    end
+    options[:help_block] += f.hidden_field(attr, :class => "real-hidden-value", :id => nil)
+
+    text_f(f, attr, options)
+  end
+
   def form_to_submit_id(f)
     object = f.object.respond_to?(:to_model) ? f.object.to_model : f.object
     key = if object.present?

app/models/compute_resources/foreman/model/libvirt.rb

@@ -58,12 +58,13 @@ def max_cpu_count
       hypervisor.cpus
     end
 
-    # libvirt reports in KB
+    # returns available memory for VM in bytes
     def max_memory
-      hypervisor.memory * Foreman::SIZE[:kilo]
+      # libvirt reports in KB
+      hypervisor.memory.kilobyte
     rescue => e
       logger.debug "unable to figure out free memory, guessing instead due to:#{e}"
-      16*Foreman::SIZE[:giga]
+      16.gigabytes
     end
 
     def test_connection(options = {})
@@ -207,7 +208,7 @@ def disconnect
 
     def vm_instance_defaults
       super.merge(
-        :memory     => 768*Foreman::SIZE[:mega],
+        :memory     => 768.megabytes,
         :nics       => [new_nic],
         :volumes    => [new_volume],
         :display    => { :type     => display_type,

app/models/compute_resources/foreman/model/ovirt.rb

@@ -99,7 +99,7 @@ def max_cpu_count
     end
 
     def max_memory
-      16*Foreman::SIZE[:giga]
+      16.gigabytes
     end
 
     def ovirt_quota=(ovirt_quota_id)

app/models/compute_resources/foreman/model/vmware.rb

@@ -45,7 +45,7 @@ def max_cpu_count(cluster = nil)
     end
 
     def max_memory
-      16*Foreman::SIZE[:giga]
+      16.gigabytes
     end
 
     def datacenters

app/models/concerns/fog_extensions/libvirt/server.rb

@@ -17,11 +17,11 @@ def volumes_attributes=(attrs); end
 
       # Libvirt expect units in KB, while we use bytes
       def memory
-        attributes[:memory_size].to_i * Foreman::SIZE[:kilo]
+        attributes[:memory_size].to_i.kilobytes
       end
 
       def memory=(mem)
-        attributes[:memory_size] = mem.to_i / Foreman::SIZE[:kilo] if mem
+        attributes[:memory_size] = mem.to_i / 1.kilobyte if mem
       end
 
       def reset

app/services/fog_extensions/vsphere/mini_server.rb

@@ -10,7 +10,7 @@ def initialize(raw, path = nil, uuid = nil)
         @identity = uuid
         @cpus     = hardware.numCPU
         @corespersocket = hardware.numCoresPerSocket
-        @memory   = hardware.memoryMB * Foreman::SIZE[:mega]
+        @memory   = hardware.memoryMB.megabytes
         @state    = raw.runtime.powerState
         @path     = path
       end

app/views/compute_resources_vms/form/libvirt/_base.html.erb

@@ -1,8 +1,10 @@
+<%= javascript_tag("$(document).on('ContentLoad', tfm.initByteSpinner)"); %>
 
 <%= text_f f, :name, :label => _('Name'), :label_size => "col-md-2", :disabled => !new_host if show_vm_name? %>
+
 <%= selectable_f f, :cpus, 1..compute_resource.max_cpu_count, { }, :disabled => !new_host, :label => _('CPUs'), :label_size => "col-md-2" %>
-<%= selectable_f f, :memory, memory_options(compute_resource.max_memory), { }, :disabled => !new_host, :label => _('Memory'), :label_size => "col-md-2" %>
 
+<%= byte_size_f f, :memory, :disabled => !new_host, :label => _('Memory'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
 
 <!--TODO # Move to a helper-->
 <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>

app/views/compute_resources_vms/form/ovirt/_base.html.erb

@@ -1,3 +1,4 @@
+<%= javascript_tag("$(document).on('ContentLoad', tfm.initByteSpinner)"); %>
 <% javascript 'compute_resource' %>
 <%= text_f f, :name, :label => _('Name'), :label_size => "col-md-3" if show_vm_name? %>
 <% clusters = compute_resource.clusters %>
@@ -18,7 +19,7 @@
 <% selected_cluster ||= params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:cluster] %>
 
 <%= selectable_f f, :cores, 1..compute_resource.max_cpu_count, { }, :class => "col-md-2", :label => _('Cores'), :label_size => "col-md-2" %>
-<%= selectable_f f, :memory, memory_options(compute_resource.max_memory), { }, :class => "col-md-2", :label => _('Memory'), :label_size => "col-md-2" %>
+<%= byte_size_f f, :memory, :disabled => !new_host, :label => _('Memory'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
 
 <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
 <%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine"), :label => _('Start'), :label_size => "col-md-2" } if new_host && controller_name != "compute_attributes" %>

app/views/compute_resources_vms/index/_libvirt.html.erb

@@ -13,7 +13,7 @@
       <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.uuid).merge(:auth_object => @compute_resource, :auth_action => 'view', :authorizer => authorizer) %></td>
       <td><%= vm.cpus %></td>
       <td>
-        <%= number_to_human_size vm.memory_size*Foreman::SIZE[:kilo] %>
+        <%= number_to_human_size vm.memory_size.kilobytes %>
       </td>
       <td>
         <span <%= vm_power_class(vm.ready?) %>>

app/views/compute_resources_vms/show/_libvirt.html.erb

@@ -26,8 +26,8 @@
       </tr>
       <tr>
         <td><%= _('Memory') %></td>
-        <td><%= number_to_human_size @vm.max_memory_size*Foreman::SIZE[:kilo] %>
-          <%= "(" + _("Allocated") + ": #{number_to_human_size @vm.memory_size*Foreman::SIZE[:kilo]})" %></td>
+        <td><%= number_to_human_size @vm.max_memory_size.kilobytes %>
+          <%= "(" + _("Allocated") + ": #{number_to_human_size @vm.memory_size.kilobytes})" %></td>
       </tr>
       <tr>
         <td><%= _('Display') %></td>

lib/core_extensions.rb

@@ -144,10 +144,10 @@ def to_gb
       value, _, unit=self.match(/(\d+(\.\d+)?) ?(([KMGT]i?B?|B))$/i)[1..3]
       case unit.to_sym
       when nil, :B, :byte then (value.to_f / Foreman::SIZE[:giga])
-      when :TB, :TiB, :T, :terabyte      then (value.to_f * Foreman::SIZE[:kilo])
+      when :TB, :TiB, :T, :terabyte      then (value.to_f * 1.kilobyte)
       when :GB, :GiB, :G, :gigabyte      then value.to_f
-      when :MB, :MiB, :M, :megabyte      then (value.to_f / Foreman::SIZE[:kilo])
-      when :KB, :KiB, :K, :kilobyte, :kB then (value.to_f / Foreman::SIZE[:mega])
+      when :MB, :MiB, :M, :megabyte      then (value.to_f / 1.kilobyte)
+      when :KB, :KiB, :K, :kilobyte, :kB then (value.to_f / 1.megabyte)
       else raise "Unknown unit: #{unit.inspect}!"
       end
     rescue

lib/foreman.rb

@@ -17,6 +17,4 @@ def self.in_rake?(rake_task = nil)
       rake_task.nil? || running_rake_task.start_with?(rake_task)
     end
   end
-
-  SIZE = {:kilo => 1_024, :mega => 1_048_576, :giga => 1_073_741_824, :tera => 1_099_511_627_776}
 end

test/functional/compute_resources_vms_controller_test.rb

@@ -63,7 +63,7 @@ def setup_user(operation, type = 'compute_resources_vms')
   test "should not create compute resource when not permitted" do
     setup_user "view"
     assert_difference('@compute_resource.vms.count', 0) do
-      attrs = {:name => 'name123', :memory => 128*Foreman::SIZE[:mega], :arch => "i686"}
+      attrs = {:name => 'name123', :memory => 128.megabytes, :arch => "i686"}
       post :create, {:vm => attrs, :compute_resource_id => @compute_resource.to_param}, set_session_user
     end
     assert_response :forbidden
@@ -76,7 +76,7 @@ def test_should_create_vm(name = "new_test")
       user.roles.last.add_permissions! :view_compute_resources
     end
     assert_difference('@compute_resource.vms.count', +1) do
-      attrs = {:name => name, :memory => 128*Foreman::SIZE[:mega], :domain_type => "test", :arch => "i686"}
+      attrs = {:name => name, :memory => 128.megabytes, :domain_type => "test", :arch => "i686"}
       post :create, {:vm => attrs, :compute_resource_id => @compute_resource.to_param}, set_session_user
     end
     assert_redirected_to compute_resource_vms_path

webpack/assets/javascripts/bundle.js

@@ -7,5 +7,6 @@ require('./bundle_flot');
 require('./bundle_select2');
 require('./bundle_datatables');
 window.tfm = {
-  tools: require('./foreman_tools')
+  tools: require('./foreman_tools'),
+  initByteSpinner: require('./jquery.ui.custom_spinners').initByteSpinner
 };

webpack/assets/javascripts/jquery.ui.custom_spinners.js

@@ -0,0 +1,114 @@
+const megabyte = 1024 * 1024;
+const gigabyte = 1024 * megabyte;
+
+$(function () {
+  $.widget('ui.limitedSpinner', $.ui.spinner, {
+    options: {
+      softMaximum: 0,
+      errorTarget: null
+    },
+    validate: function () {
+      return this._validate();
+    },
+    _validate: function () {
+      if (this.options.softMaximum !== 0) {
+        this.options.errorTarget.toggle(this.value() > this.options.softMaximum);
+      }
+    },
+    _spin: function (step, event) {
+      let result = this._super(step, event);
+
+      this._validate();
+      return result;
+    }
+  });
+
+  $.widget('ui.byteSpinner', $.ui.limitedSpinner, {
+    options: {
+      step: 1,
+      min: 1,
+      incremental: false,
+      valueTarget: null
+    },
+    updateValueTarget: function () {
+      this.options.valueTarget.val(this.value());
+    },
+    _gigabyteSpin: function (step) {
+      if (step > 0) {
+        if (step % gigabyte === 0) {
+          step = gigabyte;
+        } else {
+          step = gigabyte - (this.value() % gigabyte);
+        }
+      } else if (step < 0) {
+        if (this.value() % gigabyte === 0) {
+          step = -1 * gigabyte;
+        } else {
+          step = -1 * (this.value() % gigabyte);
+        }
+      }
+      return step;
+    },
+    _megabyteSpin: function (step) {
+      const megabyteStep = step * 256 * megabyte;
+
+      if (this.value() + megabyteStep > gigabyte) {
+        step = gigabyte - this.value();
+      } else if (this.value() + megabyteStep < megabyte) {
+        step = step * (this.value() - megabyte);
+      } else if (this.value() === megabyte && step > 0) {
+        step = 255 * megabyte;
+      } else {
+        step = megabyteStep;
+      }
+      return step;
+    },
+    _spin: function (step, event) {
+      let result = null;
+
+      if ((this.value() > gigabyte && step < 0) ||
+        (this.value() >= gigabyte && step > 0)) {
+        step = this._gigabyteSpin(step);
+      } else {
+        step = this._megabyteSpin(step);
+      }
+
+      result = this._super(step, event);
+      this.updateValueTarget();
+
+      return result;
+    },
+    _parse: function (value) {
+      if (typeof value === 'string') {
+        if (value.match(/gb$/i)) {
+          return parseFloat(value) * gigabyte;
+        } else if (value.match(/mb$/i) || parseInt(value, 10) < megabyte) {
+          return parseInt(value, 10) * megabyte;
+        }
+      }
+      return value;
+    },
+    // prints value with unit, if it's multiple of gigabytes use GB, otherwise format in MB
+    _format: value =>
+      (value % gigabyte === 0) ? (value / gigabyte) + ' GB' : (value / megabyte) + ' MB'
+  });
+});
+
+export function initByteSpinner() {
+  $('input.byte_spinner').each(function () {
+    let field = $(this);
+    let errorMessage = field.closest('.form-group').find('.maximum-limit');
+    let valueTarget = field.closest('.form-group').find('.real-hidden-value');
+
+    field.byteSpinner({
+      valueTarget: valueTarget,
+      softMaximum: field.data('softMax'),
+      errorTarget: errorMessage
+    });
+
+    field.change(function () {
+      field.byteSpinner('updateValueTarget');
+      field.byteSpinner('validate');
+    });
+  });
+}