Revision 14e90094
Added by Kavita Gaikwad about 5 years ago
| Gemfile | ||
|---|---|---|
|
gem 'i18n', '~> 1.1'
|
||
|
gem 'turbolinks', '>= 2.5.4', '< 3'
|
||
|
gem 'logging', '>= 1.8.0', '< 3.0.0'
|
||
|
gem 'fog-core', '1.45.0'
|
||
|
gem 'fog-core', '2.1.0'
|
||
|
gem 'net-scp'
|
||
|
gem 'net-ssh'
|
||
|
gem 'net-ssh', '4.2.0'
|
||
|
gem 'net-ldap', '>= 0.8.0'
|
||
|
gem 'net-ping', :require => false
|
||
|
gem 'activerecord-session_store', '>= 1.1.0', '< 2'
|
||
| app/models/concerns/fog_extensions.rb | ||
|---|---|---|
|
|
||
|
if Foreman::Model::GCE.available?
|
||
|
require 'fog/google'
|
||
|
require 'fog/google/models/compute/image'
|
||
|
require 'fog/compute/google/models/image'
|
||
|
Fog::Compute::Google::Image.send(:include, FogExtensions::Google::Image)
|
||
|
require 'fog/google/models/compute/server'
|
||
|
require 'fog/compute/google/models/server'
|
||
|
Fog::Compute::Google::Server.send(:include, FogExtensions::Google::Server)
|
||
|
require 'fog/google/models/compute/flavor'
|
||
|
Fog::Compute::Google::Flavor.send(:include, FogExtensions::Google::Flavor)
|
||
|
end
|
||
|
|
||
|
if Foreman::Model::Libvirt.available?
|
||
| bundler.d/fog.rb | ||
|---|---|---|
|
group :fog do
|
||
|
gem 'fog', '1.42.1', :require => false
|
||
|
end
|
||
| bundler.d/gce.rb | ||
|---|---|---|
|
group :gce do
|
||
|
gem 'fog-google', '<= 0.1.0'
|
||
|
gem 'google-api-client', '~> 0.8.2', :require => 'google/api_client'
|
||
|
gem 'fog-google', '~> 1.8.2'
|
||
|
end
|
||
| test/unit/compute_resource_host_importer_test.rb | ||
|---|---|---|
|
end
|
||
|
|
||
|
context 'on gce' do
|
||
|
let(:compute_resource) { compute_resources(:gce) }
|
||
|
let(:vm) { compute_resource.vms.first }
|
||
|
let(:compute_resource) { FactoryBot.build(:gce_cr) }
|
||
|
let(:vm) do
|
||
|
# TODO - please remove this mock vm object
|
||
|
# once fog-google mocks are available
|
||
|
mock_vm = mock()
|
||
|
mock_vm.stubs(:identity).returns('test-google')
|
||
|
mock_vm.stubs(:vm_ip_address).returns('192.168.100.122')
|
||
|
mock_vm.stubs(:attributes).returns(
|
||
|
:identity => 'test-google',
|
||
|
:public_ip_address => '192.168.100.122',
|
||
|
:zone => 'foo'
|
||
|
)
|
||
|
compute_resource.stubs(:vms).returns([mock_vm])
|
||
|
compute_resource.stubs(:find_vm_by_uuid).returns(mock_vm)
|
||
|
mock_vm
|
||
|
end
|
||
|
|
||
|
test 'imports the VM with all parameters' do
|
||
|
assert_equal vm.identity, host.name
|
||
Also available in: Unified diff
Fixes #26024,#26025 - removed fog & updated fog-google ~> 1.8.2 (#6475)
Locked version of 'fog-core' to '2.1.0' and 'net-ssh' to 4.2.0
as in latest version of net-ssh values of options
i.e paranoid/verify_host_key are changed but fog-core
still using old values.
Also, modified GCE test using mock.