foreman_kubevirt 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39fc9c907b2357c24a43be724a2e00b2105452abd42911c836b1cd5dc0f6b085
-  data.tar.gz: 00b5f9b3bcf1c36c540e6a1261c1c68fb2f9f337fc0ef6b669ef5da182f22d7d
+  metadata.gz: c3f29a8f48b11e762c608eb0214c101a9bca7e87e8abc43419f5b04d538461a8
+  data.tar.gz: f6d536736bc4b8589ac3edb77ad28c85370bc3408bad137674e6ead7017076e1
 SHA512:
-  metadata.gz: aedfe24b1155d7140ca79bb056292fa28abfdc33c64bb401fa76c482ba61950b81461832d21a0fda69b94e805d508079b1959661c01e5fc96770a503db67d62a
-  data.tar.gz: f3879d38d591219040d0bf4bd4f1b645548ef0b7c471ae3da62705a1a5a5d4b44619f5e2d7b6c3c24f5d9e9c0fb6c1f20b77a0e65b8649205cf95b8469c96126
+  metadata.gz: 1497af24453af9057568e04f1106e11e0e1b9fab1d460d9007baebb64b5165db2fb2b549ef6a5c432ce8393f60dac11cf60533ce2c4908cc9c64a6b4eae65b47
+  data.tar.gz: 32ee5c20e2a13e59fe10fef1186db415ca4f06da8fbf22e24d64df7f366f9e5b9775d33eb7618fbc4bc3e6b5553fe2830910a50e295c35e0c95143c83f49e38b

data/app/models/foreman_kubevirt/kubevirt.rb

@@ -183,13 +183,14 @@ module ForemanKubevirt
       user_data = { "userData" => options[:user_data] } if options[:user_data].present?
 
       begin
-        volumes = create_volumes_for_vm(options)
+        volumes, volume_templates = create_volumes_for_vm(options)
         interfaces, networks = create_network_devices_for_vm(options, volumes)
         client.vms.create(:vm_name     => options[:name],
                           :cpus        => options[:cpu_cores].to_i,
                           :memory_size => convert_memory(options[:memory] + "b", :mi).to_s,
                           :memory_unit => "Mi",
                           :volumes     => volumes,
+                          :volume_templates => volume_templates,
                           :cloudinit   => user_data,
                           :networks    => networks,
                           :interfaces  => interfaces)
@@ -221,7 +222,8 @@ module ForemanKubevirt
     def vm_instance_defaults
       {
         :memory    => 1024.megabytes.to_s,
-        :cpu_cores => '1'
+        :cpu_cores => '1',
+        :volumes   => [new_volume].compact,
       }
     end
 
@@ -344,7 +346,7 @@ module ForemanKubevirt
         :kubevirt_namespace  => namespace,
         :kubevirt_token      => token,
         :kubevirt_log        => logger,
-        :kubevirt_verify_ssl => ca_cert.present?,
+        :kubevirt_verify_ssl => true,
         :kubevirt_ca_cert    => ca_cert,
         :kubevirt_version    => "v1alpha3"
       )
@@ -376,22 +378,42 @@ module ForemanKubevirt
         (volumes_attributes.present? || image)
     end
 
-    def verify_booting_from_image_is_possible(volumes)
-      raise ::Foreman::Exception.new _('It is not possible to set a bootable volume and image based provisioning.') if
-        volumes&.any? { |_, v| v[:bootable] == "true" }
+    def add_volume_for_image_provision(options)
+      volume = Fog::Kubevirt::Compute::Volume.new
+      volume.config = { name: rootdisk_name(options) }
+      volume.boot_order = 1
+      volume.name = 'rootdisk'
+      volume.type = 'dataVolume'
+      volume
     end
 
-    def add_volume_for_image_provision(options)
+    def add_volume_template_for_image_provision(options)
       image = options[:image_id]
       raise ::Foreman::Exception.new _('VM should be created based on an image') unless image
 
-      verify_booting_from_image_is_possible(options[:volumes_attributes])
+      namespace, name = image.split('/', 2)
+      if name.nil?
+        name = namespace
+        namespace = nil
+      end
 
-      volume = Fog::Kubevirt::Compute::Volume.new
-      volume.info = image
-      volume.boot_order = 1
-      volume.type = 'containerDisk'
-      volume
+      volumes_attributes = options.fetch(:volumes_attributes, {})
+      _, boot_volume = volumes_attributes.find { |_, vol| vol[:bootable] == 'true' }
+      raise ::Foreman::Exception.new _('A bootable volume is required as a target for the image') unless boot_volume
+      capacity = boot_volume[:capacity]
+      capacity += "G" unless capacity.end_with? "G"
+      storage_class = boot_volume[:storage_class]
+      storage = { resources: { requests: { storage: capacity } } }
+      storage[:storageClassName] = storage_class if storage_class.present?
+
+      source_ref = { kind: 'DataSource', name: name, namespace: namespace }.compact
+      metadata = { name: rootdisk_name(options) }
+      { kind: 'DataVolume', metadata: metadata, spec: { sourceRef: source_ref, storage: storage } }
+    end
+
+    def rootdisk_name(options)
+      vm_name = options[:name].parameterize
+      "#{vm_name}-root"
     end
 
     def validate_volume_capacity(volumes_attributes)
@@ -443,6 +465,8 @@ module ForemanKubevirt
       volumes = []
       vm_name = options[:name].gsub(/[._]+/, '-')
       volumes_attributes.each_with_index do |(_, v), index|
+        # skip if this is a boot volume for image provisioning
+        next if image_provision && v[:bootable]
         # Add PVC as volumes to the virtual machine
         pvc_name = vm_name + "-claim-" + (index + 1).to_s
         capacity = v[:capacity]
@@ -465,10 +489,15 @@ module ForemanKubevirt
 
       # Add image as volume to the virtual machine
       volumes = []
+      volume_templates = []
       image_provision = options[:provision_method] == "image"
 
       volumes << add_volume_for_image_provision(options) if image_provision
       volumes.concat(add_volumes_based_on_pvcs(options, image_provision))
+
+      volume_templates << add_volume_template_for_image_provision(options) if image_provision
+
+      [volumes, volume_templates]
     end
 
     def create_pod_network_element

data/app/views/compute_resources/form/_kubevirt.html.erb

@@ -9,7 +9,7 @@
 %>
 
 <%= textarea_f f, :ca_cert, :label => _("X509 Certification Authorities"),
-  :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain or a path to a file. If left blank - insecure.") %>
+  :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain or a path to a file.") %>
 
 <div class="col-md-offset-2">
   <%= test_connection_button_f(f, f.object.connection_valid?) %>

data/app/views/images/form/_kubevirt.html.erb

@@ -1,4 +1,4 @@
 <%= text_f f, :username, :value => @image.username || "root", :help_inline => _("The user that is used to ssh into the instance, normally cloud-user, ec2-user, ubuntu, root etc") %>
 <%= password_f f, :password, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
 <%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input (e.g. via cloud-init)?") %>
-<%= image_field(f, :label => _("Image"), :help_inline => _("The name of the image in the registry.")) %>
+<%= image_field(f, :label => _("Image"), :help_inline => _("The name of the DataSource that contains the image. Use namespace/name notation to use a DataSource in a different namespace.")) %>

data/lib/foreman_kubevirt/version.rb

@@ -1,3 +1,3 @@
 module ForemanKubevirt
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/test/models/compute_resources/kubevirt_test.rb

@@ -9,6 +9,23 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     ::FactoryBot.build(:compute_resource_kubevirt)
   end
 
+  def mocked_client
+    vms = stub
+    pvcs = stub
+    pvcs.stubs(:create)
+    pvcs.stubs(:delete)
+    servers = stub
+    servers.stubs(:get)
+    storageclasses = stub
+    storageclasses.stubs(:all).returns([{ 'name': 'local' }])
+    client = stub
+    client.stubs(:vms).returns(vms)
+    client.stubs(:pvcs).returns(pvcs)
+    client.stubs(:servers).returns(servers)
+    client.stubs(:storageclasses).returns(storageclasses)
+    client
+  end
+
   test "host_interfaces_attrs" do
     record = new_kubevirt_vcr
     host = ::FactoryBot.build(:host_kubevirt, :with_interfaces)
@@ -23,26 +40,65 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
 
   describe "create_vm" do
     test "uses sanitized NIC names" do
-      vms = stub
-      pvcs = stub
-      pvcs.stubs(:create)
-      pvcs.stubs(:delete)
-      servers = stub
-      servers.stubs(:get)
-      client = stub
-      client.stubs(:vms).returns(vms)
-      client.stubs(:pvcs).returns(pvcs)
-      client.stubs(:servers).returns(servers)
       record = new_kubevirt_vcr
+      client = mocked_client
       record.stubs(:client).returns(client)
 
       expected_networks = [{ :name => "default-network", :multus => { :networkName => "default/network" } }]
       expected_interfaces = [{ :bridge => {}, :name => "default-network" }]
 
-      vms.expects(:create).with(vm_name: anything, cpus: anything, memory_size: anything, memory_unit: anything, volumes: anything, cloudinit: anything, networks: expected_networks, interfaces: expected_interfaces)
+      client.vms.expects(:create).with do |args|
+        assert_equal expected_networks, args[:networks]
+        assert_equal expected_interfaces, args[:interfaces]
+      end
 
       record.create_vm({ :name => "test", :volumes_attributes => { 0 => { :capacity => "5" } }, :interfaces_attributes => { "0" => { "cni_provider" => "multus", "network" => "default/network" } } })
     end
+
+    test "raises an error for image based provisioning without an explicit boot volume" do
+      record = new_kubevirt_vcr
+
+      error = assert_raises(Foreman::Exception) do
+        record.create_vm({ :name => "test", :provision_method => 'image', :image_id => "default/template", :volumes_attributes => {}, :interfaces_attributes => { "0" => { "cni_provider" => "multus", "network" => "default/network" } } })
+      end
+      assert_match(/A bootable volume is required as a target for the image/, error.message)
+    end
+
+    test "uses dataVolume for image based provisioning with an explicit boot volume" do
+      record = new_kubevirt_vcr
+      client = mocked_client
+      record.stubs(:client).returns(client)
+
+      client.vms.expects(:create).with do |args|
+        assert_equal 1, args[:volumes].length
+        assert_equal 1, args[:volume_templates].length
+
+        volume = args[:volumes].first
+        assert_equal 'dataVolume', volume.type
+        assert_equal 'test-root', volume.config[:name]
+        assert_equal 'rootdisk', volume.name
+        assert_equal 1, volume.boot_order
+
+        volume_template = args[:volume_templates].first
+        assert_equal 'DataVolume', volume_template[:kind]
+        assert_equal 'test-root', volume_template[:metadata][:name]
+        assert_equal 'DataSource', volume_template[:spec][:sourceRef][:kind]
+        assert_equal 'default', volume_template[:spec][:sourceRef][:namespace]
+        assert_equal 'template', volume_template[:spec][:sourceRef][:name]
+        assert_equal '10G', volume_template[:spec][:storage][:resources][:requests][:storage]
+      end
+
+      record.create_vm({ :name => "test", :provision_method => 'image', :image_id => "default/template", :volumes_attributes => { "0" => { :capacity => "10", :bootable => "true" } }, :interfaces_attributes => { "0" => { "cni_provider" => "multus", "network" => "default/network" } } })
+    end
+
+    test "raises an error for image based provisioning with only an extra data volume" do
+      record = new_kubevirt_vcr
+
+      error = assert_raises(Foreman::Exception) do
+        record.create_vm({ :name => "test", :provision_method => 'image', :image_id => "default/template", :volumes_attributes => { "0" => { :capacity => "10" } }, :interfaces_attributes => { "0" => { "cni_provider" => "multus", "network" => "default/network" } } })
+      end
+      assert_match(/A bootable volume is required as a target for the image/, error.message)
+    end
   end
 
   describe "create_network_element" do

data/test/unit/foreman_kubevirt_test.rb

@@ -40,7 +40,7 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     "memory" => "1073741824",
     "start" => "1",
     "volumes_attributes" => {
-      "0" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "1", "bootable" => "false" }
+      "0" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "1", "bootable" => "true" }
     },
     "image_id" => "kubevirt/fedora-cloud-registry-disk-demo",
     "name" => "olive-kempter.example.com",
@@ -73,26 +73,16 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     assert_equal 1, server.interfaces.count
   end
 
-  test "create_vm image based without additional volumes should pass" do
+  test "create_vm image based without additional volumes should fail" 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
     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)
+    assert_match(/A bootable volume is required as a target for the image/, exception.message)
   end
 
   test "should fail when creating a VM without an image or pvc" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_kubevirt
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Moti Asayag
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'