From 8be144d5b65ed20e7724173d75e0d84a938d8d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miha=20Ple=C5=A1ko?= Date: Wed, 19 Sep 2018 16:10:43 +0200 Subject: [PATCH] Shift fog-vcloud-director version to 0.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this commit we shift fog-vcloud-director version to 0.3.0 which is fog-core 2.1.x compliant, but remains fog-core 1.45 compatible. Also, we omit the explicit fog-core requirement in vmware's Gemfile bacause we don't need it per se so we better let the fog-vcloud-director install whatever it needs. Fixes https://github.com/ManageIQ/manageiq-providers-vmware/issues/319 Signed-off-by: Miha Pleško --- .../manageiq/providers/vmware/manager_auth_mixin.rb | 4 ++-- manageiq-providers-vmware.gemspec | 3 +-- .../manageiq/providers/vmware/cloud_manager_spec.rb | 8 ++++---- .../vmware/network_manager/refresh_parser_spec.rb | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/models/manageiq/providers/vmware/manager_auth_mixin.rb b/app/models/manageiq/providers/vmware/manager_auth_mixin.rb index e9a4ff22a..4e3158981 100644 --- a/app/models/manageiq/providers/vmware/manager_auth_mixin.rb +++ b/app/models/manageiq/providers/vmware/manager_auth_mixin.rb @@ -51,7 +51,7 @@ def raw_connect(server, port, username, password, api_version = '5.5', validate } } - connect = Fog::Compute::VcloudDirector.new(params) + connect = Fog::VcloudDirector::Compute.new(params) connection_rescue_block { validate_connection(connect) } if validate connect end @@ -70,7 +70,7 @@ def connection_rescue_block def translate_exception(err) case err - when Fog::Compute::VcloudDirector::Unauthorized + when Fog::VcloudDirector::Compute::Unauthorized MiqException::MiqInvalidCredentialsError.new "Login failed due to a bad username or password." when Excon::Errors::Timeout MiqException::MiqUnreachableError.new "Login attempt timed out" diff --git a/manageiq-providers-vmware.gemspec b/manageiq-providers-vmware.gemspec index df132cc13..25b74c456 100644 --- a/manageiq-providers-vmware.gemspec +++ b/manageiq-providers-vmware.gemspec @@ -13,8 +13,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,lib}/**/*"] - s.add_dependency("fog-vcloud-director", ["~> 0.2.2"]) - s.add_dependency "fog-core", "~>1.40" + s.add_dependency("fog-vcloud-director", ["~> 0.3.0"]) s.add_dependency "vmware_web_service", "~>0.3.0" s.add_dependency "rbvmomi", "~>1.13.0" diff --git a/spec/models/manageiq/providers/vmware/cloud_manager_spec.rb b/spec/models/manageiq/providers/vmware/cloud_manager_spec.rb index 3bfdc52d4..51f3cbeed 100644 --- a/spec/models/manageiq/providers/vmware/cloud_manager_spec.rb +++ b/spec/models/manageiq/providers/vmware/cloud_manager_spec.rb @@ -52,14 +52,14 @@ it "decrypts the vcloud password" do encrypted = MiqPassword.encrypt("encrypted") - expect(::Fog::Compute::VcloudDirector).to receive(:new).with(params) + expect(::Fog::VcloudDirector::Compute).to receive(:new).with(params) described_class.raw_connect("server", "port", "username", encrypted, "api_version") end it "validates the password if validate is true if specified" do - expect(described_class).to receive(:validate_connection).and_raise(Fog::Compute::VcloudDirector::Unauthorized) - expect(::Fog::Compute::VcloudDirector).to receive(:new).with(params) + expect(described_class).to receive(:validate_connection).and_raise(Fog::VcloudDirector::Compute::Unauthorized) + expect(::Fog::VcloudDirector::Compute).to receive(:new).with(params) expect do described_class.raw_connect("server", "port", "username", "encrypted", "api_version", true) @@ -68,7 +68,7 @@ it "does not validate the password unless specified" do expect(described_class).to_not receive(:validate_connection) - expect(::Fog::Compute::VcloudDirector).to receive(:new).with(params) + expect(::Fog::VcloudDirector::Compute).to receive(:new).with(params) described_class.raw_connect("server", "port", "username", "encrypted", "api_version") end diff --git a/spec/models/manageiq/providers/vmware/network_manager/refresh_parser_spec.rb b/spec/models/manageiq/providers/vmware/network_manager/refresh_parser_spec.rb index 0f337645e..ca1dce49b 100644 --- a/spec/models/manageiq/providers/vmware/network_manager/refresh_parser_spec.rb +++ b/spec/models/manageiq/providers/vmware/network_manager/refresh_parser_spec.rb @@ -274,7 +274,7 @@ }, { :name => 'error response', - :data => -> { raise Fog::Compute::VcloudDirector::Forbidden, 'simulated error' }, + :data => -> { raise Fog::VcloudDirector::Compute::Forbidden, 'simulated error' }, :expected => [] } ].each do |test_case| @@ -299,7 +299,7 @@ }, { :name => 'error response', - :data => -> { raise Fog::Compute::VcloudDirector::Forbidden, 'simulated error' }, + :data => -> { raise Fog::VcloudDirector::Compute::Forbidden, 'simulated error' }, :expected => [] } ].each do |test_case|