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/vmware_web_service
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 41d2894b4e524b495821ee6277846810c142020d
Choose a base ref
..
head repository: ManageIQ/vmware_web_service
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a5262ac5831f4ae513552d9d697ddcac2a8a6340
Choose a head ref
Showing with 561 additions and 509 deletions.
  1. +1 −1 .rubocop_local.yml
  2. +5 −1 lib/VMwareWebService/MiqHostDatastoreSystem.rb
  3. +42 −42 lib/VMwareWebService/MiqVim.rb
  4. +2 −2 lib/VMwareWebService/MiqVimClientBase.rb
  5. +6 −2 lib/VMwareWebService/MiqVimCluster.rb
  6. +9 −6 lib/VMwareWebService/MiqVimDataStore.rb
  7. +1 −1 lib/VMwareWebService/MiqVimDump.rb
  8. +5 −1 lib/VMwareWebService/MiqVimEventHistoryCollector.rb
  9. +15 −12 lib/VMwareWebService/MiqVimEventMonitor.rb
  10. +15 −11 lib/VMwareWebService/MiqVimFolder.rb
  11. +15 −12 lib/VMwareWebService/MiqVimHost.rb
  12. +68 −68 lib/VMwareWebService/MiqVimInventory.rb
  13. +13 −10 lib/VMwareWebService/MiqVimPerfHistory.rb
  14. +50 −50 lib/VMwareWebService/MiqVimUpdate.rb
  15. +7 −7 lib/VMwareWebService/MiqVimVdlMod.rb
  16. +102 −100 lib/VMwareWebService/MiqVimVm.rb
  17. +3 −0 lib/VMwareWebService/VimService.rb
  18. +15 −7 lib/VMwareWebService/VixDiskLib/VixDiskLib.rb
  19. +15 −15 lib/VMwareWebService/VixDiskLib/VixDiskLibServer.rb
  20. +26 −27 lib/VMwareWebService/VixDiskLib/vdl_wrapper.rb
  21. +16 −0 lib/VMwareWebService/logging.rb
  22. +2 −0 lib/vmware_web_service.rb
  23. +0 −6 spec/VMwareWebService/MiqVimClientBase_spec.rb
  24. +2 −2 test/VMwareWebService/MiqVimFolderTest.rb
  25. +2 −2 test/VMwareWebService/MiqVimPerfTest.rb
  26. +2 −2 test/VMwareWebService/MiqVimVmTest.rb
  27. +2 −2 test/VMwareWebService/addDiskTest.rb
  28. +2 −2 test/VMwareWebService/addHostToCluster.rb
  29. +2 −2 test/VMwareWebService/addNasDatastoreByName.rb
  30. +2 −2 test/VMwareWebService/addStandaloneHost.rb
  31. +2 −2 test/VMwareWebService/alarmManagerTest.rb
  32. +2 −2 test/VMwareWebService/alarmTest.rb
  33. +2 −2 test/VMwareWebService/annotation.rb
  34. +2 −2 test/VMwareWebService/browserTest.rb
  35. +2 −2 test/VMwareWebService/cloneAsyncTest.rb
  36. +2 −2 test/VMwareWebService/cloneCsmTest.rb
  37. +2 −2 test/VMwareWebService/cloneDvsTest.rb
  38. +2 −2 test/VMwareWebService/cloneTest.rb
  39. +2 −2 test/VMwareWebService/cpuAffinity.rb
  40. +2 −2 test/VMwareWebService/cpuMemTest.rb
  41. +2 −2 test/VMwareWebService/createFolderTest.rb
  42. +2 −2 test/VMwareWebService/createNfsDatastore.rb
  43. +2 −2 test/VMwareWebService/customFieldsManagerTest.rb
  44. +2 −2 test/VMwareWebService/customizationSpecManagerTest.rb
  45. +2 −2 test/VMwareWebService/diskPerf.rb
  46. +1 −1 test/VMwareWebService/emsRefreshTest.rb
  47. +2 −2 test/VMwareWebService/enterMaintenanceMode.rb
  48. +2 −2 test/VMwareWebService/eventHistoryTest.rb
  49. +2 −2 test/VMwareWebService/hostAdvancedOptionTest.rb
  50. +2 −2 test/VMwareWebService/hostConfigSpecTest.rb
  51. +2 −2 test/VMwareWebService/hostDatastoreTest.rb
  52. +2 −2 test/VMwareWebService/hostDvsTest.rb
  53. +2 −2 test/VMwareWebService/hostFirewallTest.rb
  54. +2 −2 test/VMwareWebService/hostNetworkTest.rb
  55. +2 −2 test/VMwareWebService/hostServiceTest.rb
  56. +2 −2 test/VMwareWebService/hostSnmpSystemTest.rb
  57. +2 −2 test/VMwareWebService/hostStandByTest.rb
  58. +2 −2 test/VMwareWebService/hostStorageSystem.rb
  59. +2 −2 test/VMwareWebService/hostTest.rb
  60. +2 −2 test/VMwareWebService/hostVirtualNicManagerTest.rb
  61. +2 −2 test/VMwareWebService/linkedCloneFromTemplateTest.rb
  62. +2 −2 test/VMwareWebService/linkedCloneTest.rb
  63. +2 −2 test/VMwareWebService/list_evm_snapshots.rb
  64. +2 −2 test/VMwareWebService/logTest.rb
  65. +2 −2 test/VMwareWebService/migrateTest.rb
  66. +2 −2 test/VMwareWebService/rebootHostTest.rb
  67. +2 −2 test/VMwareWebService/remoteDisplayVnc.rb
  68. +2 −2 test/VMwareWebService/rm_evm_snapshots.rb
  69. +2 −2 test/VMwareWebService/rtPerfTest.rb
  70. +2 −2 test/VMwareWebService/selectionSpecBrokerClassTest.rb
  71. +2 −2 test/VMwareWebService/selectionSpecBrokerInstanceTest.rb
  72. +2 −2 test/VMwareWebService/selectionSpecVimClassTest.rb
  73. +2 −2 test/VMwareWebService/selectionSpecVimTest.rb
  74. +2 −2 test/VMwareWebService/shutdownHostTest.rb
  75. +2 −2 test/VMwareWebService/snapshotTest.rb
  76. +2 −2 test/VMwareWebService/templateTest.rb
  77. +2 −2 test/VMwareWebService/thinProvisioned.rb
  78. +2 −2 test/VMwareWebService/vdlBrowserTest.rb
  79. +2 −2 test/VMwareWebService/vimEventMonitory.rb
  80. +2 −2 test/VMwareWebService/vimInventory.rb
  81. +2 −2 test/VMwareWebService/virtualApp.rb
  82. +2 −2 test/VMwareWebService/virtualDiskPerf.rb
  83. +2 −2 test/VMwareWebService/vmsafe.rb
  84. +2 −2 test/VixDiskLib/api_test.rb
  85. +2 −2 test/VixDiskLib/cookedTest.rb
  86. +2 −2 test/VixDiskLib/rawTest11.rb
  87. +3 −3 test/VixDiskLib/vixDiskModTest.rb
2 changes: 1 addition & 1 deletion .rubocop_local.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AllCops:
Exclude:
- lib/VMwareWebService/wsdl41/vimws25MappingRegistry.rb
GlobalVars:
Style/GlobalVars:
AllowedVariables:
# Logger
- $vim_log
6 changes: 5 additions & 1 deletion lib/VMwareWebService/MiqHostDatastoreSystem.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
require 'VMwareWebService/logging'

class MiqHostDatastoreSystem
include VMwareWebService::Logging

attr_reader :invObj

def initialize(dssMor, invObj)
@@ -44,7 +48,7 @@ def addNasDatastoreByName(dsName, accessMode = "readWrite")
localPath = dsh.info.nas.name
type = dsh.info.nas.type

$vim_log.info "MiqHostDatastoreSystem.addNasDatastoreByName: remoteHost = #{remoteHost}, remotePath = #{remotePath}, localPath = #{localPath}"
logger.info "MiqHostDatastoreSystem.addNasDatastoreByName: remoteHost = #{remoteHost}, remotePath = #{remotePath}, localPath = #{localPath}"
createNasDatastore(remoteHost, remotePath, localPath, accessMode, type)
end
end # class MiqHostDatastoreSystem
84 changes: 42 additions & 42 deletions lib/VMwareWebService/MiqVim.rb
Original file line number Diff line number Diff line change
@@ -67,24 +67,24 @@ def self.pre_load=(val)
end

def getVimVm(path)
$vim_log.info "MiqVimMod.getVimVm: called"
logger.info "MiqVimMod.getVimVm: called"
miqVimVm = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find VM: #{path}" unless (vmh = virtualMachines_locked[path])
miqVimVm = MiqVimVm.new(self, conditionalCopy(vmh))
end
$vim_log.info "MiqVimMod.getVimVm: returning object #{miqVimVm.object_id}"
logger.info "MiqVimMod.getVimVm: returning object #{miqVimVm.object_id}"
(miqVimVm)
end # def getVimVm

def getVimVmByMor(vmMor)
$vim_log.info "MiqVimMod.getVimVmByMor: called"
logger.info "MiqVimMod.getVimVmByMor: called"
miqVimVm = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find VM: #{vmMor}" unless (vmh = virtualMachinesByMor_locked[vmMor])
miqVimVm = MiqVimVm.new(self, conditionalCopy(vmh))
end
$vim_log.info "MiqVimMod.getVimVmByMor: returning object #{miqVimVm.object_id}"
logger.info "MiqVimMod.getVimVmByMor: returning object #{miqVimVm.object_id}"
(miqVimVm)
end # def getVimVmByMor

@@ -93,36 +93,36 @@ def getVimVmByMor(vmMor)
# matches the criteria defined by the filter.
#
def getVimVmByFilter(filter)
$vim_log.info "MiqVimMod.getVimVmByFilter: called"
logger.info "MiqVimMod.getVimVmByFilter: called"
miqVimVm = nil
@cacheLock.synchronize(:SH) do
vms = applyFilter(virtualMachinesByMor_locked.values, filter)
raise MiqException::MiqVimResourceNotFound, "getVimVmByFilter: Could not find VM matching filter" if vms.empty?
miqVimVm = MiqVimVm.new(self, conditionalCopy(vms[0]))
end
$vim_log.info "MiqVimMod.getVimVmByFilter: returning object #{miqVimVm.object_id}"
logger.info "MiqVimMod.getVimVmByFilter: returning object #{miqVimVm.object_id}"
(miqVimVm)
end # def getVimVmByFilter

def getVimHost(name)
$vim_log.info "MiqVimMod.getVimHost: called"
logger.info "MiqVimMod.getVimHost: called"
miqVimHost = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find Host: #{name}" unless (hh = hostSystems_locked[name])
miqVimHost = MiqVimHost.new(self, conditionalCopy(hh))
end
$vim_log.info "MiqVimMod.getVimHost: returning object #{miqVimHost.object_id}"
logger.info "MiqVimMod.getVimHost: returning object #{miqVimHost.object_id}"
(miqVimHost)
end # def getVimHost

def getVimHostByMor(hMor)
$vim_log.info "MiqVimMod.getVimHostByMor: called"
logger.info "MiqVimMod.getVimHostByMor: called"
miqVimHost = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find Host: #{hMor}" unless (hh = hostSystemsByMor_locked[hMor])
miqVimHost = MiqVimHost.new(self, conditionalCopy(hh))
end
$vim_log.info "MiqVimMod.getVimHostByMor: returning object #{miqVimHost.object_id}"
logger.info "MiqVimMod.getVimHostByMor: returning object #{miqVimHost.object_id}"
(miqVimHost)
end # def getVimHostByMor

@@ -131,140 +131,140 @@ def getVimHostByMor(hMor)
# matches the criteria defined by the filter.
#
def getVimHostByFilter(filter)
$vim_log.info "MiqVimMod.getVimHostByFilter: called"
logger.info "MiqVimMod.getVimHostByFilter: called"
miqVimHost = nil
@cacheLock.synchronize(:SH) do
ha = applyFilter(hostSystemsByMor_locked.values, filter)
raise MiqException::MiqVimResourceNotFound, "getVimHostByFilter: Could not find Host matching filter" if ha.empty?
miqVimHost = MiqVimHost.new(self, conditionalCopy(ha[0]))
end
$vim_log.info "MiqVimMod.getVimHostByFilter: returning object #{miqVimHost.object_id}"
logger.info "MiqVimMod.getVimHostByFilter: returning object #{miqVimHost.object_id}"
(miqVimHost)
end # def getVimHostByFilter

def getVimFolder(name)
$vim_log.info "MiqVimMod.getVimFolder: called"
logger.info "MiqVimMod.getVimFolder: called"
miqVimFolder = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find Folder: #{name}" unless (fh = folders_locked[name])
miqVimFolder = MiqVimFolder.new(self, conditionalCopy(fh))
end
$vim_log.info "MiqVimMod.getVimFolder: returning object #{miqVimFolder.object_id}"
logger.info "MiqVimMod.getVimFolder: returning object #{miqVimFolder.object_id}"
(miqVimFolder)
end # def getVimFolder

def getVimFolderByMor(fMor)
$vim_log.info "MiqVimMod.getVimFolderByMor: called"
logger.info "MiqVimMod.getVimFolderByMor: called"
miqVimFolder = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find Folder: #{fMor}" unless (fh = foldersByMor_locked[fMor])
miqVimFolder = MiqVimFolder.new(self, conditionalCopy(fh))
end
$vim_log.info "MiqVimMod.getVimFolderByMor: returning object #{miqVimFolder.object_id}"
logger.info "MiqVimMod.getVimFolderByMor: returning object #{miqVimFolder.object_id}"
(miqVimFolder)
end # def getVimFolderByMor

def getVimFolderByFilter(filter)
$vim_log.info "MiqVimMod.getVimFolderByFilter: called"
logger.info "MiqVimMod.getVimFolderByFilter: called"
miqVimFolder = nil
@cacheLock.synchronize(:SH) do
folders = applyFilter(foldersByMor_locked.values, filter)
raise MiqException::MiqVimResourceNotFound, "getVimFolderByFilter: Could not find folder matching filter" if folders.empty?
miqVimFolder = MiqVimFolder.new(self, conditionalCopy(folders[0]))
end
$vim_log.info "MiqVimMod.getVimFolderByFilter: returning object #{miqVimFolder.object_id}"
logger.info "MiqVimMod.getVimFolderByFilter: returning object #{miqVimFolder.object_id}"
(miqVimFolder)
end # def getVimFolderByFilter

#
# Cluster
#
def getVimCluster(name)
$vim_log.info "MiqVimMod.getVimCluster: called"
logger.info "MiqVimMod.getVimCluster: called"
miqVimCluster = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find Cluster: #{name}" unless (ch = clusterComputeResources_locked[name])
miqVimCluster = MiqVimCluster.new(self, conditionalCopy(ch))
end
$vim_log.info "MiqVimMod.getVimCluster: returning object #{miqVimCluster.object_id}"
logger.info "MiqVimMod.getVimCluster: returning object #{miqVimCluster.object_id}"
(miqVimCluster)
end # def getVimCluster

def getVimClusterByMor(cMor)
$vim_log.info "MiqVimMod.getVimClusterByMor: called"
logger.info "MiqVimMod.getVimClusterByMor: called"
miqVimCluster = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find Cluster: #{cMor}" unless (ch = clusterComputeResourcesByMor_locked[cMor])
miqVimCluster = MiqVimCluster.new(self, conditionalCopy(ch))
end
$vim_log.info "MiqVimMod.getVimClusterByMor: returning object #{miqVimCluster.object_id}"
logger.info "MiqVimMod.getVimClusterByMor: returning object #{miqVimCluster.object_id}"
(miqVimCluster)
end # def getVimClusterByMor

def getVimClusterByFilter(filter)
$vim_log.info "MiqVimMod.getVimClusterByFilter: called"
logger.info "MiqVimMod.getVimClusterByFilter: called"
miqVimCluster = nil
@cacheLock.synchronize(:SH) do
clusters = applyFilter(clusterComputeResourcesByMor_locked.values, filter)
raise MiqException::MiqVimResourceNotFound, "getVimClusterByFilter: Could not find Cluster matching filter" if clusters.empty?
miqVimCluster = MiqVimCluster.new(self, conditionalCopy(clusters[0]))
end
$vim_log.info "MiqVimMod.getVimClusterByFilter: returning object #{miqVimCluster.object_id}"
logger.info "MiqVimMod.getVimClusterByFilter: returning object #{miqVimCluster.object_id}"
(miqVimCluster)
end # def getVimClusterByFilter

#
# DataStore
#
def getVimDataStore(dsName)
$vim_log.info "MiqVimMod.getVimDataStore: called"
logger.info "MiqVimMod.getVimDataStore: called"
miqVimDs = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find datastore: #{dsName}" unless (dsh = dataStores_locked[dsName])
miqVimDs = MiqVimDataStore.new(self, conditionalCopy(dsh))
end
$vim_log.info "MiqVimMod.getVimDataStore: returning object #{miqVimDs.object_id}"
logger.info "MiqVimMod.getVimDataStore: returning object #{miqVimDs.object_id}"
(miqVimDs)
end

def getVimDataStoreByMor(dsMor)
$vim_log.info "MiqVimMod.getVimDataStoreByMor: called"
logger.info "MiqVimMod.getVimDataStoreByMor: called"
miqVimDs = nil
@cacheLock.synchronize(:SH) do
raise MiqException::MiqVimResourceNotFound, "Could not find datastore: #{dsMor}" unless (dsh = dataStoresByMor_locked[dsMor])
miqVimDs = MiqVimDataStore.new(self, conditionalCopy(dsh))
end
$vim_log.info "MiqVimMod.getVimDataStoreByMor: returning object #{miqVimDs.object_id}"
logger.info "MiqVimMod.getVimDataStoreByMor: returning object #{miqVimDs.object_id}"
(miqVimDs)
end

def getVimPerfHistory
miqVimPh = MiqVimPerfHistory.new(self)
$vim_log.info "MiqVimMod.getVimPerfHistory: returning object #{miqVimPh.object_id}"
logger.info "MiqVimMod.getVimPerfHistory: returning object #{miqVimPh.object_id}"
(miqVimPh)
end

def getVimEventHistory(eventFilterSpec = nil, pgSize = 20)
miqVimEh = MiqVimEventHistoryCollector.new(self, eventFilterSpec, pgSize)
$vim_log.info "MiqVimMod.getVimEventHistory: returning object #{miqVimEh.object_id}"
logger.info "MiqVimMod.getVimEventHistory: returning object #{miqVimEh.object_id}"
(miqVimEh)
end

def getMiqCustomFieldsManager
miqVimCfm = MiqCustomFieldsManager.new(self)
$vim_log.info "MiqVimMod.getMiqCustomFieldsManager: returning object #{miqVimCfm.object_id}"
logger.info "MiqVimMod.getMiqCustomFieldsManager: returning object #{miqVimCfm.object_id}"
(miqVimCfm)
end

def getVimAlarmManager
miqVimAm = MiqVimAlarmManager.new(self)
$vim_log.info "MiqVimMod.getVimAlarmManager: returning object #{miqVimAm.object_id}"
logger.info "MiqVimMod.getVimAlarmManager: returning object #{miqVimAm.object_id}"
(miqVimAm)
end

def getVimCustomizationSpecManager
miqVimCsm = MiqVimCustomizationSpecManager.new(self)
$vim_log.info "MiqVimMod.getVimCustomizationSpecManager: returning object #{miqVimCsm.object_id}"
logger.info "MiqVimMod.getVimCustomizationSpecManager: returning object #{miqVimCsm.object_id}"
(miqVimCsm)
end

@@ -279,36 +279,36 @@ def disconnect
def start_monitor_updates_thread(preLoad)
checkForOrphanedMonitors
log_prefix = "MiqVim.initialize (#{@connId})"
$vim_log.info "#{log_prefix}: starting update monitor thread" if $vim_log
logger.info "#{log_prefix}: starting update monitor thread"
@updateThread = Thread.new { monitor(preLoad) }
@updateThread[:vim_connection_id] = connId
$vim_log.info "#{log_prefix}: waiting for update monitor to become ready" if $vim_log
logger.info "#{log_prefix}: waiting for update monitor to become ready"
until @updateMonitorReady
raise @error unless @error.nil?
break unless @updateThread.alive?
Thread.pass
end
$vim_log.info "#{log_prefix}: update monitor ready" if $vim_log
logger.info "#{log_prefix}: update monitor ready"
end

def checkForOrphanedMonitors
log_prefix = "MiqVim.checkForOrphanedMonitors (#{@connId})"
$vim_log.debug "#{log_prefix}: called..."
logger.debug "#{log_prefix}: called..."
Thread.list.each do |thr|
next unless thr[:vim_connection_id] == connId
$vim_log.error "#{log_prefix}: Terminating orphaned update monitor <#{thr.object_id}>"
logger.error "#{log_prefix}: Terminating orphaned update monitor <#{thr.object_id}>"
thr.raise "Orphaned update monitor (#{@connId}) <#{thr.object_id}>, terminated by <#{Thread.current.object_id}>"
thr.wakeup
end
$vim_log.debug "#{log_prefix}: done."
logger.debug "#{log_prefix}: done."
end

def monitor(preLoad)
log_prefix = "MiqVim.monitor (#{@connId})"
begin
monitorUpdates(preLoad)
rescue Exception => err
$vim_log.info "#{log_prefix}: returned from monitorUpdates via #{err.class} exception" if $vim_log
logger.info "#{log_prefix}: returned from monitorUpdates via #{err.class} exception"
@error = err
end
end
@@ -318,9 +318,9 @@ def shutdown_monitor_updates_thread
stopUpdateMonitor
begin
if @updateThread != Thread.current && @updateThread.alive?
$vim_log.info "#{log_prefix}: waiting for Update Monitor Thread...Starting" if $vim_log
logger.info "#{log_prefix}: waiting for Update Monitor Thread...Starting"
@updateThread.join
$vim_log.info "#{log_prefix}: waiting for Update Monitor Thread...Complete" if $vim_log
logger.info "#{log_prefix}: waiting for Update Monitor Thread...Complete"
end
rescue
end
4 changes: 2 additions & 2 deletions lib/VMwareWebService/MiqVimClientBase.rb
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ def receiveTimeout
end

def connect
$vim_log.debug "#{self.class.name}.connect(#{@connId}): #{$PROGRAM_NAME} #{ARGV.join(' ')}" if $vim_log.debug?
logger.debug "#{self.class.name}.connect(#{@connId}): #{$PROGRAM_NAME} #{ARGV.join(' ')}".debug?
@connLock.synchronize(:EX) do
return if @connected
login(@sic.sessionManager, @username, @password)
@@ -59,7 +59,7 @@ def connect
end

def disconnect
$vim_log.debug "#{self.class.name}.disconnect(#{@connId}): #{$PROGRAM_NAME} #{ARGV.join(' ')}" if $vim_log.debug?
logger.debug "#{self.class.name}.disconnect(#{@connId}): #{$PROGRAM_NAME} #{ARGV.join(' ')}".debug?
@connLock.synchronize(:EX) do
return unless @connected
logout(@sic.sessionManager)
8 changes: 6 additions & 2 deletions lib/VMwareWebService/MiqVimCluster.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
require 'VMwareWebService/logging'

class MiqVimCluster
include VMwareWebService::Logging

attr_reader :name, :invObj

def initialize(invObj, ch)
@@ -44,9 +48,9 @@ def addHost(hostName, userName, password, *args)
cs.vmFolder = ah[:vmFolder] unless ah[:vmFolder].nil?
end

$vim_log.info "MiqVimCluster(#{@invObj.server}, #{@invObj.username}).addHost: calling addHost_Task" if $vim_log
logger.info "MiqVimCluster(#{@invObj.server}, #{@invObj.username}).addHost: calling addHost_Task"
taskMor = @invObj.addHost_Task(@cMor, cspec, ah[:asConnected].to_s, ah[:resourcePool], ah[:license])
$vim_log.info "MiqVimCluster(#{@invObj.server}, #{@invObj.username}).addHost: returned from addHost_Task" if $vim_log
logger.info "MiqVimCluster(#{@invObj.server}, #{@invObj.username}).addHost: returned from addHost_Task"
return taskMor unless ah[:wait]
waitForTask(taskMor)
end # def addHost
15 changes: 9 additions & 6 deletions lib/VMwareWebService/MiqVimDataStore.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
require 'sync'
require 'util/miq-extensions' # Required patch to open-uri for get_file_content
require 'VMwareWebService/logging'

class MiqVimDataStore
include VMwareWebService::Logging

attr_reader :accessible, :multipleHostAccess, :name, :dsType, :url, :freeBytes, :capacityBytes, :uncommitted, :invObj

def initialize(invObj, dsh)
@@ -127,13 +130,13 @@ def dsSearch(typeClass, pattern = nil, path = nil, pathOnly = true, recurse = tr

taskMor = nil
if recurse
$vim_log.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsSearch: calling searchDatastoreSubFolders_Task" if $vim_log
logger.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsSearch: calling searchDatastoreSubFolders_Task"
taskMor = @invObj.searchDatastoreSubFolders_Task(browserMor, dsPath, searchSpec)
$vim_log.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsSearch: returned from searchDatastoreSubFolders_Task" if $vim_log
logger.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsSearch: returned from searchDatastoreSubFolders_Task"
else
$vim_log.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsSearch: calling searchDatastore_Task" if $vim_log
logger.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsSearch: calling searchDatastore_Task"
taskMor = @invObj.searchDatastore_Task(browserMor, dsPath, searchSpec)
$vim_log.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsSearch: returned from searchDatastore_Task" if $vim_log
logger.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsSearch: returned from searchDatastore_Task"
end

retObj = waitForTask(taskMor)
@@ -200,9 +203,9 @@ def dsHash_locked(refresh = false)
hdbs.sortFoldersFirst = "true"
end

$vim_log.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsHash_locked: calling searchDatastoreSubFolders_Task" if $vim_log
logger.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsHash_locked: calling searchDatastoreSubFolders_Task"
taskMor = @invObj.searchDatastoreSubFolders_Task(browser_locked, "[#{@name}]", searchSpec)
$vim_log.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsHash_locked: returned from searchDatastoreSubFolders_Task" if $vim_log
logger.info "MiqVimDataStore(#{@invObj.server}, #{@invObj.username}).dsHash_locked: returned from searchDatastoreSubFolders_Task"

retObj = waitForTask(taskMor)
retObj = [retObj] unless retObj.kind_of?(Array)
Loading