foreman_kubevirt 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ab728beaf6449390b9686a3578738848ac1da3
-  data.tar.gz: dc79c8e150b8d7cb02c679c9e1ffd4cf63495e0b
+  metadata.gz: 0e0ae0ca0c55da65290264cdf02df32185314908
+  data.tar.gz: 12230c05d0f34969260ad7f3efaefb0486e094b9
 SHA512:
-  metadata.gz: 53d8317d77b47588d0b049ae083aa4e261ac4983c6a047870f4dc4eb899c77fa3b1b32d2edbe1f4e23201bec197a6c171708b9a77710fde52bf78a5805a612f9
-  data.tar.gz: d961f6dff0ebf22b0e8a326b08c7c20d555b9e2ce6aed4bae7e4b39c6922c512a1c3f04c2215371f55a13b461bc0d3836d5938a47e1bd65e2cb746877ef29655
+  metadata.gz: baf978d956388d8fccd84cb3e48c110b6a874542736ef6987a27c45732f9e807573ab6f87088b5a32fb46fa304c16e0a0f694965664314d8380a940dd720e4c5
+  data.tar.gz: 46c7b84303561d9a5cc2db9f72d5896775604df20263ce590f3d29f415230903e75b6ab06211478f121c717522fbea7535d9ab984bc41e82c02e57f9ff5260a9

data/app/models/foreman_kubevirt/kubevirt.rb

@@ -28,6 +28,10 @@ module ForemanKubevirt
       %i[build image new_volume]
     end
 
+    def user_data_supported?
+      true
+    end
+
     def provided_attributes
       { :uuid => :name, :mac => :mac }
     end
@@ -136,18 +140,17 @@ module ForemanKubevirt
       logger.debug("creating VM with the following options: #{options.inspect}")
 
       volumes = create_volumes_for_vm(options)
-
-      # FIXME: Add cloud-init support
-      # init = { 'userData' => "#!/bin/bash\necho \"fedora\" | passwd fedora --stdin"}
-
       interfaces, networks = create_network_devices_for_vm(options, volumes)
+      # Add clound init user data
+      user_data = { "userData" => options[:user_data] } if options[:user_data].present?
 
       begin
         client.vms.create(:vm_name     => options[:name],
                           :cpus        => options[:cpu_cores].to_i,
-                          :memory_size => options[:memory].to_i / 2**20,
+                          :memory_size => convert_memory(options[:memory] + "b", :mi).to_s,
+                          :memory_unit => "Mi",
                           :volumes     => volumes,
-                          # :cloudinit   => init,
+                          :cloudinit   => user_data,
                           :networks    => networks,
                           :interfaces  => interfaces)
         client.servers.get(options[:name])
@@ -177,7 +180,7 @@ module ForemanKubevirt
     # return 'false'
     def vm_instance_defaults
       {
-        :memory    => 1024.megabytes,
+        :memory    => 1024.megabytes.to_s,
         :cpu_cores => '1'
       }
     end
@@ -260,6 +263,14 @@ 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
+
     protected
 
     def client
@@ -304,7 +315,7 @@ module ForemanKubevirt
 
     def verify_booting_from_image_is_possible(volumes)
       raise ::Foreman::Exception.new N_('It is not possible to set a bootable volume and image based provisioning.') if
-        volumes.any? { |_, v| v[:bootable] == "true" }
+        volumes&.any? { |_, v| v[:bootable] == "true" }
     end
 
     def add_volume_for_image_provision(options)
@@ -428,5 +439,9 @@ module ForemanKubevirt
 
       [interfaces, networks]
     end
+
+    def convert_memory(memory, unit)
+      ::Fog::Kubevirt::Utils::UnitConverter.convert(memory, unit).to_i
+    end
   end
 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><%= vm.memory %></td>
+      <td><%= number_to_human_size @compute_resource.convert_memory_to_bytes(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,8 +20,7 @@
       </tr>
       <tr>
         <td><%= _('Memory') %></td>
-        <td><%= number_to_human_size @vm.memory %>
-        </td>
+        <td><%= number_to_human_size @compute_resource.convert_memory_to_bytes(@vm.memory) %></td>
       </tr>
       <tr>
         <td><%= _('Namespace') %></td>

data/lib/foreman_kubevirt/engine.rb

@@ -44,6 +44,7 @@ module ForemanKubevirt
     config.to_prepare do
       begin
         require "fog/kubevirt"
+        require "fog/kubevirt/compute/utils/unit_converter"
         require "fog/kubevirt/compute/models/server"
         require File.expand_path("../../app/models/concerns/fog_extensions/kubevirt/server", __dir__)
 

data/lib/foreman_kubevirt/version.rb

@@ -1,3 +1,3 @@
 module ForemanKubevirt
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/test/models/compute_resources/kubevirt_test.rb

@@ -66,4 +66,18 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     record.stubs(:client).returns(client)
     assert_equal false, record.test_connection
   end
+
+  test "Verify client raises StandardError exception" do
+    record = new_kubevirt_vcr
+    record.stubs(:client).raises(StandardError.new('test'))
+    record.test_connection
+    assert_equal ['test'], record.errors[:base]
+  end
+
+  test "Verify client raises FingerprintException exception" do
+    record = new_kubevirt_vcr
+    record.stubs(:client).raises(Foreman::FingerprintException.new('test'))
+    record.test_connection
+    assert_includes record.errors[:base][0], "[Foreman::FingerprintException]: test"
+  end
 end

data/test/unit/foreman_kubevirt_test.rb

@@ -73,35 +73,49 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     assert_equal 1, server.interfaces.count
   end
 
+  test "create_vm image based without additional volumes should pass" do
+    vm_args = IMAGE_BASED_VM_ARGS.deep_dup
+    vm_args.delete("volumes_attributes")
+
+    Fog.mock!
+    compute_resource = new_kubevirt_vcr
+    server = compute_resource.create_vm(vm_args)
+
+    assert_equal "olive-kempter.example.com", server.name
+  end
+
   test "should fail when creating a VM with_bootable flag and image based" do
     vm_args = IMAGE_BASED_VM_ARGS.deep_dup
     vm_args["volumes_attributes"]["0"]["bootable"] = "true"
     Fog.mock!
     compute_resource = new_kubevirt_vcr
-    assert_raise(Foreman::Exception) do
+    exception = assert_raise(Foreman::Exception) do
       compute_resource.create_vm(vm_args)
     end
+    assert_match(/It is not possible to set a bootable volume and image based provisioning./, exception.message)
   end
 
   test "should fail when creating a VM without an image or pvc" do
     vm_args = IMAGE_BASED_VM_ARGS.deep_dup
+    vm_args["volumes_attributes"] = {}
     vm_args["image_id"] = nil
     Fog.mock!
     compute_resource = new_kubevirt_vcr
-    assert_raise(Foreman::Exception) do
+    exception = assert_raise(Foreman::Exception) do
       compute_resource.create_vm(vm_args)
     end
+    assert_match(/VM should be created based on Persistent Volume Claim or Image/, exception.message)
   end
 
   test "should fail when creating image-based VM without an image" do
     vm_args = IMAGE_BASED_VM_ARGS.deep_dup
-    vm_args["volumes_attributes"] = {}
     vm_args["image_id"] = nil
     Fog.mock!
     compute_resource = new_kubevirt_vcr
-    assert_raise(Foreman::Exception) do
+    exception = assert_raise(Foreman::Exception) do
       compute_resource.create_vm(vm_args)
     end
+    assert_match(/VM should be created based on an image/, exception.message)
   end
 
   test "should fail when creating a VM with PVC and not providing a capacity" do
@@ -109,9 +123,10 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     vm_args["volumes_attributes"]["0"]["capacity"] = nil
     Fog.mock!
     compute_resource = new_kubevirt_vcr
-    assert_raise(Foreman::Exception) do
+    exception = assert_raise(Foreman::Exception) do
       compute_resource.create_vm(vm_args)
     end
+    assert_match(/Capacity was not found/, exception.message)
   end
 
   test "should fail when creating a VM with two bootable PVCs" do
@@ -120,8 +135,41 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     vm_args["volumes_attributes"]["1"]["bootable"] = "true"
     Fog.mock!
     compute_resource = new_kubevirt_vcr
-    assert_raise(Foreman::Exception) do
+    exception = assert_raise(Foreman::Exception) do
       compute_resource.create_vm(vm_args)
     end
+    assert_match(/Only one volume can be bootable/, exception.message)
+  end
+
+  test "create_vm without CPU should pass" do
+    vm_args = NETWORK_BASED_VM_ARGS.deep_dup
+    vm_args.delete("cpu_cores")
+    Fog.mock!
+    compute_resource = new_kubevirt_vcr
+    server = compute_resource.create_vm(vm_args)
+
+    # verify default CPU value is set
+    assert_equal 1, server.cpu_cores
+  end
+
+  test "create_vm without memory should pass" do
+    vm_args = NETWORK_BASED_VM_ARGS.deep_dup
+    vm_args.delete("memory")
+    Fog.mock!
+    compute_resource = new_kubevirt_vcr
+    server = compute_resource.create_vm(vm_args)
+
+    # 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_kubevirt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Moti Asayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 description: Provision and manage Kubevirt Virtual Machines from Foreman.
 email:
 - masayag@redhat.com