foreman_kubevirt 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d43271a448b16c7d7df17b7e1c38c85fd2c6e6cca8bb4655906b24af7dfe339
-  data.tar.gz: e4177e4b9674fbc17d31f5616cc5aba7069d737eae8c3255ebe2f5d9779ce28a
+  metadata.gz: cf485c758f474f165b3f447b543f6f125ae5a507a06c611baed7fc9c20c9db86
+  data.tar.gz: e16eca90c17c3f4f25d1686195f19609951002eac567174e826b32ad9650f76e
 SHA512:
-  metadata.gz: 61951a4ab069db27f17636276dfb308f35ed3c02b5e129e22a917ec6e82bec43b314c17c6ad913c69e39adc51ae6521b503f800f9fc92c0d48749f4f4d55582a
-  data.tar.gz: 9ef1c701f0e8ef160cbd1d2e2352511589c13cdf5778600449261773f8881500bc4ce362c97320614e6d5485fd7de89f8a05e2473d31dde5143f536d12fe30d6
+  metadata.gz: a9ece666c6b3af21d27a29709904f21c27cf78b234441b7e0494ca11026873e2d333974dfdd16892217ea6e6e8b7f6fa4280cbbc43e26c6927a080741d037ee0
+  data.tar.gz: 1ca9cfa2aa37f9d068f3231ea2e0f4361447f3edef30a76b50bc844500abe4080307970fa5d71c175b7d90aeb6f928b0b4030ae1d66ab7c0a9cd37c8f2bdb8a2

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

@@ -7,6 +7,20 @@ module FogExtensions
 
       attr_accessor :image_id
 
+      included do
+        alias_method :fog_memory, :memory
+
+        define_method(:memory) do
+          return fog_memory if fog_memory.is_a?(Numeric)
+          return nil if fog_memory.blank?
+
+          ::Fog::Kubevirt::Utils::UnitConverter.convert(fog_memory, :b).to_i
+        rescue StandardError => e
+          Rails.logger.warn("Failed to convert memory '#{fog_memory}': #{e.message}")
+          nil
+        end
+      end
+
       def to_s
         name
       end

data/app/models/foreman_kubevirt/kubevirt.rb

@@ -305,14 +305,6 @@ module ForemanKubevirt
       64.gigabytes
     end
 
-    # Converts a given memory to bytes
-    #
-    # @param memory - The memory of the VM to convert
-    #
-    def convert_memory_to_bytes(memory)
-      convert_memory(memory, :b)
-    end
-
     def plain_kubevirt_protocol
       "plain.kubevirt.io".freeze
     end

data/app/views/compute_resources_vms/index/_kubevirt.html.erb

@@ -12,7 +12,7 @@
     <tr>
       <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource, :auth_action => 'view', :authorizer => authorizer) %></td>
       <td><%= vm.cpu_cores %></td>
-      <td><%= number_to_human_size @compute_resource.convert_memory_to_bytes(vm.memory) %></td>
+      <td><%= number_to_human_size vm.memory %></td>
       <td>
         <span <%= vm_power_class(vm.ready?) %>>
           <%= vm_state(vm) %></span>

data/app/views/compute_resources_vms/show/_kubevirt.html.erb

@@ -20,7 +20,7 @@
       </tr>
       <tr>
         <td><%= _('Memory') %></td>
-        <td><%= number_to_human_size @compute_resource.convert_memory_to_bytes(@vm.memory) %></td>
+        <td><%= number_to_human_size @vm.memory %></td>
       </tr>
       <tr>
         <td><%= _('Namespace') %></td>

data/lib/foreman_kubevirt/version.rb

@@ -1,3 +1,3 @@
 module ForemanKubevirt
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.5.2'.freeze
 end

data/test/unit/foreman_kubevirt_test.rb

@@ -163,14 +163,4 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     # verify default memory value is set
     assert_equal "1024M", server.memory
   end
-
-  test "converts memory to byte" do
-    Fog.mock!
-    compute_resource = new_kubevirt_vcr
-    assert_equal 1.gigabytes, compute_resource.convert_memory_to_bytes("1Gi")
-    assert_equal 1.megabytes, compute_resource.convert_memory_to_bytes("1Mi")
-    assert_equal 1_000_000_000, compute_resource.convert_memory_to_bytes("1G")
-    assert_equal 1_000_000, compute_resource.convert_memory_to_bytes("1M")
-    assert_equal 0, compute_resource.convert_memory_to_bytes("0b")
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_kubevirt
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Moti Asayag