foreman_hyperv 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb57dc6dd0bcc2a285337c23b89ed22a80a503fa
-  data.tar.gz: 3aac593cc35eb225047ca473c5bc3f7f0bc4a334
+SHA256:
+  metadata.gz: 656e65f4adac7c822917eb7db0a43c4cfb00925448f314fcf4237a5a447b4b15
+  data.tar.gz: 39dc334e97cb77a6478b62f053e08164499f43f4cf0a1b765a1569ca2605dac7
 SHA512:
-  metadata.gz: c8dea6446ab0ef7359678fd49e02bce16eb9930195f95005d21100472d98d8ce282b9225e1a1f5dc186e402f5f7a15c52ed3eded0da2ce02293666416b6c663e
-  data.tar.gz: e77ff169aaa0c97f0db2f40658ea66fb579b75967e466cb553075d269099f098b747618070764bda6bdfcf72b9ba930675ab745c2d237a1186ca90f8d04ae42e
+  metadata.gz: 94b74fbae8688e6cf3a61d8215f351dba23d188a97b3064a5d65450528552b7931e3b08bc9cee7c2ced1ab4c4386f97de481f2bc27d4ebec7fb5b43c3f550d69
+  data.tar.gz: '040623999a84a2baace36ba43c1e29f18072bb833bf0b18d1adaf5ad93bc6f5a5994f2e6fbf984849820fd31cc10b260ef9c935a20b44daffc9ddb5650b7ae47'

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.0.4 2018-04-06
+
+- Allow setting a VM-wide VLAN value
+- Default to using the first available cluster if one exists
+  - This allows the use of clustered machines, as long as all machines are set up with identical switch configurations
+- Support the creation of legacy NICs for BIOS
+  - Requires fog-hyperv 0.0.8 / d4bf0fcdef691573c25744c3f3930961d5f767d6
+
 ## v0.0.3 2018-01-15
 
 - Fix association of VMs by MAC address (case issue)

data/README.md

@@ -4,7 +4,11 @@
 
 Microsoft Hyper-V compute resource for Foreman
 
-Uses the in-development `fog-hyperv` gem found [here](https://github.com/ace13/fog-hyperv).
+Uses the in-development `fog-hyperv` gem found [here](https://github.com/ananace/fog-hyperv).
+
+## Nota Bene
+
+Currently the plugin only supports Hyper-V hosts where the names are well defined in DNS and in connection strings, avoid using IP addresses for now.
 
 ## Testing/Installing
 
@@ -16,7 +20,7 @@ Do bear in mind that this is still very early in development, so plenty of issue
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/ace13/foreman_hyperv.
+Bug reports and pull requests are welcome on GitHub at https://github.com/ananace/foreman_hyperv.
 
 ## License
 

data/app/models/concerns/fog_extensions/hyperv/network_adapter.rb

@@ -24,6 +24,14 @@ module FogExtensions
       def network=(net)
         self.switch_name = net
       end
+
+      def type
+        is_legacy
+      end
+
+      def type=(type)
+        self.is_legacy = type
+      end
     end
   end
 end

data/app/models/concerns/fog_extensions/hyperv/server.rb

@@ -34,10 +34,16 @@ module FogExtensions
         identity.present?
       end
 
-      def interfaces_attributes=(_attributes); end
+      def interfaces_attributes=(_attributes)
+        true
+      end
 
       def volumes_attributes=(_attributes); end
 
+      def vlan; end
+
+      def vlan=(_vlan); end
+
       def secure_boot_enabled=(enabled)
         @secure_boot = enabled
         return unless persisted?
@@ -56,6 +62,10 @@ module FogExtensions
         restart(force: true)
       end
 
+      def state
+        attributes[:state].to_s.upcase
+      end
+
       def stop
         requires :name, :computer_name
         service.stop_vm options.merge(

data/app/models/foreman_hyperv/hyperv.rb

@@ -55,8 +55,11 @@ module ForemanHyperv
       args = vm_instance_defaults.merge(args.to_hash.deep_symbolize_keys)
       client.logger.debug "Creating a VM with arguments; #{args}"
 
+      args[:computer_name] = args[:computer_name].presence || '.'
+
       pre_create = {
         boot_device: 'NetworkAdapter',
+        computer_name: args[:computer_name],
         generation: args[:generation].to_i,
         memory_startup: args[:memory_startup].presence.to_i,
         name: args[:name],
@@ -87,6 +90,8 @@ module ForemanHyperv
       create_interfaces(vm, args[:interfaces_attributes])
       create_volumes(vm, args[:volumes_attributes])
 
+      vm.set_vlan(args[:vlan].to_i) if args[:vlan].presence && vm.respond_to?(:set_vlan)
+
       vm
     rescue StandardError => e
       vm.stop turn_off: true
@@ -160,13 +165,18 @@ module ForemanHyperv
       if client.respond_to? :supports_clusters?
         return [] unless client.supports_clusters?
       end
-      client.clusters rescue []
+
+      client.clusters
+    rescue
+      []
     end
 
     def hypervisor
       client.hosts.first
     end
 
+    delegate :servers, to: :client
+
     protected
 
     def client
@@ -198,6 +208,9 @@ module ForemanHyperv
           nic.mac = iface[:mac]
           nic.dynamic_mac_address_enabled = false
         end
+        if vm.generation == 1 && iface[:type].present?
+          nic.is_legacy = Foreman::Cast.to_bool(iface[:type])
+        end
         nic.save
       end
 

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

@@ -1,13 +1,31 @@
 <%= javascript_tag("$(document).on('ContentLoad', tfm.numFields.initAll)") %>
 
 <%
-  clusters = compute_resource.clusters.map(&:name)
-  computers = (f.object.cluster || compute_resource).hosts.map(&:name)
+  cluster_errors = []
+  begin
+    clusters = compute_resource.clusters.map(&:name)
+    f.object.cluster_name = clusters.first if clusters.count == 1
+    computers = (compute_resource.clusters.find {|c| c.name == f.object.cluster_name } || compute_resource).hosts.map(&:name)
+  rescue Fog::Hyperv::Errors::PSError => ex
+    # In case of errors
+    clusters = []
+    computers = []
+
+    cluster_errors << ex
+  end
 %>
-<% if clusters.any? %>
-<%= select_f f, :cluster_name, clusters, :to_s, :to_s %>
-<%= select_f f, :computer_name, computers, :to_s, :to_s %>
+<% if clusters.any? -%>
+  <%= select_f f, :cluster_name, clusters, :to_s, :to_s, { include_blank: true }, label: _('Cluster') %>
+  <% if computers.count > 1 -%>
+    <%= select_f f, :computer_name, computers, :to_s, :to_s, {}, label: _('Computer Name') %>
+  <% end -%>
 <% end %>
+<% cluster_errors.each do |err| -%>
+<div class="alert alert-warning alert-dismissable">
+  <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+  <span class="pficon pficon-error-circle-o "></span> <span class="text"><%= err.message %> (<%= err.info %>)</span>
+</div>
+<% end -%>
 
 <%
   generations = [ [1, 'Generation 1 (BIOS)'], [2, 'Generation 2 (UEFI)'] ]
@@ -25,6 +43,9 @@
 <%= checkbox_f f, :dynamic_memory_enabled, { label: _('Use Dynamic Memory'), onchange: 'hypervDynamicMemoryChange(this);' }, 'true', 'false' %>
 
 <% if new_host %>
+<%   if compute_resource.servers.new().respond_to? :set_vlan -%>
+<%= text_f f, :vlan, label: _('VLAN'), label_size: 'col-md-2' %>
+<%   end -%>
 <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
 <%= checkbox_f f, :start, { checked: (checked == '1'), help_inline: _("Power ON this machine"), label: _('Start'), label_size: "col-md-2"} if new_host && controller_name != "compute_attributes" %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%
-    networks = (f.object.computer || compute_resource).switches.map do |sw|
+    networks = compute_resource.switches.map do |sw|
       [ sw.name, "#{sw.name}#{sw.switch_type ? " (#{sw.switch_type})" : nil}" ]
     end
 %>
@@ -7,4 +7,5 @@
 <%= select_f f, :network, networks, :first, :last,
                 { include_blank: true },
                 { label: _('Network switch'), :label_size => 'col-md-3' } %>
+<%= checkbox_f f, :type, { label: _('Legacy Network Adapter'), label_size: 'col-md-3', disabled: !new_host }, 'true', 'false' %>
 <%= f.hidden_field :id %>

data/lib/foreman_hyperv/version.rb

@@ -1,3 +1,3 @@
 module ForemanHyperv
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_hyperv
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-hyperv
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Hyper-V as a Compute Resource for Foreman