foreman_kubevirt 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a96cfb40c1c6f9f54b17cb33fae6abffec9c0764d4c9bbdd5a17595e18e967f4
-  data.tar.gz: c5bd84ee5ef168cc16a63dab87e7a2d164880a8cd00a481023d8cc48dd06ad3c
+  metadata.gz: fee0a645f764e86b484cfc3655738b44336a596da85c135e381ec0ae8cf856fd
+  data.tar.gz: b109ec03942dd9cad8832f63e276fede175d6f7899c40cd6aacac578e956fee8
 SHA512:
-  metadata.gz: db867f6014df1f71ad31a315559b266eaccf5d5f96e8267afa3fa88733c167c514d0dfcccc6030ee39d399760186a34d819b6bd18b8c26d705f17c529e85aaf9
-  data.tar.gz: 034ff8550502a7cdb2d205899b4a5394f7ef231b3938465fb15847338bcb965f5296669a9a9e254bbf116aae3a129721d12e1a78fa66f3d8ca8c2591a0cdf30a
+  metadata.gz: 0d4ad6baf08d620d48c3b35e687bdcb61d967ea09bd4eabdd92316f29b57ceba1afa482df5417ec86d5f4218e0ce9e2dcce00800f59bf5ca57ec2aeeb1645bba
+  data.tar.gz: 4353bd71b0ad05b9584882ceebdc8f76667e47a025ba09d0a1d5642818bbf1b10d4325ae86c79e41a752fc7ac89c3bc538d7d97225254951df065e3ca7c95092

data/app/controllers/foreman_kubevirt/concerns/api/compute_resources_controller_extensions.rb

@@ -2,7 +2,6 @@ module ForemanKubevirt
   module Concerns
     module Api
       module ComputeResourcesControllerExtensions
-        module ApiPieExtensions
           extend ::Apipie::DSL::Concern
           update_api(:create, :update) do
             param :compute_resource, Hash do
@@ -14,13 +13,6 @@ module ForemanKubevirt
             end
           end
         end
-      end
-
-      extend ActiveSupport::Concern
-
-      included do
-        include ApiPieExtensions
-      end
     end
   end
 end

data/app/models/foreman_kubevirt/compute_attribute_extensions.rb

@@ -0,0 +1,8 @@
+module ForemanKubevirt
+  module ComputeAttributeExtensions
+    extend ActiveSupport::Concern
+    included do
+      validates :vm_attrs, :volume => true
+    end
+  end
+end

data/app/models/foreman_kubevirt/kubevirt.rb

@@ -6,7 +6,7 @@ module ForemanKubevirt
     alias_attribute :token, :password
     alias_attribute :namespace, :user
     validates :hostname, :api_port, :namespace, :token, :presence => true
-    before_save :test_connection
+    after_validation :validate_connectivity unless Rails.env.test?
 
     def ca_cert
       attrs[:ca_cert]
@@ -52,13 +52,33 @@ module ForemanKubevirt
       ComputeResource.model_name
     end
 
-    def test_connection(_options = {})
-      validate!
+    def test_connection(options = {})
+      super
+      validate_connectivity(options)
+    end
+
+    def caching_enabled
+      false
+    end
+
+    def validate_connectivity(options = {})
+      return unless connection_properties_valid?
+      return false if errors.any?
       client&.valid? && client&.virt_supported?
     rescue StandardError => e
-      errors[:base] << e.message
+       if e.message =~ /401/
+        errors[:base] << _('The compute resource could not be authenticated')
+       else
+         errors[:base] << e.message
+       end
     end
 
+    def connection_properties_valid?
+      errors[:hostname].empty? && errors[:token].empty? && errors[:namespace].empty? && errors[:api_port].empty?
+    end
+
+
+
     def networks
       client.networkattachmentdefs.all
     rescue StandardError => e
@@ -86,11 +106,13 @@ module ForemanKubevirt
       storage_classes.map { |sc| OpenStruct.new(id: sc.name, description: "#{sc.name} (#{sc.provisioner})") }
     end
 
-    def new_volume(attr = {})
-      return unless new_volume_errors.empty?
 
-      vol = Fog::Kubevirt::Compute::Volume.new(attr)
-      vol.boot_order = 1 if attr[:bootable] == "on" || attr[:bootable] == "true"
+    def new_volume(attrs = {})
+      return unless new_volume_errors.empty?
+      capacity = attrs.delete(:capacity)
+      args = {capacity: capacity}.merge(attrs)
+      vol = Fog::Kubevirt::Compute::Volume.new(args)
+      vol.boot_order = 1 if args[:bootable] == "on" || args[:bootable] == "true"
       vol
     end
 
@@ -140,12 +162,12 @@ module ForemanKubevirt
       options = vm_instance_defaults.merge(args.to_hash.deep_symbolize_keys)
       logger.debug("creating VM with the following options: #{options.inspect}")
 
-      volumes = create_volumes_for_vm(options)
-      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
+        volumes = 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,
@@ -155,8 +177,8 @@ module ForemanKubevirt
                           :networks    => networks,
                           :interfaces  => interfaces)
         client.servers.get(options[:name])
-      rescue Fog::Kubevirt::Errors::ClientError => e
-        delete_pvcs(volumes)
+      rescue Exception  => e
+        delete_pvcs(volumes) if volumes
         raise e
       end
     end
@@ -272,6 +294,29 @@ module ForemanKubevirt
       convert_memory(memory, :b)
     end
 
+    def plain_kubevirt_protocol
+      "plain.kubevirt.io".freeze
+    end
+
+    def token_protocol(token)
+      "base64url.bearer.authorization.k8s.io.#{token}"
+    end
+
+    def console(uuid)
+      vm = find_vm_by_uuid(uuid)
+      vnc_details = client.vminstances.get_vnc_console_details(vm.name, namespace)
+      token = Base64.encode64(vnc_details[:token]).delete!("\n").delete("==")
+      {
+          :host => vnc_details[:host],
+          :port => vnc_details[:port],
+          :path => vnc_details[:path],
+          :token_protocol => token_protocol(token),
+          :plain_protocol => plain_kubevirt_protocol,
+          :type => 'vnc',
+          :encrypt => true
+      }
+    end
+
     protected
 
     def client
@@ -333,7 +378,11 @@ module ForemanKubevirt
     end
 
     def validate_volume_capacity(volumes_attributes)
-      volumes_attributes.each { |_, v| raise ::Foreman::Exception.new N_('Capacity was not found') if v[:capacity].empty? }
+      volumes_attributes.each do |_, vol|
+        if vol[:capacity].to_s.empty? || /\A\d+G?\Z/.match(vol[:capacity].to_s).nil?
+          raise Foreman::Exception.new(N_("Volume size #{vol[:capacity]} is not valid"))
+        end
+      end
     end
 
     def validate_only_single_bootable_volume(volumes_attributes)
@@ -422,8 +471,8 @@ module ForemanKubevirt
     def create_network_devices_for_vm(options, volumes)
       interfaces = []
       networks = []
-
       options[:interfaces_attributes].values.each do |iface|
+        raise ::Foreman::Exception.new N_('cni_provider or network are missing') unless (iface.key?(:cni_provider) && iface.key?(:network))
         if iface[:cni_provider] == 'pod'
           nic, net = create_pod_network_element
         else

data/app/validators/volume_validator.rb

@@ -0,0 +1,9 @@
+class VolumeValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    value[:volumes_attributes].each do |_, attrs|
+      if attrs["capacity"].to_s.empty? || /\A\d+G?\Z/.match(attrs["capacity"].to_s).nil?
+        record.errors.add(attribute, _("Volume size #{attrs["capacity"]} is not valid"))
+      end
+    end
+  end
+end

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

@@ -5,7 +5,9 @@
               :keep_value => true, :unset => unset_password?,
               :help_block => _("e.g. eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9..."),
               :help_inline => documentation_button('/foreman_kubevirt/0.x/index.html#4.1SettingComputeResourceTokenandX509CAvalues',
-                                                   root_url: 'https://theforeman.org/plugins') %>
+              :root_url => 'https://theforeman.org/plugins'),
+              :id => "compute_resource_password"
+%>
 
 <%= 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/_volume.html.erb

@@ -1,6 +1,10 @@
 <% if f.object.type.nil? || f.object.type == 'persistentVolumeClaim' %>
+  <% if @set %>
+    <% @set.errors[:vm_attrs].each do | error| %>
+      <%= alert :class => 'alert-danger', :header => '', :text => error %>
+    <% end %>
+  <% end %>
   <% storage_classes = compute_resource.storage_classes %>
-
   <%= select_f f, :storage_class,
                   compute_resource.storage_classes_for_select,
                   :id,
@@ -10,7 +14,6 @@
                   :label_size => "col-md-2",
                   :disabled => !new_vm,
                   :class => "col-md-2" %>
-
   <%= text_f f,:capacity, :label => _('Size (GB)'), :label_size => "col-md-2", :disabled => !new_vm, :class => "col-md-2 pvc-size" %>
 
   <% bootable = f.object.boot_order.nil? ? false : f.object.bootable %>

data/lib/foreman_kubevirt/engine.rb

@@ -62,6 +62,8 @@ module ForemanKubevirt
         require "fog/kubevirt/compute/models/networkattachmentdef"
         require File.expand_path("../../app/models/concerns/fog_extensions/kubevirt/network", __dir__)
         Fog::Kubevirt::Compute::Networkattachmentdef.send(:include, ::FogExtensions::Kubevirt::Network)
+        ComputeAttribute.send :include, ForemanKubevirt::ComputeAttributeExtensions
+
       rescue StandardError => e
         Rails.logger.warn "Foreman-Kubevirt: skipping engine hook (#{e})"
       end

data/lib/foreman_kubevirt/version.rb

@@ -1,3 +1,3 @@
 module ForemanKubevirt
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

data/test/unit/foreman_kubevirt_test.rb

@@ -126,9 +126,22 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     exception = assert_raise(Foreman::Exception) do
       compute_resource.create_vm(vm_args)
     end
-    assert_match(/Capacity was not found/, exception.message)
+    assert_match(/Volume size  is not valid/, exception.message)
   end
 
+
+  test "should fail when creating a VM with not valid capacity" do
+    vm_args = NETWORK_BASED_VM_ARGS.deep_dup
+    vm_args["volumes_attributes"]["0"]["capacity"] = "TG"
+    Fog.mock!
+    compute_resource = new_kubevirt_vcr
+    exception = assert_raise(Foreman::Exception) do
+      compute_resource.create_vm(vm_args)
+    end
+    assert_match(/Volume size TG is not valid/, exception.message)
+  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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_kubevirt
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Moti Asayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.2
 description: Provision and manage Kubevirt Virtual Machines from Foreman.
 email:
 - masayag@redhat.com
@@ -70,7 +70,9 @@ files:
 - app/models/concerns/fog_extensions/kubevirt/server.rb
 - app/models/concerns/fog_extensions/kubevirt/vmnic.rb
 - app/models/concerns/fog_extensions/kubevirt/volume.rb
+- app/models/foreman_kubevirt/compute_attribute_extensions.rb
 - app/models/foreman_kubevirt/kubevirt.rb
+- app/validators/volume_validator.rb
 - app/views/api/v2/compute_resources/kubevirt.json.rabl
 - app/views/compute_resources/form/_kubevirt.html.erb
 - app/views/compute_resources/show/_kubevirt.html.erb