Skip to content

Commit def83fb

Browse files
authored
Merge pull request #821 from kbrock/local_miq_server
convert create_guid_miq_server_zone to local_miq_server
2 parents e52d935 + 0974f06 commit def83fb

File tree

11 files changed

+12
-15
lines changed

11 files changed

+12
-15
lines changed

spec/factories/ext_management_system.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
FactoryBot.define do
22
factory :ems_vmware_with_vcr_authentication, :parent => :ems_vmware_cloud do
3-
zone do
4-
_guid, _server, zone = EvmSpecHelper.create_guid_miq_server_zone
5-
zone
6-
end
3+
zone { EvmSpecHelper.local_miq_server.zone }
74

85
after(:build) do |ems|
96
ems.hostname = Rails.application.secrets.vmware_cloud[:host]

spec/models/manageiq/providers/vmware/cloud_manager/refresher_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@hostname = host_uri.host
77
@port = host_uri.port == 443 ? nil : host_uri.port
88

9-
_guid, _server, zone = EvmSpecHelper.create_guid_miq_server_zone
9+
zone = EvmSpecHelper.local_miq_server.zone
1010
@ems = FactoryBot.create(
1111
:ems_vmware_cloud,
1212
:zone => zone,

spec/models/manageiq/providers/vmware/cloud_manager/vm/reconfigure_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
describe ManageIQ::Providers::Vmware::CloudManager::Vm::Reconfigure do
2-
before { EvmSpecHelper.create_guid_miq_server_zone }
2+
before { EvmSpecHelper.local_miq_server }
33
let(:vm) do
44
FactoryBot.create(
55
:vm_vmware_cloud,

spec/models/manageiq/providers/vmware/cloud_manager_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
end
1212

1313
before(:example) do
14-
_guid, _server, zone = EvmSpecHelper.create_guid_miq_server_zone
14+
zone = EvmSpecHelper.local_miq_server.zone
1515
@ems = FactoryBot.create(
1616
:ems_vmware_cloud,
1717
:zone => zone,

spec/models/manageiq/providers/vmware/container_manager/refresher_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
expect(described_class.ems_type).to eq(:vmware_tanzu)
44
end
55

6-
let(:zone) { EvmSpecHelper.create_guid_miq_server_zone.last }
6+
let(:zone) { EvmSpecHelper.local_miq_server.zone }
77
let!(:ems) { FactoryBot.create(:ems_vmware_tanzu_with_vcr_authentication, :zone => zone) }
88

99
it "will perform a full refresh" do

spec/models/manageiq/providers/vmware/infra_manager/metric_capture_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
before(:each) do
55
MiqRegion.seed
66

7-
guid, server, @zone = EvmSpecHelper.create_guid_miq_server_zone
7+
@zone = EvmSpecHelper.local_miq_server.zone
88

99
Timecop.freeze(Time.parse("2011-08-12T23:33:00Z").utc)
1010
end

spec/models/manageiq/providers/vmware/infra_manager/provision_workflow_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
subject { req.workflow(options) }
3939

4040
before do
41-
EvmSpecHelper.create_guid_miq_server_zone
41+
EvmSpecHelper.local_miq_server
4242
MiqDialog.seed
4343
end
4444

spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
include Spec::Support::EmsRefreshHelper
55

66
let!(:ems) do
7-
_, _, zone = EvmSpecHelper.create_guid_miq_server_zone
7+
zone = EvmSpecHelper.local_miq_server.zone
88
hostname = Rails.application.secrets.vmware_infra[:hostname]
99
FactoryBot.create(:ems_vmware_with_authentication, :hostname => hostname, :zone => zone).tap do |ems|
1010
# NOTE: VCR filter_sensitive_data was replacing rootFolder with VMWARE_USERNAME and

spec/models/manageiq/providers/vmware/infra_manager/vm/operations/snapshot_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
describe ManageIQ::Providers::Vmware::InfraManager::Vm::Operations::Snapshot do
22
let(:vm) do
3-
_, _, zone = EvmSpecHelper.create_guid_miq_server_zone
3+
zone = EvmSpecHelper.local_miq_server.zone
44
ems = FactoryBot.create(:ems_vmware, :zone => zone)
55
host = FactoryBot.create(:host_vmware, :ext_management_system => ems)
66
FactoryBot.create(:vm_vmware, :ext_management_system => ems, :host => host)

spec/models/manageiq/providers/vmware/infra_manager/vm/remote_console_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
let(:vm) { FactoryBot.create(:vm_with_ref, :ext_management_system => ems, :host => host) }
153153

154154
it 'normal case' do
155-
EvmSpecHelper.create_guid_miq_server_zone
155+
EvmSpecHelper.local_miq_server
156156
ems.update(:ipaddress => '192.168.252.14', :hostname => '192.168.252.14')
157157
auth = FactoryBot.create(:authentication,
158158
:userid => 'dev1',

0 commit comments

Comments
 (0)