summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS.Cavallo <smcavallo@hotmail.com>2018-03-09 08:20:58 -0500
committerTim Smith <tsmith@chef.io>2018-03-14 14:43:59 -0700
commit2ff88011d70c5c98bdc730965899d6551274678d (patch)
treef83d9f75ad27982bc2699f1bc08590a0fdee4e86
parent064bf49645e786a421859d24c91a62a35fe00c7b (diff)
downloadohai-2ff88011d70c5c98bdc730965899d6551274678d.tar.gz
add ohai support for softlayer cloud
Signed-off-by: S.Cavallo <smcavallo@hotmail.com>
-rw-r--r--lib/ohai/plugins/cloud.rb23
-rw-r--r--spec/unit/plugins/cloud_spec.rb36
2 files changed, 59 insertions, 0 deletions
diff --git a/lib/ohai/plugins/cloud.rb b/lib/ohai/plugins/cloud.rb
index dff44505..78ceba82 100644
--- a/lib/ohai/plugins/cloud.rb
+++ b/lib/ohai/plugins/cloud.rb
@@ -26,6 +26,7 @@ Ohai.plugin(:Cloud) do
depends "openstack"
depends "azure"
depends "digital_ocean"
+ depends "softlayer"
# Class to help enforce the interface exposed to node[:cloud] (OHAI-542)
#
@@ -295,6 +296,27 @@ Ohai.plugin(:Cloud) do
@cloud_attr_obj.provider = "digital_ocean"
end
+ # ----------------------------------------
+ # softlayer
+ # ----------------------------------------
+
+ # Is current cloud softlayer?
+ #
+ # === Return
+ # true:: If softlayer Hash is defined
+ # false:: Otherwise
+ def on_softlayer?
+ softlayer != nil
+ end
+
+ # Fill cloud hash with softlayer values
+ def get_softlayer_values
+ @cloud_attr_obj.add_ipv4_addr(softlayer["public_ipv4"], :public)
+ @cloud_attr_obj.add_ipv4_addr(softlayer["local_ipv4"], :private)
+ @cloud_attr_obj.public_hostname = softlayer["public_fqdn"]
+ @cloud_attr_obj.provider = "softlayer"
+ end
+
collect_data do
require "ipaddr"
@@ -308,6 +330,7 @@ Ohai.plugin(:Cloud) do
get_openstack_values if on_openstack?
get_azure_values if on_azure?
get_digital_ocean_values if on_digital_ocean?
+ get_softlayer_values if on_softlayer?
# set node[:cloud] and node[:cloud_v2] hash here
cloud_v2 @cloud_attr_obj.cloud_mash
diff --git a/spec/unit/plugins/cloud_spec.rb b/spec/unit/plugins/cloud_spec.rb
index 6c136c40..cc693a7c 100644
--- a/spec/unit/plugins/cloud_spec.rb
+++ b/spec/unit/plugins/cloud_spec.rb
@@ -86,6 +86,7 @@ describe Ohai::System, "plugin cloud" do
@plugin[:azure] = nil
@plugin[:gce] = nil
@plugin[:digital_ocean] = nil
+ @plugin[:softlayer] = nil
@plugin.run
expect(@plugin[:cloud]).to be_nil
expect(@plugin[:cloud_v2]).to be_nil
@@ -457,4 +458,39 @@ describe Ohai::System, "plugin cloud" do
end
end
+ describe "with softlayer mash" do
+ before do
+ @plugin[:softlayer] = Mash.new
+ @plugin[:softlayer] = { "local_ipv4" => "192.168.0.1",
+ "public_ipv4" => "8.8.8.8",
+ "public_fqdn" => "abc1234.public.com"
+ }
+ end
+
+ it "populates cloud public ip" do
+ @plugin.run
+ expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq(@plugin[:softlayer][:public_ipv4])
+ end
+
+ it "populates cloud private ip" do
+ @plugin.run
+ expect(@plugin[:cloud][:local_ipv4_addrs][0]).to eq(@plugin[:softlayer][:local_ipv4])
+ end
+
+ it "populates first cloud public ip" do
+ @plugin.run
+ expect(@plugin[:cloud][:public_ipv4_addrs].first).to eq(@plugin[:softlayer][:public_ipv4])
+ end
+
+ it "populates cloud public_hostname" do
+ @plugin.run
+ expect(@plugin[:cloud][:public_hostname]).to eq(@plugin[:softlayer][:public_fqdn])
+ end
+
+ it "populates cloud provider" do
+ @plugin.run
+ expect(@plugin[:cloud][:provider]).to eq("softlayer")
+ end
+ end
+
end