Skip to content

Commit e8d8c8c

Browse files
agrareFryguy
authored andcommitted
Merge pull request #492 from jaywcarman/fix_powervs_regions_ems_type
Fix PowerVS Regions ems_type method (cherry picked from commit f298c24)
1 parent fc48a35 commit e8d8c8c

File tree

3 files changed

+98
-1
lines changed

3 files changed

+98
-1
lines changed

app/models/manageiq/providers/ibm_cloud/power_virtual_servers/regions.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class << self
33
private
44

55
def ems_type
6-
:ibm_cloud_power_virtual_servers
6+
:ems_ibm_cloud_power_virtual_servers
77
end
88

99
def regions_yml

config/settings.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
:ems:
22
:ems_ibm_cloud_power_virtual_servers:
3+
:additional_regions: {}
4+
:disabled_regions: []
35
:event_handling:
46
:event_groups:
57
:addition:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
RSpec.describe ManageIQ::Providers::IbmCloud::PowerVirtualServers::Regions do
2+
let(:ems_settings_name) { :ems_ibm_cloud_power_virtual_servers }
3+
let(:additional_regions) { {:mars => {:name => :mars, :description => "The Red Planet", :hostname => "mars.power-iaas.cloud.ibm.com"}} }
4+
let(:disabled_regions) { ["dal"] }
5+
6+
describe ".regions" do
7+
it "returns regions" do
8+
expect(described_class.regions.count).not_to be_zero
9+
end
10+
11+
context "with additional_regions" do
12+
before do
13+
stub_settings_merge(
14+
:ems => {ems_settings_name => {:additional_regions => additional_regions}}
15+
)
16+
end
17+
18+
it "includes the additional region" do
19+
expect(described_class.regions).to include("mars" => {:name => :mars, :description => "The Red Planet", :hostname => "mars.power-iaas.cloud.ibm.com"})
20+
end
21+
end
22+
23+
context "with disabled_regions" do
24+
before do
25+
stub_settings_merge(
26+
:ems => {ems_settings_name => {:disabled_regions => disabled_regions}}
27+
)
28+
end
29+
30+
it "excluded the additional region" do
31+
expect(described_class.regions).not_to include("dal")
32+
end
33+
end
34+
end
35+
36+
describe ".all" do
37+
it "returns regions" do
38+
expect(described_class.all.count).not_to be_zero
39+
end
40+
41+
context "with additional_regions" do
42+
before do
43+
stub_settings_merge(
44+
:ems => {ems_settings_name => {:additional_regions => additional_regions}}
45+
)
46+
end
47+
48+
it "includes the additional region" do
49+
expect(described_class.all).to include({:name => :mars, :description => "The Red Planet", :hostname => "mars.power-iaas.cloud.ibm.com"})
50+
end
51+
end
52+
53+
context "with disabled_regions" do
54+
before do
55+
stub_settings_merge(
56+
:ems => {ems_settings_name => {:disabled_regions => disabled_regions}}
57+
)
58+
end
59+
60+
it "excluded the additional region" do
61+
expect(described_class.regions).not_to include("dal")
62+
end
63+
end
64+
end
65+
66+
describe ".names" do
67+
it "returns regions" do
68+
expect(described_class.names.count).not_to be_zero
69+
end
70+
71+
context "with additional_regions" do
72+
before do
73+
stub_settings_merge(
74+
:ems => {ems_settings_name => {:additional_regions => additional_regions}}
75+
)
76+
end
77+
78+
it "includes the additional region" do
79+
expect(described_class.names).to include("mars")
80+
end
81+
end
82+
83+
context "with disabled_regions" do
84+
before do
85+
stub_settings_merge(
86+
:ems => {ems_settings_name => {:disabled_regions => disabled_regions}}
87+
)
88+
end
89+
90+
it "excluded the additional region" do
91+
expect(described_class.regions).not_to include("dal")
92+
end
93+
end
94+
end
95+
end

0 commit comments

Comments
 (0)