foreman_xen 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82588f8bd4f2f6f33d10b123dfcecfdd449d2fe8
-  data.tar.gz: 5cdf29eb501090f3c2397bf7a977e4f104d50551
+  metadata.gz: 2f1adce9377bfddcc90e390be4aa635db21f6c60
+  data.tar.gz: 7c2030f9848d832fc4cdffa24b498f4f10ecc748
 SHA512:
-  metadata.gz: 64537d69aedd74fe08e745c251480d85572060b74cacce53bd97448b96174197caf46ebf28c2ef480835673427fdde39e45ef2ee31b07aa623e0458ddd8736c1
-  data.tar.gz: 1f7f9efa28c5f05995f835464f86d2d5ea9d1605a44665f477defafa109220758005f27a1bb773ad5a645e5057f099606681af9873a9a6d0c77c1c06b89cb178
+  metadata.gz: 524c2b085d36a462d32c8c7d6ec3105739da12881a17a6ec8fe8ff9e6a1d906e9fbe7630211b5d5912380bbdf26aa205ec4d4153d7b3abf680bf10681639ba44
+  data.tar.gz: 8618ce64c4381cb460af72b5443efb079b88014a37547f4c53b211705106015291c014bf7682417f01dcdb03a664ec3cc18586999c1bbe56a8c56cb97d7e51a5

data/README.md

@@ -12,11 +12,12 @@ Please see the Foreman manual for further instructions:
 
 ## Compatibility
 
-| Foreman Version | Plugin Version |
-|:--------------- |:-------------- |
-| >=1.5, <1.8     | 0.0.x          |
-| >=1.8.1, <1.10  | 0.1.x          |
-| >=1.10          | 0.2.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                 |
+| >=1.11          | 0.3.x                 |
 
 ## Support
 

data/app/controllers/foreman_xen/snapshots_controller.rb

@@ -1,7 +1,7 @@
 module ForemanXen
   class SnapshotsController < ::ApplicationController
     helper :all
-    skip_before_filter :verify_authenticity_token
+    skip_before_action :verify_authenticity_token
 
     # GET - foreman_xen/snapshots/:host_id
     def show
@@ -15,15 +15,12 @@ module ForemanXen
             @snapshots = @compute_resource.find_snapshots_for_vm(vm)
           else
             process_error(:error_msg => "Error retrieving compute resource #{@host.compute_resource_id} from provider.")
-            return
           end
         end
       elsif @host.nil?
         process_error(:error_msg => "No host found with ID: #{id}.")
-        return
       else
         process_error(:error_msg => "No compute resource found for host with ID: #{id}.")
-        return
       end
     end
 
@@ -39,23 +36,15 @@ module ForemanXen
           vm.revert(ref)
           vm.start
           process_success(
-            :success_msg => "Succesfully reverted and powered on #{@host.name}",
+            :success_msg => "Successfully reverted and powered on #{@host.name}",
             :success_redirect => "/foreman_xen/snapshots/#{id}"
           )
-          return
         else
           process_error(:error_msg => "Error retrieving host information for #{@host.name}")
-          return
         end
       else
         process_error(:error_msg => "Error retrieving compute resource information for #{@host.name}")
-        return
       end
-      process_success(
-        :success_msg => ("Succesfully reverted #{@host.name}"),
-        :success_redirect => "/foreman_xen/snapshots/#{id}"
-      )
-      nil
     end
 
     # GET = foreman_xen/snapshots/delete
@@ -72,22 +61,19 @@ module ForemanXen
             next unless snapshot.reference == ref
             name = snapshot.name
             snapshot.destroy
-            notice "Succesfully deleted snapshot #{snapshot.name}"
+            notice "Successfully deleted snapshot #{snapshot.name}"
             break
           end
         else
-          process_error(:error_msg => ("Error retrieving host information for host id: #{id}"))
-          return
+          process_error(:error_msg => "Error retrieving host information for host id: #{id}")
         end
       else
-        process_error(:error_msg => ("Error retrieving compute resource information for host id: #{id}"))
-        return
+        process_error(:error_msg => "Error retrieving compute resource information for host id: #{id}")
       end
       process_success(
-        :success_msg => ("Succesfully deleted snapshot: #{name}"),
+        :success_msg => "Successfully deleted snapshot: #{name}",
         :success_redirect => "/foreman_xen/snapshots/#{id}"
       )
-      nil
     end
 
     # GET = foreman_xen/snapshots/:id/new
@@ -100,7 +86,6 @@ module ForemanXen
           process_error(
             :error_msg => "Error retrieving compute information for compute resource id: #{@host.compute_resource_id}"
           )
-          return
         end
       else
         process_error(:error_msg => "Error retrieving host information for host id: #{id}")
@@ -113,52 +98,39 @@ module ForemanXen
       name = params[:name]
       if name.nil? || name == ''
         process_error(:error_msg => 'You must supply a name.')
-        return
       end
       @host = get_host_by_id(id)
       if !@host.nil?
         @compute_resource = get_compute_resource_by_host_id(id)
       else
         process_error(:error_msg => "Error retrieving host information for host id #{id}")
-        return
       end
       if !@compute_resource.nil?
         vm = @compute_resource.find_vm_by_uuid(@host.uuid)
         if !vm.nil?
           vm.snapshot(name)
           process_success(
-            :success_msg => "Succesfully created snapshot #{name} for #{@host.name}",
+            :success_msg => "Successfully created snapshot #{name} for #{@host.name}",
             :success_redirect => "/foreman_xen/snapshots/#{id}"
           )
-          return
         else
           process_error(:error_msg => "Error retrieving compute resource information for #{@host.name}")
-          return
         end
       else
         process_error(:error_msg => "Error retrieving compute provider information for #{@host.name}")
-        return
       end
     end
 
     def snapshots_url
       case params[:action]
       when 'show'
-        return '/'
+        '/'
       when 'new'
         id = params[:id]
-        if id.nil?
-          return '/'
-        else
-          return "/foreman_xen/snapshots/#{id}"
-        end
+        id.nil? ? '/' : "/foreman_xen/snapshots/#{id}"
       when 'create'
         id = params[:id]
-        if id.nil?
-          return '/'
-        else
-          return "/foreman_xen/snapshots/#{id}/new"
-        end
+        id.nil? ? '/' : "/foreman_xen/snapshots/#{id}/new"
       end
     end
 

data/app/models/foreman_xen/xenserver.rb

@@ -155,7 +155,7 @@ module ForemanXen
 
     def find_snapshots_for_vm(vm)
       return [] if vm.snapshots.empty?
-      tmps   = begin
+      tmps = begin
         client.servers.templates.select(&:is_a_snapshot)
       rescue
         []
@@ -198,17 +198,13 @@ module ForemanXen
       if builtin_template_name != '' && custom_template_name != ''
         logger.info "custom_template_name: #{custom_template_name}"
         logger.info "builtin_template_name: #{builtin_template_name}"
-        fail 'you can select at most one template type'
+        raise 'you can select at most one template type'
       end
       begin
         vm = nil
         logger.info "create_vm(): custom_template_name: #{custom_template_name}"
         logger.info "create_vm(): builtin_template_name: #{builtin_template_name}"
-        if custom_template_name != ''
-          vm = create_vm_from_custom args
-        else
-          vm = create_vm_from_builtin args
-        end
+        vm = (custom_template_name != '') ? create_vm_from_custom(args) : create_vm_from_builtin(args)
         vm.set_attribute('name_description', 'Provisioned by Foreman')
         cpus = args[:vcpus_max]
         if vm.vcpus_max.to_i < cpus.to_i
@@ -231,15 +227,15 @@ module ForemanXen
       mem_max = args[:memory_max]
       mem_min = args[:memory_min]
 
-      if args[:hypervisor_host] != ''
-        host = client.hosts.find { |host| host.name == args[:hypervisor_host] }
-        logger.info "create_vm_from_builtin: host : #{host.name}"
-      else
-        host = client.hosts.first
-        logger.info "create_vm_from_builtin: host : #{host.name}"
-      end
+      host = if args[:hypervisor_host] != ''
+               client.hosts.find { |host| host.name == args[:hypervisor_host] }
+             else
+               client.hosts.first
+             end
+
+      logger.info "create_vm_from_builtin: host : #{host.name}"
 
-      fail 'Memory max cannot be lower than Memory min' if mem_min.to_i > mem_max.to_i
+      raise 'Memory max cannot be lower than Memory min' if mem_min.to_i > mem_max.to_i
       vm = client.servers.new :name          => args[:name],
                               :affinity      => host,
                               :template_name => args[:custom_template_name]
@@ -283,18 +279,21 @@ module ForemanXen
     end
 
     def create_vm_from_builtin(args)
+      mem_max = args[:memory_max]
+      mem_min = args[:memory_min]
+
+      host = if args[:hypervisor_host] != ''
+               client.hosts.find { |host| host.name == args[:hypervisor_host] }
+             else
+               client.hosts.first
+             end
+
+      logger.info "create_vm_from_builtin: host : #{host.name}"
+
       builtin_template_name = args[:builtin_template_name]
       builtin_template_name = builtin_template_name.to_s
 
-      if args[:hypervisor_host] != ''
-        host = client.hosts.find { |host| host.name == args[:hypervisor_host] }
-        logger.info "create_vm_from_builtin: host : #{host.name}"
-      else
-        host = client.hosts.first
-        logger.info "create_vm_from_builtin: host : #{host.name}"
-      end
-
-      storage_repository = client.storage_repositories.find { |sr| sr.uuid == "#{args[:VBDs][:sr_uuid]}" }
+      storage_repository = client.storage_repositories.find { |sr| sr.uuid == (args[:VBDs][:sr_uuid]).to_s }
 
       gb   = 1_073_741_824 # 1gb in bytes
       size = args[:VBDs][:physical_size].to_i * gb
@@ -303,8 +302,6 @@ module ForemanXen
                                 :description        => "#{args[:name]}-disk_1",
                                 :virtual_size       => size.to_s
 
-      mem_max      = args[:memory_max]
-      mem_min      = args[:memory_min]
       other_config = {}
       if builtin_template_name != ''
         template     = client.servers.builtin_templates.find { |tmp| tmp.name == args[:builtin_template_name] }
@@ -336,10 +333,10 @@ module ForemanXen
 
     def console(uuid)
       vm = find_vm_by_uuid(uuid)
-      fail 'VM is not running!' unless vm.ready?
+      raise 'VM is not running!' unless vm.ready?
 
       console = vm.service.consoles.find { |c| c.__vm == vm.reference && c.protocol == 'rfb' }
-      fail "No console for vm #{vm.name}" if console.nil?
+      raise "No console for vm #{vm.name}" if console.nil?
 
       session_ref = (vm.service.instance_variable_get :@connection).instance_variable_get :@credentials
       full_url    = "#{console.location}&session_id=#{session_ref}"

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

@@ -8,6 +8,4 @@
 <% end -%>
 <%= link_to_function _("Test Connection"), "testConnection(this)", :class => "btn + #{hypervisor.nil? ? "btn-default" : "btn-success"}", :'data-url' => test_connection_compute_resources_path %>
 
-<%= image_tag('/assets/spinner.gif', :id => 'test_connection_indicator', :class => 'hide') %>
-
-
+<%= hidden_spinner('', :id => 'test_connection_indicator') %>

data/lib/foreman_xen/engine.rb

@@ -15,7 +15,7 @@ module ForemanXen
 
     initializer 'foreman_xen.register_plugin', :after => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_xen do
-        requires_foreman '>= 1.8'
+        requires_foreman '>= 1.11'
         # Register xen compute resource in foreman
         compute_resource ForemanXen::Xenserver
       end
@@ -24,7 +24,7 @@ module ForemanXen
     config.to_prepare do
       begin
         # extend fog xen server and image models.
-        require 'fog/xenserver/models/compute/server'
+        require 'fog/compute/xen_server/models/server'
         require File.expand_path('../../../app/models/concerns/fog_extensions/xenserver/server', __FILE__)
         require File.expand_path('../../../app/models/concerns/foreman_xen/host_helper_extensions', __FILE__)
 

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'.freeze
 end

data/lib/foreman_xen/vnc_tunnel.rb

@@ -29,7 +29,7 @@ class VNCTunnel
         listen client_srv
       else
         logger.error "Cannot connect to the conosle located at #{uri} reason: #{header}"
-        fail "Cannot connect to the console located at #{uri} reason: #{header}"
+        raise "Cannot connect to the console located at #{uri} reason: #{header}"
       end
     end
   end
@@ -76,7 +76,7 @@ class VNCTunnel
           data = @srv_socket.read_nonblock(1024)
           @client_socket.write(data)
         rescue IO::WaitReadable => e
-          retry unless (IO.select([@srv_socket], nil, nil, 60)).nil?
+          retry unless IO.select([@srv_socket], nil, nil, 60).nil?
         end
       end
     rescue EOFError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Pavel Nemirovsky
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fog-xenserver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement