foreman_kubevirt 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b699e5fa9739119a5e81d95db30e4f714136e5c
-  data.tar.gz: 32ed36107c6cf8b3c96d9052c7a7359de84e8405
+  metadata.gz: eb14b9910b51e87d3bd699260b39936ecf751d2e
+  data.tar.gz: a2ff30c7286f23678e50f1bcafc77b27abe47ab4
 SHA512:
-  metadata.gz: 39b465a6119bb777977a49a82cf0e2d9570ab46433a4d9ef46b323b386954a42b348b7d9e1ddaf09c57355f3a5bf61e9982c13b8b1642c29b5c430624c55abf6
-  data.tar.gz: bd8db338ef655d007f0589cc34c9d3514768222413460d0fd45a4697af73020f100e2917f35271bda8672ba62b691a9c6cb0bd9d409d6f183dce59e4a78dcb18
+  metadata.gz: 406d06d9e17c37437d133513d44e89e6c006b99510a96145895e6584080dcc7bd3ea2f7e25d024b12351bfece8d51e2b08e6253cf52e96f9c128bc4bc54d696f
+  data.tar.gz: d16ddc90d2ad8652a71e05840fdbe605bc9ed20dccf38242bc5d767e03c814d7ba748eece054f09dbb084e2b51624b94e9a1dc95e0d1d465d3ce8a1cad35f64d

data/README.md

@@ -4,7 +4,7 @@
 The ```foreman_kubevirt ``` plugin enables managing of [KubeVirt](https://kubevirt.io) as a Compute Resource in Foreman.
 
 * Website: [TheForeman.org](http://theforeman.org)
-* Wiki: [Foreman wiki](http://projects.theforeman.org/projects/foreman/wiki/About)
+* Issues: [foreman Redmine](http://projects.theforeman.org/projects/kubevirt/issues/)
 * Community and support: #theforeman for general support, #theforeman-dev for development chat in [Freenode](irc.freenode.net)
 * Mailing lists:
     * [foreman-users](https://groups.google.com/forum/?fromgroups#!forum/foreman-users)
@@ -19,7 +19,7 @@ Please see the Foreman manual for appropriate instructions:
 
 
 ### Building the plugin from source
-    # git clone https://github.com/masayag/foreman_kubevirt.git
+    # git clone https://github.com/theforeman/foreman_kubevirt
     # cd foreman_kubevirt
     # gem build foreman_kubevirt.gemspec # the output will be gem named foreman_kubevirt-x.y.z.gem, where x.y.z should be replaced with the actual version
 
@@ -123,6 +123,10 @@ Or by retrieving from the secret of service account *my-account* under the *defa
 # kubectl get secret $KUBE_SECRET -n default -o jsonpath='{.data.ca\.crt}' | base64 -d
 ```
 
+## Documentation
+
+See the [Foreman Kubevirt manuals](https://theforeman.org/plugins/foreman_kubevirt/) on the Foreman web site.
+
 ## Tests
 
 Tests should be invoked from the *foreman* directory by:

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

@@ -11,21 +11,24 @@ bootableRadio = function (item) {
 
 cniProviderSelected = function (item) {
   const selected = $(item).val().toLowerCase();
-  podSelected = selected == "pod";
-  changeNetworkElementVisibility(!podSelected);
-}
+  const networks = $(item).parentsUntil('.fields').parent().find('#networks');
 
-function changeNetworkElementVisibility(toggle) {
-  if (toggle) {
-    $('.kubevirt-network').parents('.form-group').css('display', '');
+  if (selected == "pod") {
+    disableDropdown(networks);
   } else {
-    $('.kubevirt-network').parents('.form-group').css('display', 'none');
+    enableDropdown(networks);
   }
 }
 
-function changeNetworkElementVisibilityOnLoad() {
-  selected = $('select.kubevirt-cni-provider').val().toLowerCase();
-  changeNetworkElementVisibility(selected != "pod");
+function disableDropdown(item) {
+  item.hide();
+  item.attr('disabled', true);
+  $(item).closest('.removable-item').find('.kubevirt-network').prop('disabled', true);
 }
 
-$(document).ready(changeNetworkElementVisibilityOnLoad);
+function enableDropdown(item) {
+  $(item).closest('.removable-item').find('.kubevirt-network').prop('disabled', false);
+  item.attr('disabled', false);
+  item.find(':input').attr('disabled', false);
+  item.show();
+}

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

@@ -2,18 +2,6 @@ module FogExtensions
   module Kubevirt
     module Volume
       extend ActiveSupport::Concern
-
-      attr_writer :storage_class
-      attr_writer :capacity
-
-      def capacity
-        pvc.requests[:storage] unless pvc.nil?
-      end
-
-      def storage_class
-        pvc&.storage_class
-      end
-
       def bootable
         boot_order == 1
       end

data/app/models/foreman_kubevirt/kubevirt.rb

@@ -83,12 +83,14 @@ module ForemanKubevirt
     def new_volume(attr = {})
       return unless new_volume_errors.empty?
 
-      Fog::Kubevirt::Compute::Volume.new(attr)
+      vol = Fog::Kubevirt::Compute::Volume.new(attr)
+      vol.boot_order = 1 if attr[:bootable] == "on" || attr[:bootable] == "true"
+      vol
     end
 
     def new_volume_errors
       errors = []
-      errors.push _('no Persistent Volumes available on provider') if storage_classes.empty?
+      errors.push _('no Storage Classes available on provider') if storage_classes.empty?
       errors
     end
 
@@ -128,6 +130,12 @@ 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}")
@@ -135,13 +143,14 @@ module ForemanKubevirt
 
       image = args["image_id"]
       volumes_attributes = args["volumes_attributes"]
-      raise "VM should be created based on Persistent Volume Claim or Image" unless (volumes_attributes.present? || image)
+      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 "VM should be created based on an image" unless image
+        raise ::Foreman::Exception.new N_('VM should be created based on an image') unless image
 
         volume.info = image
         volume.boot_order = 1
@@ -149,6 +158,7 @@ module ForemanKubevirt
         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
@@ -316,6 +326,15 @@ module ForemanKubevirt
       vm_attrs
     end
 
+    def new_vm(attr = {})
+      vm = super
+      interfaces = nested_attributes_for :interfaces, attr[:interfaces_attributes]
+      interfaces.map { |i| vm.interfaces << new_interface(i) }
+      volumes = nested_attributes_for :volumes, attr[:volumes_attributes]
+      volumes.map { |v| vm.volumes << new_volume(v) }
+      vm
+    end
+
     def associated_host(vm)
       associate_by("mac", vm.mac)
     end

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

@@ -4,7 +4,8 @@
 <%= password_f f, :password, :label => _("Token"), :required => true,
               :keep_value => true, :unset => unset_password?,
               :help_block => _("e.g. eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9..."),
-              :help_inline => documentation_button('5.2.10PasswordEncryption') %>
+              :help_inline => documentation_button('/foreman_kubevirt/0.x/index.html#4.1SettingComputeResourceTokenandX509CAvalues',
+                                                   root_url: 'https://theforeman.org/plugins') %>
 
 <%= 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.") %>

data/app/views/compute_resources_vms/form/kubevirt/_network.html.erb

@@ -5,11 +5,16 @@
                     :label_size => "col-md-3",
                     :onchange => "cniProviderSelected(this)" %>
 
-<%= select_f f, :network, compute_resource.networks,
+<% pod = f.object.cni_provider == 'pod' %>
+
+<div id='networks' class='<%= 'hide' if pod %>'>
+<%= select_f f, :network,
+                compute_resource.networks,
                 :id,
                 :name,
                 {},
-                :disabled => !new_vm || f.object.cni_provider == 'pod',
+                :disabled => !new_vm || pod,
                 :class => "col-md-3 kubevirt-network",
                 :label => _('Network'),
                 :label_size => "col-md-3" %>
+</div>

data/app/views/compute_resources_vms/form/kubevirt/_volume.html.erb

@@ -15,7 +15,7 @@
 
   <% bootable = f.object.boot_order.nil? ? false : f.object.bootable %>
   <%= field(f, :bootable, :label => _('Bootable'), :label_size => "col-md-2") do
-    radio_button_f f, :bootable, {:disabled => !new_vm, :checked => bootable, :onclick => 'bootableRadio(this)',
+    radio_button_f f, :bootable, {:disabled => !new_vm, :value=> 'true', :checked => bootable, :onclick => 'bootableRadio(this)',
     :text => _('Only one volume can be bootable')}
   end %>
 <% end %>

data/lib/foreman_kubevirt/version.rb

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

data/test/unit/foreman_kubevirt_test.rb

@@ -32,7 +32,7 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
   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" => "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 = { "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 } } }
     Fog.mock!
     compute_resource = new_kubevirt_vcr
     server = compute_resource.create_vm(vm_args)
@@ -42,4 +42,31 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     assert_equal 2, server.disks.count
     assert_equal 1, server.interfaces.count
   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 } } }
+    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 = { "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 } } }
+    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 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 } } }
+    Fog.mock!
+    compute_resource = new_kubevirt_vcr
+    assert_raise(Foreman::Exception) do
+      compute_resource.create_vm(vm_args)
+    end
+  end
 end

metadata

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