foreman_xen 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a768b8f50ae86ddbca9006df5a6e123c68aece8a4fa6c96df9151715f573afb7
-  data.tar.gz: 18e355d925f7eba0ec1694acc7fb0f7483b1b6cd382bb103d543578d7377e065
+  metadata.gz: 0cdd6bcd07d559882c14aeb7ff2846ec2374c6d2d499106a3164a8e69209d667
+  data.tar.gz: adec7df98c1e131f35aeac15e51fd13c74df1db4149a352f656c7cde6715344a
 SHA512:
-  metadata.gz: ecbe4656e00f66a2481fb02b4048b5dce3da8056981b04d7aba390a782f1462a48e1f3e4c38c210bdd75c6e0b12cca2d51204ebeeba0799d0fe717d7fc8cecf7
-  data.tar.gz: cf688e43aaf39170f504e0a1f980ba087d506d9a2f3e4b75b0db748b536cad8d8487d59a596e7b7e6c8a150d197ab719986ab7387d5cdf9949fc306fa03c02b6
+  metadata.gz: aa108f441b9d2b3fa86d6a92c0dfad446bef725be5516564071b155757c85c457384d1e1024331ff077e641b1d2e75a0a9cc558cf58c979979b0a2a4866e5499
+  data.tar.gz: e50152b26e2a04b0b341f9e7ee3e3143ff2611595ab7d773f1da82b2690b91fe59b7586ab3290e459882e1a314e7f0657d7f34c314b8d66a5969f4f9273576c2

data/README.md

@@ -15,15 +15,16 @@ Please see the Foreman manual for further instructions:
 
 ## Compatibility
 
-| Foreman Version | Plugin Version        |
-|:--------------- |:--------------------- |
-| >=1.5, <1.8     | 0.0.x (unmaintained)  |
-| >=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 (unmaintained)  |
-| >=1.14, <1.17   | 0.5.x                 |
-| >=1.17          | 0.6.x                 |
+| Foreman Version | Plugin Version       |
+| --------------- | ---------------------|
+| >=1.5, <1.8     | 0.0.x (unmaintained) |
+| >=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 (unmaintained) |
+| >=1.14, <1.17   | 0.5.x (unmaintained) |
+| >=1.17, <1.18   | 0.6.x (unmaintained) |
+| >=1.18          | 0.7.x                |
 
 ## Support
 

data/app/controllers/foreman_xen/snapshots_controller.rb

@@ -59,6 +59,7 @@ module ForemanXen
           snapshots = @compute_resource.find_snapshots
           snapshots.each do |snapshot|
             next unless snapshot.reference == ref
+
             name = snapshot.name
             snapshot.destroy
             notice "Successfully deleted snapshot #{snapshot.name}"

data/app/helpers/xen_compute_helper.rb

@@ -31,19 +31,17 @@ module XenComputeHelper
       compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])
       attribute_map = filter_compute_attributes(attribute_map, compute_attributes)
     elsif new
-      attribute_map[:cpu_count]  = new.vcpus_max ? new.vcpus_max : nil
-      attribute_map[:memory_min] = new.memory_static_min ? new.memory_static_min : nil
-      attribute_map[:memory_max] = new.memory_static_max ? new.memory_static_max : nil
+      attribute_map[:cpu_count]  = new.vcpus_max || nil
+      attribute_map[:memory_min] = new.memory_static_min || nil
+      attribute_map[:memory_max] = new.memory_static_max || nil
       if new.vbds
         vdi = new.vbds.first.vdi
         if vdi
-          attribute_map[:volume_selected] = vdi.sr.uuid ? vdi.sr.uuid : nil
+          attribute_map[:volume_selected] = vdi.sr.uuid || nil
           attribute_map[:volume_size]     = vdi.virtual_size ? (vdi.virtual_size.to_i / 1_073_741_824).to_s : nil
         end
       end
-      if new.vifs
-        attribute_map[:network_selected] = new.vifs.first.network.name ? new.vifs.first.network.name : nil
-      end
+      attribute_map[:network_selected] = new.vifs.first.network.name || nil if new.vifs
     end
     attribute_map
   end

data/app/models/foreman_xen/xenserver.rb

@@ -19,6 +19,7 @@ module ForemanXen
       Foreman::Logging.exception("Failed retrieving xenserver vm by uuid #{uuid}", e)
       raise(ActiveRecord::RecordNotFound) if e.message.include?('HANDLE_INVALID')
       raise(ActiveRecord::RecordNotFound) if e.message.include?('VM.get_record: ["SESSION_INVALID"')
+
       raise e
     end
 
@@ -92,6 +93,7 @@ module ForemanXen
 
           available_hypervisors.each do |host|
             next unless sr.reference == host.suspend_image_sr
+
             found                     = true
             subresults[:name]         = sr.name
             subresults[:display_name] = sr.name + '(' + host.hostname + ')'
@@ -161,10 +163,11 @@ module ForemanXen
 
     def find_snapshots_for_vm(vm)
       return [] if vm.snapshots.empty?
+
       tmps = begin
         client.servers.templates.select(&:is_a_snapshot)
-      rescue
-        []
+             rescue
+               []
       end
       retval = []
       tmps.each do |snapshot|
@@ -176,8 +179,8 @@ module ForemanXen
     def find_snapshots
       tmps = begin
         client.servers.templates.select(&:is_a_snapshot)
-      rescue
-        []
+             rescue
+               []
       end
       tmps.sort_by(&:name)
     end
@@ -185,6 +188,7 @@ module ForemanXen
     def new_vm(attr = {})
       test_connection
       return unless errors.empty?
+
       opts = vm_instance_defaults.merge(attr.to_hash).symbolize_keys
 
       %i[networks volumes].each do |collection|
@@ -368,8 +372,7 @@ module ForemanXen
     protected
 
     def client
-      @client ||= ::Fog::Compute.new(
-        :provider                     => 'XenServer',
+      @client ||= Fog::XenServer::Compute.new(
         :xenserver_url                => url,
         :xenserver_username           => user,
         :xenserver_password           => password,
@@ -423,6 +426,7 @@ module ForemanXen
 
     def get_hypervisor_host(args)
       return client.hosts.first unless args[:hypervisor_host] != ''
+
       client.hosts.find { |host| host.name == args[:hypervisor_host] }
     end
 

data/lib/foreman_xen/engine.rb

@@ -42,11 +42,11 @@ module ForemanXen
     config.to_prepare do
       begin
         # extend fog xen server and image models.
-        require 'fog/compute/xen_server/models/server'
+        require 'fog/xenserver/compute/models/server'
         require File.expand_path('../../app/models/concerns/fog_extensions/xenserver/server', __dir__)
         require File.expand_path('../../app/models/concerns/foreman_xen/host_helper_extensions', __dir__)
 
-        Fog::Compute::XenServer::Server.send(:include, ::FogExtensions::Xenserver::Server)
+        Fog::XenServer::Compute::Server.send(:include, ::FogExtensions::Xenserver::Server)
         ::HostsHelper.send(:include, ForemanXen::HostHelperExtensions)
       rescue => e
         Rails.logger.warn "Foreman-Xen: skipping engine hook (#{e})"

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/foreman_xen/vnc_tunnel.rb

@@ -51,6 +51,7 @@ class VNCTunnel
         begin
           data = @client_socket.read_nonblock(1024)
           break if data.nil?
+
           @srv_socket.write(data)
         rescue IO::WaitReadable => e
           IO.select([@client_socket])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Pavel Nemirovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-xenserver
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,9 +81,9 @@ files:
 - locale/Makefile
 - test/foreman_xen_test.rb
 - test/test_helper.rb
-homepage: http://github.com/theforeman/foreman-xen
+homepage: https://github.com/theforeman/foreman-xen
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []