vmware_web_service 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a933d34dfe1ff1fa21d1b492c50d01c722cf7753
-  data.tar.gz: 3929a0c260ffbc12b233cc1d231cb8a6099ccb83
+  metadata.gz: 006b481c986e6cad728640d1394bfbb13bd7a6ab
+  data.tar.gz: 4c33d39aefbedeec84d41631f49083153af2940b
 SHA512:
-  metadata.gz: 22034358f70338220bc5a27c993576013f5d77f31db4d734c57322e850ce6d9cf22d79c409fb4c116279367459530c7324a05a15efdfff5e31b9dd22f79c42bc
-  data.tar.gz: 48de5956d9b8550f6a0d3b1a1602dac9be75707efe696514360f5b1bd309c4b99be74ed3f47b36c9a50db922353a7e5e453aa3a644ff2c813f117d73d6323579
+  metadata.gz: 90f4d0600f05f832bf7269f03a06d445a5791a7307f6189be587d56234b8b939b30e58469a4bc20f9ff415794cdd637e8f9de83a39a6831478f70f94da236ab1
+  data.tar.gz: eb246f1531c6fc7dfd6dfaec639dfd4dc2d21c02b615de061de7b481d382862d0f1e8c3f17d63f19c5ccf735fac751aeb7ab35822a0a45577b748b8582c8a323

data/lib/VMwareWebService/MiqVimDataStore.rb

@@ -1,7 +1,4 @@
 require 'sync'
-
-require 'fs/MiqFS/MiqFS'
-require 'fs/VimDatastoreFS/VimDatastoreFS'
 require 'util/miq-extensions'  # Required patch to open-uri for get_file_content
 
 class MiqVimDataStore
@@ -265,9 +262,6 @@ class MiqVimDataStore
     end
   end
 
-  def getFs
-    (MiqFS.new(VimDatastoreFS, self))
-  end
 
   def dumpProps
     props = @invObj.getMoProp_local(@dsMor, "browser")["browser"]
@@ -287,7 +281,12 @@ class MiqVimDataStore
     raise "get_file_content not supported on [#{@invObj.about['fullName']}]" if $1.to_i < 3 || ($1.to_i == 3 && $2.to_i < 5)
 
     fileUrl = encode_datastore_url(filepath, @name)
-    options = {:http_basic_authentication => [@invObj.username, @invObj.password]}
+
+    options = {
+      :http_basic_authentication => [@invObj.username, @invObj.password],
+      :ssl_verify_mode           => OpenSSL::SSL::VERIFY_NONE
+    }
+
     if block_given?
       open(fileUrl, options) { |ret| yield(ret) }
     else

data/lib/VMwareWebService/MiqVimHost.rb

@@ -3,8 +3,7 @@ require 'sync'
 require 'enumerator'
 require "ostruct"
 
-require 'util/extensions/miq-hash'
-require 'util/miq-exception'
+require 'more_core_extensions/core_ext/hash'
 require 'VMwareWebService/MiqHostDatastoreSystem'
 require 'VMwareWebService/MiqHostStorageSystem'
 require 'VMwareWebService/MiqHostFirewallSystem'

data/lib/VMwareWebService/MiqVimVm.rb

@@ -3,10 +3,10 @@ require 'sync'
 require 'enumerator'
 require "ostruct"
 
-require 'util/extensions/miq-hash'
-require 'util/miq-exception'
+require 'more_core_extensions/core_ext/hash'
 require 'active_support/core_ext/object/try'
 
+require 'VMwareWebService/exception'
 require 'VMwareWebService/MiqVimVdlMod'
 require 'VMwareWebService/esx_thumb_print'
 require 'VMwareWebService/vcenter_thumb_print'
@@ -343,11 +343,11 @@ class MiqVimVm
     hasNetApp = hasSnapshot?(NETAPP_SNAPSHOT_NAME, false)
 
     if hasEvm || hasCh || hasVcb
-      raise MiqException::MiqVmSnapshotError, "VM has EVM and consolidate helper snapshots" if hasEvm && hasCh
-      raise MiqException::MiqVmSnapshotError, "VM already has an EVM snapshot"              if hasEvm
-      raise MiqException::MiqVmSnapshotError, "VM already has an VCB snapshot"              if hasVcb
-      raise MiqException::MiqVmSnapshotError, "VM already has a NetApp snapshot"            if hasNetApp
-      raise MiqException::MiqVmSnapshotError, "VM has a consolidate helper snapshot"
+      raise MiqException::MiqVimVmSnapshotError, "VM has EVM and consolidate helper snapshots" if hasEvm && hasCh
+      raise MiqException::MiqVimVmSnapshotError, "VM already has an EVM snapshot"              if hasEvm
+      raise MiqException::MiqVimVmSnapshotError, "VM already has an VCB snapshot"              if hasVcb
+      raise MiqException::MiqVimVmSnapshotError, "VM already has a NetApp snapshot"            if hasNetApp
+      raise MiqException::MiqVimVmSnapshotError, "VM has a consolidate helper snapshot"
     end
     createSnapshot(EVM_SNAPSHOT_NAME, desc, false, quiesce, wait, free_space_percent)
   end
@@ -476,7 +476,7 @@ class MiqVimVm
     end
 
     if ds_free_space < required_snapshot_space
-      raise MiqException::MiqVmSnapshotError, "Snapshot #{action} aborted.  Datastore <#{ds_name}> does not have enough free space.  Space Free:<#{ds_free_space}>  Required:<#{required_snapshot_space}>  Disk Percentage Used:<#{free_space_percent}>"
+      raise MiqException::MiqVimVmSnapshotError, "Snapshot #{action} aborted.  Datastore <#{ds_name}> does not have enough free space.  Space Free:<#{ds_free_space}>  Required:<#{required_snapshot_space}>  Disk Percentage Used:<#{free_space_percent}>"
     else
       $log.info "Snapshot #{action} pre-check OK.  Datastore <#{ds_name}> has enough free space.  Space Free:<#{ds_free_space}>  Required:<#{required_snapshot_space}>  Disk Percentage Used:<#{free_space_percent}>" if $log
     end

data/lib/VMwareWebService/VixDiskLib/VixDiskLibServer.rb

@@ -5,7 +5,6 @@
 $LOAD_PATH << File.expand_path(File.join(__dir__, "../.."))
 
 require 'drb/drb'
-require 'log4r'
 require 'time'
 require 'VMwareWebService/VixDiskLib/vdl_wrapper'
 

data/lib/VMwareWebService/VixDiskLib/vdl_wrapper.rb

@@ -2,7 +2,6 @@ require 'drb/drb'
 require 'sync'
 require 'ffi-vix_disk_lib/api_wrapper'
 require 'VMwareWebService/VimTypes'
-require 'log4r'
 require 'time'
 
 LOG_FILE    = ENV["LOG_FILE"]

data/lib/VMwareWebService/exception.rb

@@ -0,0 +1,14 @@
+module MiqException
+  class Error < RuntimeError; end
+
+  class MiqVimError < Error; end
+  class MiqVimBrokerStaleHandle < MiqVimError; end
+  class MiqVimBrokerUnavailable < MiqVimError; end
+  # MiqVimResourceNotFound is derived from RuntimeError to ensure it gets marshalled over DRB properly.
+  # TODO: Rename MiqException::Error class to avoid issues returning derived error classes over DRB.
+  #       Then change MiqVimResourceNotFound to derive from MiqVimError
+  class MiqVimResourceNotFound < RuntimeError; end
+
+  # MiqVimVm Errors
+  class MiqVimVmSnapshotError < MiqVimError; end
+end

data/lib/VMwareWebService/miq_fault_tolerant_vim.rb

@@ -1,5 +1,6 @@
 require 'VMwareWebService/MiqVim'
 require 'VMwareWebService/MiqVimBroker'
+require 'VMwareWebService/exception'
 
 class MiqFaultTolerantVim
   def initialize(*options)

data/lib/VMwareWebService/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -78,28 +78,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: more_core_extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.4
+        version: 1.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.4
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -217,89 +231,12 @@ files:
 - lib/VMwareWebService/VimTypes.rb
 - lib/VMwareWebService/VixDiskLib/VixDiskLib.rb
 - lib/VMwareWebService/VixDiskLib/VixDiskLibServer.rb
-- lib/VMwareWebService/VixDiskLib/test/api_test.rb
-- lib/VMwareWebService/VixDiskLib/test/cookedTest.rb
-- lib/VMwareWebService/VixDiskLib/test/fillDisk.rb
-- lib/VMwareWebService/VixDiskLib/test/rawCloneTest.rb
-- lib/VMwareWebService/VixDiskLib/test/rawTest.rb
-- lib/VMwareWebService/VixDiskLib/test/rawTest11.rb
-- lib/VMwareWebService/VixDiskLib/test/rawWriteTest.rb
-- lib/VMwareWebService/VixDiskLib/test/vixDiskModTest.rb
 - lib/VMwareWebService/VixDiskLib/vdl_wrapper.rb
 - lib/VMwareWebService/broker_sync_debug.rb
 - lib/VMwareWebService/broker_timeout.rb
 - lib/VMwareWebService/esx_thumb_print.rb
+- lib/VMwareWebService/exception.rb
 - lib/VMwareWebService/miq_fault_tolerant_vim.rb
-- lib/VMwareWebService/test/CustomizationSpec/sles10-x64-vanilla-cust-spec.xml
-- lib/VMwareWebService/test/CustomizationSpec/w2k8-x64-vanilla-cust-spec.xml
-- lib/VMwareWebService/test/MiqVimBrokerClient.rb
-- lib/VMwareWebService/test/MiqVimBrokerServer.rb
-- lib/VMwareWebService/test/MiqVimFolderTest.rb
-- lib/VMwareWebService/test/MiqVimPerfTest.rb
-- lib/VMwareWebService/test/MiqVimVmTest.rb
-- lib/VMwareWebService/test/addDiskTest.rb
-- lib/VMwareWebService/test/addHostToCluster.rb
-- lib/VMwareWebService/test/addNasDatastoreByName.rb
-- lib/VMwareWebService/test/addStandaloneHost.rb
-- lib/VMwareWebService/test/alarmManagerTest.rb
-- lib/VMwareWebService/test/alarmTest.rb
-- lib/VMwareWebService/test/annotation.rb
-- lib/VMwareWebService/test/brokerClientServerStats.rb
-- lib/VMwareWebService/test/brokerConnectionLockTest.rb
-- lib/VMwareWebService/test/brokerLoadTest.rb
-- lib/VMwareWebService/test/brokerObjCountTest.rb
-- lib/VMwareWebService/test/browserTest.rb
-- lib/VMwareWebService/test/cloneAsyncTest.rb
-- lib/VMwareWebService/test/cloneCsmTest.rb
-- lib/VMwareWebService/test/cloneDvsTest.rb
-- lib/VMwareWebService/test/cloneTest.rb
-- lib/VMwareWebService/test/cpuAffinity.rb
-- lib/VMwareWebService/test/cpuMemTest.rb
-- lib/VMwareWebService/test/createFolderTest.rb
-- lib/VMwareWebService/test/createNfsDatastore.rb
-- lib/VMwareWebService/test/customFieldsManagerTest.rb
-- lib/VMwareWebService/test/customizationSpecManagerTest.rb
-- lib/VMwareWebService/test/diskPerf.rb
-- lib/VMwareWebService/test/emsRefreshTest.rb
-- lib/VMwareWebService/test/enterMaintenanceMode.rb
-- lib/VMwareWebService/test/eventHistoryTest.rb
-- lib/VMwareWebService/test/hostAdvancedOptionTest.rb
-- lib/VMwareWebService/test/hostConfigSpecTest.rb
-- lib/VMwareWebService/test/hostDatastoreTest.rb
-- lib/VMwareWebService/test/hostDvsTest.rb
-- lib/VMwareWebService/test/hostFirewallTest.rb
-- lib/VMwareWebService/test/hostNetworkTest.rb
-- lib/VMwareWebService/test/hostServiceTest.rb
-- lib/VMwareWebService/test/hostSnmpSystemTest.rb
-- lib/VMwareWebService/test/hostStandByTest.rb
-- lib/VMwareWebService/test/hostStorageSystem.rb
-- lib/VMwareWebService/test/hostTest.rb
-- lib/VMwareWebService/test/hostVirtualNicManagerTest.rb
-- lib/VMwareWebService/test/linkedCloneFromTemplateTest.rb
-- lib/VMwareWebService/test/linkedCloneTest.rb
-- lib/VMwareWebService/test/list_evm_snapshots.rb
-- lib/VMwareWebService/test/logStatusTest.rb
-- lib/VMwareWebService/test/logTest.rb
-- lib/VMwareWebService/test/migrateTest.rb
-- lib/VMwareWebService/test/rebootHostTest.rb
-- lib/VMwareWebService/test/remoteDisplayVnc.rb
-- lib/VMwareWebService/test/rm_evm_snapshots.rb
-- lib/VMwareWebService/test/rtPerfTest.rb
-- lib/VMwareWebService/test/selectionSpecBrokerClassTest.rb
-- lib/VMwareWebService/test/selectionSpecBrokerInstanceTest.rb
-- lib/VMwareWebService/test/selectionSpecVimClassTest.rb
-- lib/VMwareWebService/test/selectionSpecVimTest.rb
-- lib/VMwareWebService/test/shutdownHostTest.rb
-- lib/VMwareWebService/test/snapshotTest.rb
-- lib/VMwareWebService/test/templateTest.rb
-- lib/VMwareWebService/test/thinProvisioned.rb
-- lib/VMwareWebService/test/vdlBrowserTest.rb
-- lib/VMwareWebService/test/vimCoreUpdater.rb
-- lib/VMwareWebService/test/vimEventMonitory.rb
-- lib/VMwareWebService/test/vimInventory.rb
-- lib/VMwareWebService/test/virtualApp.rb
-- lib/VMwareWebService/test/virtualDiskPerf.rb
-- lib/VMwareWebService/test/vmsafe.rb
 - lib/VMwareWebService/thumb_print.rb
 - lib/VMwareWebService/vcenter_thumb_print.rb
 - lib/VMwareWebService/version.rb

data/lib/VMwareWebService/VixDiskLib/test/api_test.rb

@@ -1,76 +0,0 @@
-require "ffi-vix_disk_lib/api_wrapper"
-
-$vim_log = Logger.new(STDOUT)
-$vim_log.level = Logger::WARN
-
-vmdk = "/vmfs/volumes/StarM1-Dev/Citrix-Mahwah2/Citrix-Mahwah2.vmdk"
-
-VixDiskLibApi  = FFI::VixDiskLib::ApiWrapper
-VixDiskLib_raw = FFI::VixDiskLib::API
-
-VixDiskLibApi.init(nil, nil, nil, nil)
-
-tmodes = VixDiskLibApi.list_transport_modes
-puts "Transport Modes = [#{tmodes}]"
-
-SERVERNAME = raise "Please define SERVERNAME"
-PORTNUMBER = raise "Please define PORTNUMBER"
-USERNAME   = raise "Please define USERNAME"
-PASSWORD   = raise "Please define PASSWORD"
-
-con_parms = {
-  :serverName => SERVERNAME,
-  :port       => PORTNUMBER,
-  :credType   => VixDiskLib_raw::VIXDISKLIB_CRED_UID,
-  :userName   => USERNAME,
-  :password   => PASSWORD,
-}
-
-connection = VixDiskLibApi.connect(con_parms)
-
-begin
-  disk_handle = VixDiskLibApi.open(connection, vmdk, VixDiskLib_raw::VIXDISKLIB_FLAG_OPEN_READ_ONLY)
-rescue VixDiskLibError => err
-  puts "Error opening #{vmdk}: #{err}.  Exiting test."
-  exit
-end
-dinfo = VixDiskLibApi.get_info(disk_handle)
-puts
-puts "Disk info:"
-dinfo.each { |k, v| puts "\t#{k} => #{v}" }
-puts
-
-mode = VixDiskLibApi.get_transport_mode(disk_handle)
-puts "Transport Mode: #{mode}"
-
-mkeys = VixDiskLibApi.get_metadata_keys(disk_handle)
-puts "Metadata:"
-mkeys.each do |k|
-  v = VixDiskLibApi.read_metadata(disk_handle, k)
-  puts "\t#{k} => #{v}"
-end
-
-space = VixDiskLibApi.space_needed_for_clone(disk_handle, :DISK_VMFS_FLAT)
-puts "Space Needed for Clone: #{space}"
-
-# nReads = 500000
-number_reads = 500
-# number_reads = 5000
-
-bytes_read = 0
-t0 = Time.now
-
-(0...number_reads).each do |rn|
-  read_data = VixDiskLibApi.read(disk_handle, rn, 1)
-  bytes_read += read_data.length
-end
-
-t1 = Time.now
-bps = bytes_read / (t1 - t0)
-
-puts "Read throughput: #{bps} B/s"
-
-VixDiskLibApi.close(disk_handle)
-VixDiskLibApi.disconnect(connection)
-
-VixDiskLibApi.exit

data/lib/VMwareWebService/VixDiskLib/test/cookedTest.rb

@@ -1,86 +0,0 @@
-require 'VMwareWebService/VixDiskLib/VixDiskLib'
-require 'enumerator'
-
-$vim_log = Logger.new(STDOUT)
-$vim_log.level = Logger::WARN
-
-diskFiles = [
-  "/vmfs/volumes/StarM2-LUN1/VMmini-101/VMmini-101.vmdk"
-]
-
-readRanges = [
-  0,  256,
-  0,  512,
-  256,  512,
-  512,  256,
-  512,  512,
-  256, 1024,
-  1280,  256,
-  1280,  512,
-  1280, 1024
-]
-
-puts "VIXDISKLIB_FLAG_OPEN_UNBUFFERED  = #{VixDiskLib_raw::VIXDISKLIB_FLAG_OPEN_UNBUFFERED}"
-puts "VIXDISKLIB_FLAG_OPEN_SINGLE_LINK = #{VixDiskLib_raw::VIXDISKLIB_FLAG_OPEN_SINGLE_LINK}"
-puts "VIXDISKLIB_FLAG_OPEN_READ_ONLY   = #{VixDiskLib_raw::VIXDISKLIB_FLAG_OPEN_READ_ONLY}"
-puts "VIXDISKLIB_CRED_UID              = #{VixDiskLib_raw::VIXDISKLIB_CRED_UID}"
-puts "VIXDISKLIB_CRED_SESSIONID        = #{VixDiskLib_raw::VIXDISKLIB_CRED_SESSIONID}"
-puts "VIXDISKLIB_CRED_UNKNOWN          = #{VixDiskLib_raw::VIXDISKLIB_CRED_UNKNOWN}"
-puts "VIXDISKLIB_SECTOR_SIZE           = #{VixDiskLib_raw::VIXDISKLIB_SECTOR_SIZE}"
-puts
-
-VixDiskLib.init(->(s) { puts "INFO: #{s}" },
-                ->(s) { puts "WARN: #{s}" },
-                ->(s) { puts "ERROR: #{s}" })
-
-conParms = {
-  :serverName => "",
-  :port       => 902,
-  :credType   => VixDiskLib_raw::VIXDISKLIB_CRED_UID,
-  :userName   => "",
-  :password   => "",
-}
-
-connection = VixDiskLib.connect(conParms)
-
-vDisks = []
-
-n = 1
-diskFiles.each do |vmdk|
-  puts "*** #{n} *** VMDK: #{vmdk}"
-  vDisk = connection.getDisk(vmdk, VixDiskLib_raw::VIXDISKLIB_FLAG_OPEN_READ_ONLY)
-  vDisks << vDisk
-
-  dinfo = vDisk.info
-  puts
-  puts "Disk info:"
-  dinfo.each { |k, v| puts "\t#{k} => #{v}" }
-  puts
-
-  readRanges.each_slice(2) do |start, len|
-    puts "Read test: start = #{start}, len = #{len} (bytes)"
-    startSector, startOffset = start.divmod(vDisk.sectorSize)
-    endSector = (start + len - 1) / vDisk.sectorSize
-    numSector = endSector - startSector + 1
-    puts "\tstartSector = #{startSector}, numSector = #{numSector}, startOffset = #{startOffset}"
-
-    rBData = vDisk.bread(startSector, numSector)
-    puts "\tBlock read #{rBData.length} bytes of data."
-
-    rCData = vDisk.read(start, len)
-    puts "\tByte read #{rCData.length} bytes of data."
-
-    if rCData != rBData[startOffset, len]
-      puts "\t\t*** Block and byte data don't match"
-    else
-      puts "\t\tData check passed"
-    end
-    puts
-  end
-  n += 1
-
-  break
-end
-
-vDisks.each(&:close)
-connection.disconnect