foreman_xen 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d42bd1079a60f578243092cb5873746eb8a15e66
-  data.tar.gz: 872e16466d0548666a5be9d48b42edded9979e61
+SHA256:
+  metadata.gz: 60403177171c892741a3eb0699ecc3bf29f2b5c623ebfb35ef5a386bb8918f14
+  data.tar.gz: 583ced398c58708ec2f19a73e5039d37bc2220168c317ebf46af862e629489bd
 SHA512:
-  metadata.gz: 17738c40f2791e50814fe5903a6b5772ac757a52c80295c5fd78cfecdce26760d166cc2cf3d141cb1acba839edd1cef542bcf24648c4ccd53fc7a2b37a24b22b
-  data.tar.gz: 2b4efc0e617eca3850860a1b7543d437d3b0bf90b23cdc80314b80d843c5cbe31648d365ce6b13953834017b84133724b0ea85d644fbd36c5f6ba88bac3e5d9d
+  metadata.gz: 18ab12113402d323cd5e17c92667930f1aa54d130f25b250ba3f8dc25570c23289220a26c04a41ad79c4a24f06ea2c53bf8d5590d3940e03e62e6186b7f4c511
+  data.tar.gz: 59325b39b543829b2d7442f86b723e08162994e9d7583f3b5e4223a06067aeb6f6e4fdd07953f2d0341aa05e30e66a98d3eb0c04006ac5343423bcc6af1b65e8

data/README.md

@@ -21,8 +21,9 @@ Please see the Foreman manual for further instructions:
 | >=1.8.1, <1.10  | 0.1.x (unmaintained)  |
 | >=1.10, <1.11   | 0.2.x (unmaintained)  |
 | >=1.11, <1.13   | 0.3.x (unmaintained)  |
-| >=1.13, <1.14   | 0.4.x                 |
-| >=1.14          | 0.5.x                 |
+| >=1.13, <1.14   | 0.4.x (unmaintained)  |
+| >=1.14, <1.17   | 0.5.x                 |
+| >=1.17          | 0.6.x (unreleased)    |
 
 ## Support
 

data/app/controllers/foreman_xen/snapshots_controller.rb

@@ -96,9 +96,7 @@ module ForemanXen
     def create
       id   = params[:id]
       name = params[:name]
-      if name.nil? || name == ''
-        process_error(:error_msg => 'You must supply a name.')
-      end
+      process_error(:error_msg => 'You must supply a name.') if name.nil? || name == ''
       @host = get_host_by_id(id)
       if !@host.nil?
         @compute_resource = get_compute_resource_by_host_id(id)

data/app/helpers/xen_compute_helper.rb

@@ -55,9 +55,7 @@ module XenComputeHelper
     elsif params && params['host'] && params['host']['compute_profile_id']
       compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])
     end
-    if compute_attributes
-      attribute_map = filter_compute_attributes(attribute_map, compute_attributes)
-    end
+    attribute_map = filter_compute_attributes(attribute_map, compute_attributes) if compute_attributes
     attribute_map
   end
 
@@ -78,9 +76,7 @@ module XenComputeHelper
       attribute_map[:volume_size]     = compute_attributes['VBDs']['physical_size']
       attribute_map[:volume_selected] = compute_attributes['VBDs']['sr_uuid']
     end
-    if compute_attributes['VIFs']
-      attribute_map[:network_selected] = compute_attributes['VIFs']['print']
-    end
+    attribute_map[:network_selected] = compute_attributes['VIFs']['print'] if compute_attributes['VIFs']
     attribute_map[:template_selected_custom]  = compute_attributes['custom_template_name']
     attribute_map[:template_selected_builtin] = compute_attributes['builtin_template_name']
     attribute_map[:cpu_count]                 = compute_attributes['vcpus_max']

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

@@ -41,7 +41,7 @@ module FogExtensions
       end
 
       def vm_description
-        _('%{cpus} CPUs and %{ram} memory') % { :cpus => vcpus_max, :ram => number_to_human_size(memory_max.to_i) }
+        format(_('%{cpus} CPUs and %{ram} memory'), :cpus => vcpus_max, :ram => number_to_human_size(memory_max.to_i))
       end
 
       def interfaces

data/app/models/foreman_xen/xenserver.rb

@@ -187,7 +187,7 @@ module ForemanXen
       return unless errors.empty?
       opts = vm_instance_defaults.merge(attr.to_hash).symbolize_keys
 
-      [:networks, :volumes].each do |collection|
+      %i[networks volumes].each do |collection|
         nested_attrs     = opts.delete("#{collection}_attributes".to_sym)
         opts[collection] = nested_attributes_for(collection, nested_attrs) if nested_attrs
       end
@@ -315,7 +315,7 @@ module ForemanXen
 
       if args[:xstools] == '1'
         # Add xs-tools ISO to newly created VMs
-        dvd_vdi = client.vdis.find { |isovdi| isovdi.name == 'xs-tools.iso' }
+        dvd_vdi = client.vdis.find { |isovdi| isovdi.name == 'xs-tools.iso' || isovdi.name == 'guest-tools.iso' }
         vbdconnectcd = {
           'vdi'                  => dvd_vdi,
           'vm'                   => vm.reference,

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.5.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Pavel Nemirovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-xenserver
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provision and manage XEN Server from Foreman