Save ram and storage of a request in gb internally (#342)

* Save ram and storage of a request in gb internally

* Fix CodeFactor

* Fix Tests

* Fix same Tests, hopefully

* Forgot Gemfile

* Add some tests for request templates and convert gb to mibi and kibi for vsphere

* Rename comments

* Modify migration

* CodeFactor ...

* Modify migration again

* Refactor os on vm edit config page

Gemfile.lock

@@ -473,4 +473,4 @@ RUBY VERSION
    ruby 2.5.0p0
 
 BUNDLED WITH
-   1.16.2
+   1.17.1

app/api/v_sphere/virtual_machine.rb

@@ -265,12 +265,12 @@ def macs
       @vm.macs
     end
 
-    private
-
     def request
       Request.accepted.find { |each| name == each.name }
     end
 
+    private
+
     def archivation_request
       ArchivationRequest.find_by_name(name)
     end

app/controllers/requests_controller.rb

@@ -160,14 +160,12 @@ def prepare_params
     return unless request_parameters
 
     request_parameters[:name] &&= replace_whitespaces(request_parameters[:name])
-    request_parameters[:ram_mb] &&= gb_to_mb(request_parameters[:ram_mb].to_i)
-    request_parameters[:storage_mb] &&= gb_to_mb(request_parameters[:storage_mb].to_i)
     request_parameters[:sudo_user_ids] &&= request_parameters[:sudo_user_ids][1..-1]
   end
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def request_params
-    params.require(:request).permit(:name, :cpu_cores, :ram_mb, :storage_mb, :operating_system,
+    params.require(:request).permit(:name, :cpu_cores, :ram_gb, :storage_gb, :operating_system,
                                     :port, :application_name, :description, :comment,
                                     :rejection_information, user_ids: [], sudo_user_ids: [])
   end

app/helpers/requests_helper.rb

@@ -5,12 +5,4 @@ module RequestsHelper
   def replace_whitespaces(name)
     name.parameterize
   end
-
-  def mb_to_gb(megabytes)
-    megabytes / 1000
-  end
-
-  def gb_to_mb(gigabytes)
-    gigabytes * 1000
-  end
 end

app/helpers/vms_helper.rb

@@ -32,8 +32,4 @@ def status_for(vm)
       'offline'
     end
   end
-
-  def request_for(vm)
-    Request.accepted.find { |each| vm.name == each.name }
-  end
 end

app/models/request.rb

@@ -13,18 +13,18 @@ class Request < ApplicationRecord
 
   MAX_NAME_LENGTH = 20
   MAX_CPU_CORES = 64
-  MAX_RAM_MB = 256_000
-  MAX_STORAGE_MB = 1_000_000
+  MAX_RAM_GB = 256
+  MAX_STORAGE_GB = 1_000
 
   enum status: %i[pending accepted rejected]
   validates :name,
             length: { maximum: MAX_NAME_LENGTH, message: 'only allows a maximum of %{count} characters' },
             format: { with: /\A[a-zA-Z1-9\-\s]+\z/, message: 'only letters and numbers allowed' },
             uniqueness: true
-  validates :cpu_cores, :ram_mb, :storage_mb, :operating_system, :description, presence: true
+  validates :cpu_cores, :ram_gb, :storage_gb, :operating_system, :description, presence: true
   validates :cpu_cores, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: MAX_CPU_CORES }
-  validates :ram_mb, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: MAX_RAM_MB }
-  validates :storage_mb, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: MAX_STORAGE_MB }
+  validates :ram_gb, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: MAX_RAM_GB }
+  validates :storage_gb, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: MAX_STORAGE_GB }
 
   def description_text(host_name)
     description  = "- VM Name: #{name}\n"
@@ -70,7 +70,7 @@ def non_sudo_user_assignments
   def create_vm
     folder = VSphere::Connection.instance.root_folder
     clusters = VSphere::Cluster.all
-    folder.create_vm(cpu_cores, ram_mb, storage_mb, name, clusters.first) if clusters.first
+    folder.create_vm(cpu_cores, gibi_to_mibi(ram_gb), gibi_to_kibi(storage_gb), name, clusters.first) if clusters.first
   end
 
   def push_to_git
@@ -115,4 +115,12 @@ def generate_puppet_name_script
   def url(host_name)
     Rails.application.routes.url_helpers.request_url self, host: host_name
   end
+
+  def gibi_to_mibi(gibi)
+    gibi * 1024
+  end
+
+  def gibi_to_kibi(gibi)
+    gibi * 1024**2
+  end
 end

app/models/request_template.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
 class RequestTemplate < ApplicationRecord
-  MAX_CPU_CORES = 64
-  MAX_RAM_GB = 256
-  MAX_STORAGE_GB = 1_000
-
   validates :name, :cpu_cores, :ram_gb, :storage_gb, :operating_system, presence: true
-  validates :cpu_cores, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: MAX_CPU_CORES }
-  validates :ram_gb, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: MAX_RAM_GB }
-  validates :storage_gb, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: MAX_STORAGE_GB }
+  validates :cpu_cores, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: Request::MAX_CPU_CORES }
+  validates :ram_gb, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: Request::MAX_RAM_GB }
+  validates :storage_gb, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: Request::MAX_STORAGE_GB }
 end

app/views/request_templates/_form.html.erb

@@ -23,12 +23,12 @@
     </div>
 
     <div class="field form-group">
-      <%= form.label :ram_mb, "RAM in GB" %>
+      <%= form.label :ram_gb, "RAM in GB" %>
       <%= form.number_field :ram_gb, min: 0, class: 'form-control' %>
     </div>
 
     <div class="field form-group">
-      <%= form.label :storage_mb, "Storage in GB" %>
+      <%= form.label :storage_gb, "Storage in GB" %>
       <%= form.number_field :storage_gb, min: 0, class: 'form-control' %>
     </div>
 

app/views/requests/_form.html.erb

@@ -21,13 +21,13 @@
   </div>
 
   <div class="field form-group">
-    <%= form.label :ram_mb, "RAM in GB" %>
-    <%= form.number_field :ram_mb, value: (@request && !@request&.ram_mb.nil?) ? mb_to_gb(@request.ram_mb) : nil, min: 0, class: 'form-control', id: 'ram' %>
+    <%= form.label :ram_gb, "RAM in GB" %>
+    <%= form.number_field :ram_gb, min: 0, class: 'form-control', id: 'ram' %>
   </div>
 
   <div class="field form-group">
-    <%= form.label :storage_mb, "Storage in GB" %>
-    <%= form.number_field :storage_mb, value: (@request && !@request&.storage_mb.nil?) ? mb_to_gb(@request.storage_mb) : nil, min: 0, class: 'form-control', id: 'storage' %>
+    <%= form.label :storage_gb, "Storage in GB" %>
+    <%= form.number_field :storage_gb, min: 0, class: 'form-control', id: 'storage' %>
   </div>
 
   <div class="field form-group">

app/views/requests/_request.json.jbuilder

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-json.extract! request, :id, :name, :cpu_cores, :ram_mb, :storage_mb, :operating_system, :comment, :rejection_information, :status, :created_at, :updated_at
+json.extract! request, :id, :name, :cpu_cores, :ram_gb, :storage_gb, :operating_system, :comment, :rejection_information, :status, :created_at, :updated_at
 json.url request_url(request, format: :json)

app/views/requests/index.html.erb

@@ -35,8 +35,8 @@
         <%= link_to request.name, request_path(request), class: "btn btn-link"  %>
       </td>
       <td class="table-active"><%= request.cpu_cores %></td>
-      <td class="table-active"><%= mb_to_gb(request.ram_mb) %> GB</td>
-      <td class="table-active"><%= mb_to_gb(request.storage_mb) %> GB</td>
+      <td class="table-active"><%= request.ram_gb %> GB</td>
+      <td class="table-active"><%= request.storage_gb %> GB</td>
       <td class="table-active"><%= request.operating_system %></td>
       <td class="table-active"><%= request.port %></td>
       <td class="table-active"><%= request.application_name %></td>
@@ -71,8 +71,8 @@
         <%= link_to request.name, request_path(request), class: "btn btn-link"  %>
       </td>
       <td class="table-active"><%= request.cpu_cores %></td>
-      <td class="table-active"><%= mb_to_gb(request.ram_mb) %> GB</td>
-      <td class="table-active"><%= mb_to_gb(request.storage_mb) %> GB</td>
+      <td class="table-active"><%= request.ram_gb %> GB</td>
+      <td class="table-active"><%= request.storage_gb %> GB</td>
       <td class="table-active"><%= request.operating_system %></td>
       <td class="table-active"><%= request.port %></td>
       <td class="table-active"><%= request.application_name %></td>

app/views/requests/show.html.erb

@@ -14,12 +14,12 @@
 
     <tr>
       <td><strong>RAM in GB:</strong></td>
-      <td><%= mb_to_gb(@request.ram_mb) %></td>
+      <td><%= @request.ram_gb %></td>
     </tr>
 
     <tr>
       <td><strong>Storage in GB:</strong></td>
-      <td><%= mb_to_gb(@request.storage_mb) %></td>
+      <td><%= @request.storage_gb %></td>
     </tr>
 
     <tr>

app/views/vms/edit_config.html.erb

@@ -31,12 +31,12 @@
     <tbody>
       <tr>
         <td><strong>Operating System:</strong></td>
-        <td><%= request_for(@vm).operating_system %></td>
+        <td><%= @vm.request.operating_system %></td>
       </tr>
 
       <tr>
         <td><strong>Comment:</strong></td>
-        <td class="col-md-4"><%= request_for(@vm).comment %></td>
+        <td class="col-md-4"><%= @vm.request.comment %></td>
       </tr>
     </tbody>
   </table>

db/migrate/20190131115425_rename_request_mb_to_gb.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class RenameRequestMbToGb < ActiveRecord::Migration[5.2]
+  def up
+    rename_column :requests, :ram_mb, :ram_gb
+    rename_column :requests, :storage_mb, :storage_gb
+    update_requests
+  end
+
+  def update_requests
+    Request.all.each do |request|
+      unless request.nil?
+        request.ram_gb = (request.ram_gb / 1000.0).ceil
+        request.storage_gb = (request.storage_gb / 1000.0).ceil
+      end
+      request.save
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_01_29_184200) do
+ActiveRecord::Schema.define(version: 2019_01_31_115425) do
 
   create_table "archivation_requests", force: :cascade do |t|
     t.string "name", null: false
@@ -52,8 +52,8 @@
   create_table "requests", force: :cascade do |t|
     t.string "name"
     t.integer "cpu_cores"
-    t.integer "ram_mb"
-    t.integer "storage_mb"
+    t.integer "ram_gb"
+    t.integer "storage_gb"
     t.string "operating_system"
     t.text "comment"
     t.text "rejection_information"

spec/controllers/requests_controller_spec.rb

@@ -37,8 +37,8 @@
     {
       name: 'myvm',
       cpu_cores: 2,
-      ram_mb: 1,
-      storage_mb: 2,
+      ram_gb: 1,
+      storage_gb: 2,
       operating_system: 'MyOS',
       description: 'Description',
       comment: 'Comment',
@@ -52,8 +52,8 @@
     {
       name: '',
       cpu_cores: 2,
-      ram_mb: 1000,
-      storage_mb: -2000,
+      ram_gb: 1000,
+      storage_gb: -2000,
       operating_system: '',
       description: '',
       comment: 'Comment',
@@ -175,8 +175,8 @@
         {
           name: 'mynewvm',
           cpu_cores: 3,
-          ram_mb: 2,
-          storage_mb: 3,
+          ram_gb: 2,
+          storage_gb: 3,
           operating_system: 'MyNewOS',
           comment: 'newComment',
           status: 'pending',

spec/factories/requests.rb

@@ -4,8 +4,8 @@
   factory :request do
     name { 'myvm' }
     cpu_cores { 2 }
-    ram_mb { 1000 }
-    storage_mb { 2000 }
+    ram_gb { 1 }
+    storage_gb { 3 }
     operating_system { 'MyOS' }
     description { 'Description' }
     comment { 'Comment' }

spec/helpers/requests_helper_spec.rb

@@ -26,14 +26,4 @@
     teststring = 'teststring'
     expect(replace_whitespaces(teststring)).to eq(teststring)
   end
-
-  it 'converts mb to gb correctly' do
-    megabyte = 9_000
-    expect(mb_to_gb(megabyte)).to eq(9)
-  end
-
-  it 'converts gb to mb correctly' do
-    gigabyte = 9
-    expect(gb_to_mb(gigabyte)).to eq(9000)
-  end
 end

spec/models/request_spec.rb

@@ -28,12 +28,12 @@
       end
 
       it 'is invalid with no ram specifiation' do
-        request.ram_mb = nil
+        request.ram_gb = nil
         expect(request).to be_invalid
       end
 
       it 'is invalid with no storage specifiation' do
-        request.storage_mb = nil
+        request.storage_gb = nil
         expect(request).to be_invalid
       end
 
@@ -53,22 +53,22 @@
       end
 
       it 'is invalid with negative ram specifiation' do
-        request.ram_mb = -1
+        request.ram_gb = -1
         expect(request).to be_invalid
       end
 
       it 'is invalid with to much ram' do
-        request.ram_mb = Request::MAX_RAM_MB + 1
+        request.ram_gb = Request::MAX_RAM_GB + 1
         expect(request).to be_invalid
       end
 
       it 'is invalid with negative storage specifiation' do
-        request.storage_mb = -1
+        request.storage_gb = -1
         expect(request).to be_invalid
       end
 
       it 'is invalid with to much storage' do
-        request.storage_mb = Request::MAX_STORAGE_MB + 1
+        request.storage_gb = Request::MAX_STORAGE_GB + 1
         expect(request).to be_invalid
       end