foreman_hyperv 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 095c817dd697a8c2bde70d4b2a4d4dad16eba039
-  data.tar.gz: 59761e7d008a15a913ee8951678c8467a5ed85ec
+  metadata.gz: 710168316d53c6c4bb3276fa02faa45a28c602bb
+  data.tar.gz: 484471496d5c678718430e539639d4d6bc4b38d3
 SHA512:
-  metadata.gz: 61ef39ff83c31aa3e9fd8b8a6c8151163b4eba692b8c54025c3ab0544e9c6b22990c44cdb5d71d7f3b81fe2ec5073def03354d513c0c8a6483ea3689724202f0
-  data.tar.gz: 35cc0657a3474aacb7033550580478fd4285599e290147fb95713f57c8a918b9f4fce48a7977d14574d39a7f21f74637be7dbc8e432497752e816cf0658a3bd7
+  metadata.gz: 19eb7700b2fc5030f2d4c7711d31dd3c77d5445b5442ac66e199cf7da0cdcd01c91609240a911e59036696411436f2a59e5e7314a10afef8ffdffed436f03245
+  data.tar.gz: 3a03d174196f13b3e8967f25c1eb23fb524f12919ede792dc8000ab8c34d5e88bb632182a4529a7e73740fcf288ec7a71261b7bfcbff33ee5a70a1646bdcb190

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## v0.0.2 2017-09-30
+
+- Add Dynamic memory settings
+- Add JS for disabling unavailable settings to improve UX
+- Fix secure boot setting to actually apply
+- Skip several unnecessary Hyper-V calls to improve performance
+- Improve VM properties view to look a little better and house another few nuggets of information
+
+## v0.0.1 2017-09-28
+
+- Initial release

data/README.md

@@ -1,5 +1,7 @@
 # Foreman Hyper-V
 
+[![Gem Version](https://badge.fury.io/rb/foreman_hyperv.svg)](https://badge.fury.io/rb/foreman_hyperv)
+
 Microsoft Hyper-V compute resource for Foreman
 
 Uses the in-development `fog-hyperv` gem found [here](https://github.com/ace13/fog-hyperv).

data/app/assets/javascripts/compute_resources/hyperv/base.js

@@ -1,6 +1,32 @@
-$(document).on('ContentLoad', hypervGenerationChange);
+function hypervGenerationChange(item) {
+    var toIter = ['#host_compute_attributes_secure_boot_enabled', '#compute_attribute_vm_attrs_secure_boot_enabled'];
+    gen = $(item).val();
 
-function hypervGenerationChange() {
-    gen = $('#host_compute_attributes_generation').val()
-    // $('#host_compute_attributes_secure_boot_enabled').disable()
+    if (gen == 1) {
+        for (var i = 0; i < toIter.length; ++i) {
+            $(toIter[i]).attr('disabled', true);
+        }
+    } else {
+        for (var i = 0; i < toIter.length; ++i) {
+            $(toIter[i]).removeAttr('disabled');
+        }
+    }
+}
+
+function hypervDynamicMemoryChange(item) {
+    var toIter = [
+        '#host_compute_attributes_memory_maximum',
+        '#host_compute_attributes_memory_minimum',
+        '#compute_attribute_vm_attrs_memory_maximum',
+        '#compute_attribute_vm_attrs_memory_minimum',
+    ];
+    if (item.checked) {
+        for (var i = 0; i < toIter.length; ++i) {
+            $(toIter[i]).removeAttr('disabled');
+        }
+    } else {
+        for (var i = 0; i < toIter.length; ++i) {
+            $(toIter[i]).attr('disabled', true);
+        }
+    }
 }

data/app/models/foreman_hyperv/hyperv.rb

@@ -15,10 +15,10 @@ module ForemanHyperv
     end
 
     def test_connection(options = {})
-      super options
+      super
       client.valid?
-    rescue Fog::Hyperv::Errors::ServiceError, ArgumentError, WinRM::WinRMAuthorizationError
-      false
+    rescue Fog::Hyperv::Errors::ServiceError, ArgumentError, WinRM::WinRMAuthorizationError => e
+      errors[:base] << e.message
     end
 
     def provided_attributes
@@ -53,11 +53,12 @@ module ForemanHyperv
 
     def create_vm(args = {})
       args = vm_instance_defaults.merge(args.to_hash.deep_symbolize_keys)
-      logger.debug "Creating a VM with arguments; #{args}"
+      client.logger.debug "Creating a VM with arguments; #{args}"
+
       pre_create = {
         boot_device: 'NetworkAdapter',
         generation: args[:generation].to_i,
-        memory_startup: args[:memory_startup].presence,
+        memory_startup: args[:memory_startup].presence.to_i,
         name: args[:name],
         no_vhd: true
       }
@@ -65,7 +66,9 @@ module ForemanHyperv
       vm = client.servers.create pre_create
 
       post_save = {
-        dynamic_memory_enabled: ActiveRecord::Type::Boolean.new.type_cast_from_user(args[:dynamic_memory_enabled]),
+        dynamic_memory_enabled: Foreman::Cast.to_bool(args[:dynamic_memory_enabled]),
+        memory_minimum: args[:memory_minimum].presence.to_i,
+        memory_maximum: args[:memory_maximum].presence.to_i,
         notes: args[:notes].presence,
         processor_count: args[:processor_count].to_i
       }
@@ -75,9 +78,9 @@ module ForemanHyperv
 
       vm.save if vm.dirty?
 
-      if vm.generation == 2 && !args[:secure_boot_enabled].nil?
+      if vm.generation == 2 && args[:secure_boot_enabled].present?
         f = vm.firmware
-        f.secure_boot = ActiveRecord::Type::Boolean.new.type_cast_from_user(args[:secure_boot_enabled]) ? :On : :Off
+        f.secure_boot = Foreman::Cast.to_bool(args[:secure_boot_enabled]) ? :On : :Off
         f.save if f.dirty?
       end
 
@@ -93,17 +96,20 @@ module ForemanHyperv
 
     def save_vm(uuid, attr)
       vm = find_vm_by_uuid(uuid)
-      logger.debug "Saving a VM with arguments; #{attr}"
+      client.logger.debug "Saving a VM with arguments; #{attr}"
       attr.each do |k, v|
         vm.send("#{k}=".to_sym, v) if vm.respond_to?("#{k}=".to_sym)
       end
-      if vm.generation == 2 && !args[:secure_boot_enabled].nil?
+
+      if vm.generation == 2 && attr[:secure_boot_enabled].present?
         f = vm.firmware
-        f.secure_boot = ActiveRecord::Type::Boolean.new.type_cast_from_user(args[:secure_boot_enabled]) ? :On : :Off
+        f.secure_boot = Foreman::Cast.to_bool(attr[:secure_boot_enabled]) ? :On : :Off
         f.save if f.dirty?
       end
+
       update_interfaces(vm, attr[:interfaces_attributes])
       update_volumes(vm, attr[:volumes_attributes])
+
       vm.save if vm.dirty?
       vm
     end
@@ -177,9 +183,9 @@ module ForemanHyperv
       vm.network_adapters.each(&:destroy)
 
       interfaces = nested_attributes_for :interfaces, attrs
-      logger.debug "Building interfaces with: #{interfaces}"
+      client.logger.debug "Building interfaces with: #{interfaces}"
       interfaces.each do |iface|
-        nic = vm.network_adapters.create name: iface[:name], switch_name: iface[:network]
+        nic = vm.network_adapters.new name: iface[:name], switch_name: iface[:network]
         if iface[:mac]
           nic.mac = iface[:mac]
           nic.dynamic_mac_address_enabled = false
@@ -200,7 +206,7 @@ module ForemanHyperv
 
     def create_volumes(vm, attrs)
       volumes = nested_attributes_for :volumes, attrs
-      logger.debug "Building volumes with: #{volumes}"
+      client.logger.debug "Building volumes with: #{volumes}"
       volumes.each do |vol|
         vhd = vm.vhds.create path: vm.folder_name + '\\' + vol[:path], size: vol[:size]
         vm.hard_drives.create path: vhd.path
@@ -210,7 +216,7 @@ module ForemanHyperv
 
     def update_interfaces(vm, attrs)
       interfaces = nested_attributes_for :interfaces, attrs
-      logger.debug "Updating interfaces with: #{interfaces}"
+      client.logger.debug "Updating interfaces with: #{interfaces}"
       interfaces.each do |interface|
         if interface[:id].blank? && interface[:_delete] != '1'
           nic = vm.network_adapters.create interface
@@ -232,14 +238,14 @@ module ForemanHyperv
 
     def update_volumes(vm, attrs)
       volumes = nested_attributes_for :volumes, attrs
-      logger.debug "Updating volumes with: #{volumes}"
+      client.logger.debug "Updating volumes with: #{volumes}"
       volumes.each do |volume|
         if volume[:_delete] == '1' && volume[:id].present?
-          hd = vm.hard_drives.get(path: volume[:path])
+          hd = vm.hard_drives.find { |h| h.id == volume[:id] }
           hd.vhd.destroy
           hd.destroy
         end
-        vm.hard_drives.create(path: volume[:path], size: volume[:size]) if volume[:id].blank?
+        vm.hard_drives.create(path: volume[:path], size: volume[:size]) if volume[:id].blank? && volume[:_delete] != '1'
       end
     end
   end

data/app/views/compute_resources_vms/form/hyperv/_base.html.erb

@@ -1,15 +1,19 @@
-<%#= compute_specific_js(compute_resource, 'base') %>
 <%= javascript_tag("$(document).on('ContentLoad', tfm.numFields.initAll)") %>
 
 <%
   generations = [ [1, 'Generation 1 (BIOS)'], [2, 'Generation 2 (UEFI)'] ]
 %>
-<%= select_f f, :generation, generations, :first, :last, {}, label: 'Generation', disabled: !new_host, onchange: 'hypervGenerationChange()'  %>
-<%= checkbox_f f, :secure_boot_enabled, { label: _('Use Secure Boot') }, 'true', 'false' %>
+<%= select_f f, :generation, generations, :first, :last, {}, label: 'Generation', disabled: !new_host, onchange: 'hypervGenerationChange(this);' %>
+<% if new_host || f.object.generation == 2 %>
+<%= checkbox_f f, :secure_boot_enabled, { label: _('Use Secure Boot'), disabled: f.object.generation == 1 }, 'true', 'false' %>
+<% end %>
 
 <%= counter_f f, :processor_count, label: _('CPUs'), label_size: 'col-md-2' %>
-<%= byte_size_f f, :memory_startup, class: 'col-md-2', label: _('Memory') %>
-<%= checkbox_f f, :dynamic_memory_enabled, { label: _('Use Dynamic Memory') }, 'true', 'false' %>
+<%= byte_size_f f, :memory_startup, class: 'col-md-2', label: _('Memory (Startup)') %>
+
+<%= byte_size_f f, :memory_maximum, class: 'col-md-2', label: _('Memory Maximum'), disabled: !f.object.dynamic_memory_enabled %>
+<%= byte_size_f f, :memory_minimum, class: 'col-md-2', label: _('Memory Minimum'), disabled: !f.object.dynamic_memory_enabled %>
+<%= checkbox_f f, :dynamic_memory_enabled, { label: _('Use Dynamic Memory'), onchange: 'hypervDynamicMemoryChange(this);' }, 'true', 'false' %>
 
 <% if new_host %>
 <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
@@ -18,3 +22,5 @@
 
 <%= textarea_f f, :notes, rows: '3', label: _('Notes') %>
 <%= f.hidden_field :id %>
+
+<%= compute_specific_js(compute_resource, 'base') %>

data/app/views/compute_resources_vms/show/_hyperv.html.erb

@@ -1,4 +1,18 @@
 <% title @vm.name %>
+<%
+  def memory_prop(method)
+    content_tag :tr do
+      result = content_tag(:td) do
+        method.to_s.humanize
+      end
+      result += content_tag(:td) do
+        value = @vm.send(method) rescue nil
+        value && number_to_human_size(value)
+      end
+      result
+    end
+  end
+%>
 
 <div class='col-md-12'>
   <table class="<%= table_css_classes %>">
@@ -8,11 +22,22 @@
     <tbody>
       <%= prop :id %>
       <%#= prop :cluster %>
-      <%= prop :memory_startup %>
+      <%= prop :name %>
+      <tr>
+        <td>Generation</td>
+        <td><%= @vm.generation == 1 ? 'Generation 1 (BIOS)' : 'Generation 2 (UEFI)' %></td>
+      </tr>
+      <% if @vm.generation != 1 %>
+        <tr>
+          <td>SecureBoot</td>
+          <td><%= @vm.firmware.secure_boot %></td>
+        </tr>
+      <% end %>
       <% if @vm.dynamic_memory_enabled %>
-        <%= prop :memory_minimum %>
-        <%= prop :memory_maximum %>
+        <%= memory_prop :memory_maximum %>
+        <%= memory_prop :memory_minimum %>
       <% end %>
+      <%= memory_prop :memory_startup %>
       <%= prop :public_ip_address %>
       <%= prop :mac %>
       <%= prop :processor_count %>

data/foreman_hyperv.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^test\/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'fog-hyperv', '~> 0.0.1'
+  spec.add_runtime_dependency 'fog-hyperv', '~> 0.0.2'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/foreman_hyperv/engine.rb

@@ -9,8 +9,19 @@ module ForemanHyperv
       end
     end
 
+    assets_to_precompile =
+      Dir.chdir(root) do
+        Dir['app/assets/javascripts/**/*'].map do |f|
+          f.split(File::SEPARATOR, 4).last
+        end
+      end
+
     initializer 'foreman_hyperv.assets.precompile' do |app|
-      app.config.assets.precompile += %w(compute_resources/hyperv/base.js)
+      app.config.assets.precompile += assets_to_precompile
+    end
+
+    initializer 'foreman_hyperv.configure_assets', group: :assets do
+      SETTINGS[:foreman_hyperv] = { assets: { precompile: assets_to_precompile } }
     end
 
     config.to_prepare do

data/lib/foreman_hyperv/version.rb

@@ -1,3 +1,3 @@
 module ForemanHyperv
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_hyperv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-hyperv
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -77,12 +77,12 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - app/assets/javascripts/compute_resources/hyperv/base.js
-- app/helpers/hyperv_helpers.rb
 - app/models/concerns/fog_extensions/hyperv/compute.rb
 - app/models/concerns/fog_extensions/hyperv/network_adapter.rb
 - app/models/concerns/fog_extensions/hyperv/server.rb

data/app/helpers/hyperv_helpers.rb

@@ -1,7 +0,0 @@
-module HypervHelpers
-  def hyperv_switches(compute)
-    compute.switches.map do |sw|
-      [sw.name, sw.name]
-    end
-  end
-end