ffi-vix_disk_lib 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c43c07f9524fec53d769fc90299cde4868b8819
-  data.tar.gz: 165ccea6e0546c6b18cb6f2155adece6dd3efe79
+  metadata.gz: 9398a5a0638208305f25188ce2b0e995813fd8ab
+  data.tar.gz: 2c7869d2fe4d8a755abb983be5af680ff1c3766a
 SHA512:
-  metadata.gz: aabbfae2cb4f45024217ecdda2c70b6f6dd8e8e18e681aa366adeabc5f76562edf255f38d0cf7dae6ce2b38025b7d879f51a9bbd474e7ace69377b2234552a39
-  data.tar.gz: 580498a16f23a65fe838e5c4912492800a1df8f26307099e9ae190cfaddcba1fada74769bc30a563e99168dbcbca8a85091476c83936b463a0b33e2d22969eab
+  metadata.gz: 2fd76373bbe822f12aefc8c73d15e6eb8af51ee6c88e79b65c0b88a29893c3d9a09d10a533e085d45b94d85e58602bf9c7abc063f4a1b01412440990e8070810
+  data.tar.gz: 4720ac948e9a51e41914307b02a9f8610fb6bb3f8601bfaa0e681511000907611e6f80cbf3fd53a2ca0109840b7c3d32f01d921c732894d3e6db9f4c9ed4bfb0

data/lib/ffi-vix_disk_lib/api.rb

@@ -26,6 +26,7 @@ module FFI
         begin
           loaded_library = ffi_lib ["vixDiskLib.so.#{version}"]
           VERSION_MAJOR, VERSION_MINOR = loaded_library.first.name.split(".")[2, 2].collect(&:to_i)
+          VERSION = version
           if bad_versions.keys.include?(version)
             loaded_library = ""
             @load_error = "VixDiskLib #{version} is not supported: #{bad_versions[version]}"
@@ -61,6 +62,17 @@ module FFI
         err != VixErrorType[:VIX_OK]
       end
 
+      def self.evaluate_versioned_connect_params
+        case VERSION
+        when "6.5.0"
+          ConnectParams_6_5_0
+        else
+          ConnectParams_1_0_0
+        end
+      end
+
+      ConnectParams = evaluate_versioned_connect_params
+
       callback :GenericLogFunc, [:string, :pointer], :void
 
       # Prototype for the progress function called by VixDiskLib.

data/lib/ffi-vix_disk_lib/struct.rb

@@ -57,14 +57,26 @@ module FFI
       #
       # Example VM spec:
       # "MyVm/MyVm.vmx?dcPath=Path/to/MyDatacenter&dsName=storage1"
-      class ConnectParams < FFI::Struct
-        layout :vmxSpec,    :pointer,
-               :serverName, :pointer,
-               :thumbPrint, :pointer,
-               :privateUse, :long,
+      class ConnectParams_1_0_0 < FFI::Struct
+        layout :vmxSpec,    :pointer, # URL like spec of the VM.
+               :serverName, :pointer, # Name or IP address of VC / ESX.
+               :thumbPrint, :pointer, # SSL Certificate thumb print.
+               :privateUse, :long,    # This value is ignored.
                :credType,   CredType,
                :creds,      Creds,
-               :port,       :uint32
+               :port,       :uint32   # port to use for authenticating with VC/ESXi host
+      end
+
+      class ConnectParams_6_5_0 < FFI::Struct
+        layout :vmxSpec,     :pointer, # URL like spec of the VM.
+               :serverName,  :pointer, # Name or IP address of VC / ESX.
+               :thumbPrint,  :pointer, # SSL Certificate thumb print.
+               :privateUse,  :long,    # This value is ignored.
+               :credType,    CredType,
+               :creds,       Creds,
+               :port,        :uint32,  # port to use for authenticating with VC/ESXi host
+               :nfcHostPort, :uint32,  # port to use for establishing NFC connection to ESXi host
+               :vimApiVer,   :pointer  # VIM API version to use, private
       end
 
       class Info < FFI::Struct

data/lib/ffi-vix_disk_lib/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module VixDiskLib
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/ffi-vix_disk_lib/api_spec.rb

@@ -0,0 +1,13 @@
+describe FFI::VixDiskLib::API do
+  let(:major_version) { described_class::VERSION_MAJOR }
+  let(:minor_version) { described_class::VERSION_MINOR }
+  let(:log)           { lambda { |_string, _pointer| } }
+  let(:lib_dir)       { nil }
+
+  context "init" do
+    it "initializes successfully" do
+      err = described_class.init(major_version, minor_version, log, log, log, lib_dir)
+      expect(err).to eq(described_class::VixErrorType[:VIX_OK])
+    end
+  end
+end

data/spec/ffi-vix_disk_lib/api_wrapper_spec.rb

@@ -0,0 +1,15 @@
+require 'ffi-vix_disk_lib/api_wrapper'
+
+describe FFI::VixDiskLib::ApiWrapper do
+  context "connect" do
+    before do
+      described_class.init
+    end
+
+    it "returns a connection" do
+      connect_params = {}
+      connection = described_class.connect(connect_params)
+      expect(connection).not_to be_nil
+    end
+  end
+end

data/spec/ffi-vix_disk_lib/version_spec.rb

@@ -0,0 +1,5 @@
+describe FFI::VixDiskLib::VERSION do
+  it "must be defined" do
+    expect(FFI::VixDiskLib::VERSION).to_not be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'minitest'
-require 'minitest/autorun'
-
 begin
   require 'ffi-vix_disk_lib'
 rescue LoadError
@@ -15,3 +12,6 @@ EOMSG
 
   exit 1
 end
+
+RSpec.configure do |config|
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-vix_disk_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jerry Keselman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,8 +91,10 @@ files:
 - lib/ffi-vix_disk_lib/safe_create_params.rb
 - lib/ffi-vix_disk_lib/struct.rb
 - lib/ffi-vix_disk_lib/version.rb
+- spec/ffi-vix_disk_lib/api_spec.rb
+- spec/ffi-vix_disk_lib/api_wrapper_spec.rb
+- spec/ffi-vix_disk_lib/version_spec.rb
 - spec/spec_helper.rb
-- spec/version_spec.rb
 homepage: http://github.com/ManageIQ/ffi-vix_disk_lib
 licenses:
 - APL 2.0
@@ -113,10 +115,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby FFI Binding to VMware VixDiskLib.
 test_files:
+- spec/ffi-vix_disk_lib/api_spec.rb
+- spec/ffi-vix_disk_lib/api_wrapper_spec.rb
+- spec/ffi-vix_disk_lib/version_spec.rb
 - spec/spec_helper.rb
-- spec/version_spec.rb

data/spec/version_spec.rb

@@ -1,7 +0,0 @@
-require_relative './spec_helper'
-
-describe FFI::VixDiskLib::VERSION do
-  it "must be defined" do
-    FFI::VixDiskLib::VERSION.wont_be_nil
-  end
-end