Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ManageIQ/manageiq-providers-vmware
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 28b2dde90a7be85072f50eddcd41f94ebedb439b
Choose a base ref
..
head repository: ManageIQ/manageiq-providers-vmware
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 411284dd89e59bb64152ef5f95d294b5f705624b
Choose a head ref
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ def load_transitions
end

def before_scan
signal(:start_snapshot)
queue_signal(:start_snapshot, role: "ems_operations", queue_name: vm.queue_name_for_ems_operations)
end

def after_scan
signal(:snapshot_delete)
queue_signal(:snapshot_delete, role: "ems_operations", queue_name: vm.queue_name_for_ems_operations)
end

def call_snapshot_create
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ def raw_remove_snapshot_by_description(description, refresh = false)
end

def remove_snapshot_by_description(description, refresh = false, retry_time = nil)
if (ext_management_system.kind_of?(ManageIQ::Providers::Vmware::InfraManager) && ManageIQ::Providers::Vmware::InfraManager.use_vim_broker? && MiqVimBrokerWorker.available?) || host.nil? || host.state == "on"
if host.nil? || host.state == "on"
raw_remove_snapshot_by_description(description, refresh)
else
if retry_time.nil?
12 changes: 3 additions & 9 deletions lib/manageiq/providers/vmware.rb
Original file line number Diff line number Diff line change
@@ -9,15 +9,9 @@ def self.seed
end

def self.vix_disk_lib_installed?
return false unless RbConfig::CONFIG["host_os"].match?(/linux/i)

begin
require 'VMwareWebService/VixDiskLib/VixDiskLib'
return true
rescue Exception
# It is ok if we hit an error, it just means the library is not available to load.
end

require "ffi-vix_disk_lib"
true
rescue LoadError
false
end
end
3 changes: 2 additions & 1 deletion manageiq-providers-vmware.gemspec
Original file line number Diff line number Diff line change
@@ -14,8 +14,9 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,lib}/**/*"]

s.add_dependency("fog-vcloud-director", ["~> 0.3.0"])
s.add_dependency "vmware_web_service", "~>1.0.0"
s.add_dependency "ffi-vix_disk_lib", "~>1.1"
s.add_dependency "rbvmomi", "~>2.0.0"
s.add_dependency "vmware_web_service", "~>1.0"
s.add_dependency "vsphere-automation-sdk", "~>0.2.1"

s.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"