foreman_kubevirt 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb14b9910b51e87d3bd699260b39936ecf751d2e
-  data.tar.gz: a2ff30c7286f23678e50f1bcafc77b27abe47ab4
+  metadata.gz: f2ab728beaf6449390b9686a3578738848ac1da3
+  data.tar.gz: dc79c8e150b8d7cb02c679c9e1ffd4cf63495e0b
 SHA512:
-  metadata.gz: 406d06d9e17c37437d133513d44e89e6c006b99510a96145895e6584080dcc7bd3ea2f7e25d024b12351bfece8d51e2b08e6253cf52e96f9c128bc4bc54d696f
-  data.tar.gz: d16ddc90d2ad8652a71e05840fdbe605bc9ed20dccf38242bc5d767e03c814d7ba748eece054f09dbb084e2b51624b94e9a1dc95e0d1d465d3ce8a1cad35f64d
+  metadata.gz: 53d8317d77b47588d0b049ae083aa4e261ac4983c6a047870f4dc4eb899c77fa3b1b32d2edbe1f4e23201bec197a6c171708b9a77710fde52bf78a5805a612f9
+  data.tar.gz: d961f6dff0ebf22b0e8a326b08c7c20d555b9e2ce6aed4bae7e4b39c6922c512a1c3f04c2215371f55a13b461bc0d3836d5938a47e1bd65e2cb746877ef29655

data/app/assets/javascripts/foreman_kubevirt/kubevirt.js

@@ -1,5 +1,5 @@
 bootableRadio = function (item) {
-  const disabled = $('[id$=_bootable_true]:disabled:checked:visible');
+  disabled = $('[id$=_bootable_true]:disabled:checked:visible');
 
   $('[id$=_bootable_true]').prop('checked', false);
   if (disabled.length > 0) {
@@ -10,8 +10,8 @@ bootableRadio = function (item) {
 }
 
 cniProviderSelected = function (item) {
-  const selected = $(item).val().toLowerCase();
-  const networks = $(item).parentsUntil('.fields').parent().find('#networks');
+  selected = $(item).val().toLowerCase();
+  networks = $(item).parentsUntil('.fields').parent().find('#networks');
 
   if (selected == "pod") {
     disableDropdown(networks);

data/app/models/foreman_kubevirt/kubevirt.rb

@@ -57,7 +57,8 @@ module ForemanKubevirt
     def networks
       client.networkattachmentdefs.all
     rescue StandardError => e
-      logger.warn("Failed to retrieve network attachments definition from KubeVirt, make sure KubeVirt has CNI provider and NetworkAttachmentDefinition CRD deployed: #{e.message}")
+      logger.warn("Failed to retrieve network attachments definition from KubeVirt,
+        make sure KubeVirt has CNI provider and NetworkAttachmentDefinition CRD deployed: #{e.message}")
       []
     end
 
@@ -130,84 +131,16 @@ module ForemanKubevirt
     #                          "capacity"=>"2"
     #                        }
     #   }
-
-    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" }
-    end
-
     def create_vm(args = {})
       options = vm_instance_defaults.merge(args.to_hash.deep_symbolize_keys)
       logger.debug("creating VM with the following options: #{options.inspect}")
-      volumes = []
-
-      image = args["image_id"]
-      volumes_attributes = args["volumes_attributes"]
-      raise ::Foreman::Exception.new N_('VM should be created based on Persistent Volume Claim or Image') unless (volumes_attributes.present? || image)
-
-      # Add image as volume to the virtual machine
-      image_provision = args["provision_method"] == "image"
-      if image_provision
-        verify_booting_from_image_is_possible(volumes_attributes)
-        volume = Fog::Kubevirt::Compute::Volume.new
-        raise ::Foreman::Exception.new N_('VM should be created based on an image') unless image
-
-        volume.info = image
-        volume.boot_order = 1
-        volume.type = 'containerDisk'
-        volumes << volume
-      end
 
-      volumes_attributes.each { |_, v| raise ::Foreman::Exception.new N_('Capacity was not found') if v["capacity"].empty? }
-      volumes_attributes&.each_with_index do |(_, v), index|
-        # Add PVC as volumes to the virtual machine
-        pvc_name = options[:name].gsub(/[._]+/, '-') + "-claim-" + (index + 1).to_s
-        capacity = v["capacity"]
-        storage_class = v["storage_class"]
-        bootable = v["bootable"] && !image_provision
-
-        volume = create_vm_volume(pvc_name, capacity, storage_class, bootable)
-        volumes << volume
-      end
+      volumes = create_volumes_for_vm(options)
 
       # FIXME: Add cloud-init support
       # init = { 'userData' => "#!/bin/bash\necho \"fedora\" | passwd fedora --stdin"}
 
-      interfaces = []
-      networks = []
-
-      args["interfaces_attributes"].values.each do |iface|
-        if iface["cni_provider"] == 'pod'
-          nic = {
-            :bridge => {},
-            :name   => 'pod'
-          }
-
-          net = { :name => 'pod', :pod => {} }
-        else
-          nic = {
-            :bridge => {},
-            :name   => iface["network"]
-          }
-
-          cni = iface["cni_provider"].to_sym
-          net = {
-            :name => iface["network"],
-            cni   => { :networkName => iface["network"] }
-          }
-        end
-
-        # TODO: Consider replacing with 'free' boot order, also verify uniqueness
-        # there is a bug with bootOrder https://bugzilla.redhat.com/show_bug.cgi?id=1687341
-        # therefore adding to the condition not to boot from netwotk device if already asked
-        # to boot from disk
-        if iface["provision"] == true && volumes.select { |v| v.boot_order == 1 }.empty?
-          nic[:bootOrder] = 1
-        end
-        nic[:macAddress] = iface["mac"] if iface["mac"]
-        interfaces << nic
-        networks << net
-      end
+      interfaces, networks = create_network_devices_for_vm(options, volumes)
 
       begin
         client.vms.create(:vm_name     => options[:name],
@@ -224,34 +157,6 @@ module ForemanKubevirt
       end
     end
 
-    def create_new_pvc(pvc_name, capacity, storage_class)
-      client.pvcs.create(:name          => pvc_name,
-                         :namespace     => namespace,
-                         :storage_class => storage_class,
-                         :access_modes  => ['ReadWriteOnce'],
-                         :requests      => { :storage => capacity + "G" })
-    end
-
-    def delete_pvcs(volumes)
-      volumes.each do |volume|
-        begin
-          client.pvcs.delete(volume.info) if volume.type == "persistentVolumeClaim"
-        rescue StandardError => e
-          logger.error("The PVC #{volume.info} couldn't be delete due to #{e.message}")
-        end
-      end
-    end
-
-    def create_vm_volume(pvc_name, capacity, storage_class, bootable)
-      create_new_pvc(pvc_name, capacity, storage_class)
-
-      volume = Fog::Kubevirt::Compute::Volume.new
-      volume.type = 'persistentVolumeClaim'
-      volume.info = pvc_name
-      volume.boot_order = 1 if bootable == "true"
-      volume
-    end
-
     def destroy_vm(vm_uuid)
       vm = find_vm_by_uuid(vm_uuid)
       delete_pvcs(vm.volumes)
@@ -315,11 +220,13 @@ module ForemanKubevirt
       vm_attrs = super
       interfaces = vm.interfaces || []
       vm_attrs[:interfaces_attributes] = interfaces.each_with_index.each_with_object({}) do |(interface, index), hsh|
-        interface_attrs = {}
-        interface_attrs[:compute_attributes] = {}
-        interface_attrs[:mac] = interface.mac
-        interface_attrs[:compute_attributes][:network] = interface.network
-        interface_attrs[:compute_attributes][:cni_provider] = interface.cni_provider
+        interface_attrs = {
+          mac: interface.mac,
+          compute_attributes: {
+            network: interface.network,
+            cni_provider: interface.cni_provider
+          }
+        }
         hsh[index.to_s] = interface_attrs
       end
 
@@ -385,5 +292,141 @@ module ForemanKubevirt
           ca_cert
       )
     end
+
+    private
+
+    def verify_at_least_one_volume_provided(options)
+      image = options[:image_id]
+      volumes_attributes = options[:volumes_attributes]
+      raise ::Foreman::Exception.new N_('VM should be created based on Persistent Volume Claim or Image') unless
+        (volumes_attributes.present? || image)
+    end
+
+    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" }
+    end
+
+    def add_volume_for_image_provision(options)
+      image = options[:image_id]
+      raise ::Foreman::Exception.new N_('VM should be created based on an image') unless image
+
+      verify_booting_from_image_is_possible(options[:volumes_attributes])
+
+      volume = Fog::Kubevirt::Compute::Volume.new
+      volume.info = image
+      volume.boot_order = 1
+      volume.type = 'containerDisk'
+      volume
+    end
+
+    def validate_volume_capacity(volumes_attributes)
+      volumes_attributes.each { |_, v| raise ::Foreman::Exception.new N_('Capacity was not found') if v[:capacity].empty? }
+    end
+
+    def validate_only_single_bootable_volume(volumes_attributes)
+      raise ::Foreman::Exception.new N_('Only one volume can be bootable') if volumes_attributes.select { |_, v| v[:bootable] == "true" }.count > 1
+    end
+
+    def create_new_pvc(pvc_name, capacity, storage_class)
+      client.pvcs.create(:name          => pvc_name,
+                         :namespace     => namespace,
+                         :storage_class => storage_class,
+                         :access_modes  => ['ReadWriteOnce'],
+                         :requests      => { :storage => capacity + "G" })
+    end
+
+    def delete_pvcs(volumes)
+      volumes.each do |volume|
+        begin
+          client.pvcs.delete(volume.info) if volume.type == "persistentVolumeClaim"
+        rescue StandardError => e
+          logger.error("The PVC #{volume.info} couldn't be delete due to #{e.message}")
+        end
+      end
+    end
+
+    def create_vm_volume(pvc_name, capacity, storage_class, bootable)
+      create_new_pvc(pvc_name, capacity, storage_class)
+
+      volume = Fog::Kubevirt::Compute::Volume.new
+      volume.type = 'persistentVolumeClaim'
+      volume.info = pvc_name
+      volume.boot_order = 1 if bootable == "true"
+      volume
+    end
+
+    def add_volumes_based_on_pvcs(options, image_provision)
+      volumes_attributes = options[:volumes_attributes]
+      return [] if volumes_attributes.blank?
+
+      validate_volume_capacity(volumes_attributes)
+      validate_only_single_bootable_volume(volumes_attributes)
+
+      volumes = []
+      vm_name = options[:name].gsub(/[._]+/, '-')
+      volumes_attributes.each_with_index do |(_, v), index|
+        # Add PVC as volumes to the virtual machine
+        pvc_name = vm_name + "-claim-" + (index + 1).to_s
+        capacity = v[:capacity]
+        storage_class = v[:storage_class]
+        bootable = v[:bootable] && !image_provision
+
+        volume = create_vm_volume(pvc_name, capacity, storage_class, bootable)
+        volumes << volume
+      end
+
+      volumes
+    end
+
+    # Creates volume elements for the VM based on provided parameters
+    #
+    # @param options[Hash] contains VM creation parameters
+    #
+    def create_volumes_for_vm(options)
+      verify_at_least_one_volume_provided(options)
+
+      # Add image as volume to the virtual machine
+      volumes = []
+      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))
+    end
+
+    def create_pod_network_element
+      nic = { bridge: {}, name: 'pod' }
+      net = { name: 'pod', pod: {} }
+      [nic, net]
+    end
+
+    def create_network_element(iface)
+      nic = { bridge: {}, name: iface[:network] }
+      cni = iface[:cni_provider].to_sym
+      net = { :name => iface[:network], cni => { :networkName => iface[:network] } }
+      [nic, net]
+    end
+
+    def create_network_devices_for_vm(options, volumes)
+      interfaces = []
+      networks = []
+
+      options[:interfaces_attributes].values.each do |iface|
+        if iface[:cni_provider] == 'pod'
+          nic, net = create_pod_network_element
+        else
+          nic, net = create_network_element(iface)
+        end
+
+        if iface[:provision] == true && volumes.select { |v| v.boot_order == 1 }.empty?
+          nic[:bootOrder] = 1
+        end
+        nic[:macAddress] = iface[:mac] if iface[:mac]
+        interfaces << nic
+        networks << net
+      end
+
+      [interfaces, networks]
+    end
   end
 end

data/lib/foreman_kubevirt/version.rb

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

data/test/unit/foreman_kubevirt_test.rb

@@ -19,11 +19,42 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
 
   require 'kubeclient'
 
-  test "create_vm network based" do
-    vm_args = { "cpu_cores" => "1", "memory" => "1073741824", "start" => "1", "volumes_attributes" => { "1554559479978" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "1", "bootable" => "true" }, "1554559483803" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "2" } }, "name" => "robin-rykert.example.com", "provision_method" => "build", "firmware_type" => :bios, "interfaces_attributes" => { "0" => { "cni_provider" => "multus", "network" => "ovs-foreman", "ip" => "192.168.111.193", "mac" => "a2:b4:a2:b6:a2:a8", "provision" => true } } }
+  NETWORK_BASED_VM_ARGS = {
+    "cpu_cores" => "1",
+    "memory" => "1073741824",
+    "start" => "1",
+    "volumes_attributes" => {
+      "0" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "1", "bootable" => "true" },
+      "1" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "2" }
+    },
+    "name" => "robin-rykert.example.com",
+    "provision_method" => "build",
+    "firmware_type" => :bios,
+    "interfaces_attributes" => {
+      "0" => { "cni_provider" => "multus", "network" => "ovs-foreman", "ip" => "192.168.111.193", "mac" => "a2:b4:a2:b6:a2:a8", "provision" => true }
+    }
+  }.freeze
+
+  IMAGE_BASED_VM_ARGS = {
+    "cpu_cores" => "1",
+    "memory" => "1073741824",
+    "start" => "1",
+    "volumes_attributes" => {
+      "0" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "1", "bootable" => "false" }
+    },
+    "image_id" => "kubevirt/fedora-cloud-registry-disk-demo",
+    "name" => "olive-kempter.example.com",
+    "provision_method" => "image",
+    "firmware_type" => :bios,
+    "interfaces_attributes" => {
+      "0" => { "cni_provider" => "multus", "network" => "ovs-foreman", "ip" => "192.168.111.184", "mac" => "a2:a4:a2:b2:a2:b6", "provision" => true }
+    }
+  }.freeze
+
+  test "create_vm network based should pass" do
     Fog.mock!
     compute_resource = new_kubevirt_vcr
-    server = compute_resource.create_vm(vm_args)
+    server = compute_resource.create_vm(NETWORK_BASED_VM_ARGS)
 
     assert_equal "robin-rykert.example.com", server.name
     assert_equal 2, server.volumes.count
@@ -31,11 +62,10 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     assert_equal 1, server.interfaces.count
   end
 
-  test "create_vm image based" do
-    vm_args = { "cpu_cores" => "1", "memory" => "1073741824", "start" => "1", "volumes_attributes" => { "1554649143334" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "1", "bootable" => "false" } }, "image_id" => "kubevirt/fedora-cloud-registry-disk-demo", "name" => "olive-kempter.example.com", "provision_method" => "image", "firmware_type" => :bios, "interfaces_attributes" => { "0" => { "cni_provider" => "multus", "network" => "ovs-foreman", "ip" => "192.168.111.184", "mac" => "a2:a4:a2:b2:a2:b6", "provision" => true } } }
+  test "create_vm image based should pass" do
     Fog.mock!
     compute_resource = new_kubevirt_vcr
-    server = compute_resource.create_vm(vm_args)
+    server = compute_resource.create_vm(IMAGE_BASED_VM_ARGS)
 
     assert_equal "olive-kempter.example.com", server.name
     assert_equal 2, server.volumes.count
@@ -44,7 +74,18 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
   end
 
   test "should fail when creating a VM with_bootable flag and image based" do
-    vm_args = { "cpu_cores" => "1", "memory" => "1073741824", "start" => "1", "volumes_attributes" => { "1554649143334" => { "_delete" => "", "storage_class" => "local-storage", "capacity" => "1", "bootable" => "true" } }, "image_id" => "kubevirt/fedora-cloud-registry-disk-demo", "name" => "olive-kempter.example.com", "provision_method" => "image", "firmware_type" => :bios, "interfaces_attributes" => { "0" => { "cni_provider" => "multus", "network" => "ovs-foreman", "ip" => "192.168.111.184", "mac" => "a2:a4:a2:b2:a2:b6", "provision" => true } } }
+    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
+      compute_resource.create_vm(vm_args)
+    end
+  end
+
+  test "should fail when creating a VM without an image or pvc" do
+    vm_args = IMAGE_BASED_VM_ARGS.deep_dup
+    vm_args["image_id"] = nil
     Fog.mock!
     compute_resource = new_kubevirt_vcr
     assert_raise(Foreman::Exception) do
@@ -52,8 +93,10 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     end
   end
 
-  test "should fail when creating a VM without an image or pvc " do
-    vm_args = { "cpu_cores" => "1", "memory" => "1073741824", "start" => "1", "volumes_attributes" => {}, "name" => "olive-kempter.example.com", "provision_method" => "image", "firmware_type" => :bios, "interfaces_attributes" => { "0" => { "cni_provider" => "multus", "network" => "ovs-foreman", "ip" => "192.168.111.184", "mac" => "a2:a4:a2:b2:a2:b6", "provision" => true } } }
+  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
@@ -62,7 +105,19 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
   end
 
   test "should fail when creating a VM with PVC and not providing a capacity" do
-    vm_args = { "cpu_cores" => "1", "memory" => "1073741824", "start" => "1", "volumes_attributes" => { "1554649143334" => { "_delete" => "", "storage_class" => "local-storage", "bootable" => "false" } }, "image_id" => "kubevirt/fedora-cloud-registry-disk-demo", "name" => "olive-kempter.example.com", "provision_method" => "image", "firmware_type" => :bios, "interfaces_attributes" => { "0" => { "cni_provider" => "multus", "network" => "ovs-foreman", "ip" => "192.168.111.184", "mac" => "a2:a4:a2:b2:a2:b6", "provision" => true } } }
+    vm_args = NETWORK_BASED_VM_ARGS.deep_dup
+    vm_args["volumes_attributes"]["0"]["capacity"] = nil
+    Fog.mock!
+    compute_resource = new_kubevirt_vcr
+    assert_raise(Foreman::Exception) do
+      compute_resource.create_vm(vm_args)
+    end
+  end
+
+  test "should fail when creating a VM with two bootable PVCs" do
+    vm_args = NETWORK_BASED_VM_ARGS.deep_dup
+    vm_args["volumes_attributes"]["0"]["bootable"] = "true"
+    vm_args["volumes_attributes"]["1"]["bootable"] = "true"
     Fog.mock!
     compute_resource = new_kubevirt_vcr
     assert_raise(Foreman::Exception) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_kubevirt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Moti Asayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,7 +96,7 @@ files:
 - test/unit/foreman_kubevirt_test.rb
 homepage: https://github.com/theforeman/foreman_kubevirt
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []