ohai 8.26.1 → 13.0.0

data/spec/unit/dsl/plugin_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License
 #
 
-require File.expand_path("../../../spec_helper.rb", __FILE__)
+require_relative "../../spec_helper.rb"
 
 shared_examples "Ohai::DSL::Plugin" do
   context "#initialize" do

data/spec/unit/hints_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
+require_relative "../spec_helper.rb"
 
 describe "Ohai::Hints" do
   # We are using the plugins directory infrastructure to test hints

data/spec/unit/loader_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
+require_relative "../spec_helper.rb"
 
 describe Ohai::Loader do
   extend IntegrationSupport
@@ -95,6 +95,31 @@ EOF
     end
   end
 
+  when_plugins_directory "is an additional plugin path" do
+    with_plugin("cookbook_a/alpha.rb", <<EOF)
+Ohai.plugin(:Alpha) do
+  provides "alpha"
+end
+EOF
+
+    with_plugin("cookbook_b/beta.rb", <<EOF)
+Ohai.plugin(:Beta) do
+  provides "beta"
+end
+EOF
+
+    describe "#load_additional" do
+      it "adds the plugins to the map" do
+        loader.load_additional(@plugins_directory)
+        expect(provides_map.map.keys).to include("alpha")
+      end
+
+      it "returns a set of plugins" do
+        expect(loader.load_additional(@plugins_directory)).to include(Ohai::NamedPlugin::Alpha)
+      end
+    end
+  end
+
   when_plugins_directory "contains invalid plugins" do
     with_plugin("extra_s.rb", <<EOF)
 Ohai.plugins(:ExtraS) do

data/spec/unit/mixin/command_spec.rb

@@ -17,75 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
-
-describe Ohai::Mixin::Command, "popen4" do
-  break if RUBY_PLATFORM =~ /(win|w)32$/
-
-  it "should default all commands to be run in the POSIX standard C locale" do
-    Ohai::Mixin::Command.popen4("echo $LC_ALL") do |pid, stdin, stdout, stderr|
-      stdin.close
-      expect(stdout.read.strip).to eq("C")
-    end
-  end
-
-  it "should respect locale when specified explicitly" do
-    Ohai::Mixin::Command.popen4("echo $LC_ALL", :environment => { "LC_ALL" => "es" }) do |pid, stdin, stdout, stderr|
-      stdin.close
-      expect(stdout.read.strip).to eq("es")
-    end
-  end
-
-  if defined?(::Encoding) && "".respond_to?(:force_encoding) #i.e., ruby 1.9
-    context "when external commands return UTF-8 strings and we are running under LANG=C encoding" do
-      before do
-        @saved_default_external = Encoding.default_external
-        @saved_default_internal = Encoding.default_internal
-        Encoding.default_external = Encoding::US_ASCII
-        Encoding.default_internal = Encoding::US_ASCII
-      end
-
-      after do
-        Encoding.default_external = @saved_default_external
-        Encoding.default_internal = @saved_default_internal
-      end
-
-      it "should force encode the string to UTF-8" do
-        extend Ohai::Mixin::Command
-        snowy = run_command(:command => ("echo '" + ("☃" * 8096) + "'"))[1]
-        expect(snowy.encoding).to eq(Encoding::UTF_8)
-      end
-    end
-
-    it "should force encode the string to UTF-8" do
-      extend Ohai::Mixin::Command
-      snowy = run_command(:command => ("echo '" + ("☃" * 8096) + "'"))[1]
-      expect(snowy.encoding).to eq(Encoding::UTF_8)
-    end
-  end
-
-  it "reaps zombie processes after exec fails [OHAI-455]" do
-    # NOTE: depending on ulimit settings, GC, etc., before the OHAI-455 patch,
-    # ohai could also exhaust the available file descriptors when creating this
-    # many zombie processes. A regression _could_ cause Errno::EMFILE but this
-    # probably won't be consistent on different environments.
-    created_procs = 0
-    100.times do
-      begin
-        Ohai::Mixin::Command.popen4("/bin/this-is-not-a-real-command") { |p, i, o, e| nil }
-      rescue Ohai::Exceptions::Exec
-        created_procs += 1
-      end
-    end
-    expect(created_procs).to eq(100)
-    reaped_procs = 0
-    begin
-      loop { Process.wait(-1); reaped_procs += 1 }
-    rescue Errno::ECHILD
-    end
-    expect(reaped_procs).to eq(0)
-  end
-end
+require_relative "../../spec_helper.rb"
 
 describe Ohai::Mixin::Command, "shell_out" do
   let(:cmd) { "sparkle-dream --version" }

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 require "ohai/mixin/ec2_metadata"
 
 describe Ohai::Mixin::Ec2Metadata do

data/spec/unit/mixin/softlayer_metadata_spec.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 require "ohai/mixin/softlayer_metadata"
 
 describe ::Ohai::Mixin::SoftlayerMetadata do

data/spec/unit/plugin_config_spec.rb

@@ -16,7 +16,6 @@
 #
 
 require_relative "../spec_helper"
-
 require "ohai/plugin_config"
 
 describe "Ohai::PluginConfig" do

data/spec/unit/plugins/abort_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 tmp = ENV["TMPDIR"] || ENV["TMP"] || ENV["TEMP"] || "/tmp"
 

data/spec/unit/plugins/aix/cpu_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX cpu plugin" do
   before(:each) do

data/spec/unit/plugins/aix/filesystem_spec.rb

@@ -15,7 +15,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX filesystem plugin" do
   before(:each) do

data/spec/unit/plugins/aix/hostname_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX hostname plugin" do
   before(:each) do

data/spec/unit/plugins/aix/kernel_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX kernel plugin" do
   before(:each) do

data/spec/unit/plugins/aix/memory_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX memory plugin" do
   before(:each) do

data/spec/unit/plugins/aix/network_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX network plugin" do
 

data/spec/unit/plugins/aix/os_spec.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX os plugin" do
   before(:each) do

data/spec/unit/plugins/aix/platform_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Aix plugin platform" do
   before(:each) do

data/spec/unit/plugins/aix/uptime_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Aix plugin uptime" do
 

data/spec/unit/plugins/aix/virtualization_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "spec_helper"
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX virtualization plugin" do
 

data/spec/unit/plugins/azure_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 require "open-uri"
 
 describe Ohai::System, "plugin azure" do

data/spec/unit/plugins/bsd/filesystem_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "BSD filesystem plugin" do
   let(:plugin) { get_plugin("bsd/filesystem") }

data/spec/unit/plugins/bsd/virtualization_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "BSD virtualization plugin" do
   before(:each) do

data/spec/unit/plugins/c_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
+require_relative "../../spec_helper.rb"
 
 C_GCC = <<EOF
 Using built-in specs.

data/spec/unit/plugins/chef_spec.rb

@@ -19,8 +19,7 @@
 #
 
 begin
-  require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
-
+  require_relative "../../spec_helper.rb"
   require "chef/version"
 
   describe Ohai::System, "plugin chef" do

data/spec/unit/plugins/cloud_spec.rb

@@ -15,7 +15,62 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
+require "ipaddr"
+
+describe "CloudAttrs object" do
+  before(:each) do
+    @plugin = get_plugin("cloud")
+  end
+
+  let(:cloud_node) do
+    { "public_ipv4_addrs" => ["1.2.3.1"],
+      "local_ipv4_addrs" => ["1.2.4.1"],
+      "public_ipv6_addrs" => ["3ffe:505:2::1"],
+      "local_ipv6_addrs" => ["3ffe:506:2::1"],
+      "public_ipv4" => "1.2.3.1",
+      "local_ipv4" => "1.2.4.1",
+      "public_ipv6" => "3ffe:505:2::1",
+      "local_ipv6" => "3ffe:506:2::1",
+      "public_hostname" => "myhost.somewhere.com",
+      "local_hostname" => "my-localhost",
+      "provider" => "my_awesome_cloud",
+     }
+  end
+
+  it "populates cloud mash" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    @cloud_attr_obj.add_ipv4_addr("1.2.3.1", :public)
+    @cloud_attr_obj.add_ipv4_addr("1.2.4.1", :private)
+    @cloud_attr_obj.add_ipv6_addr("3ffe:505:2::1", :public)
+    @cloud_attr_obj.add_ipv6_addr("3ffe:506:2::1", :private)
+    @cloud_attr_obj.public_hostname = "myhost.somewhere.com"
+    @cloud_attr_obj.local_hostname = "my-localhost"
+    @cloud_attr_obj.provider = "my_awesome_cloud"
+    expect(@cloud_attr_obj.cloud_mash).to eq(cloud_node)
+  end
+
+  it "throws exception with a bad ipv4 address" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    expect { @cloud_attr_obj.add_ipv6_addr("somebogusstring", :public) }.to raise_error(RuntimeError)
+  end
+
+  it "throws exception with a bad ipv6 address" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    expect { @cloud_attr_obj.add_ipv6_addr("FEED:B0B:DEAD:BEEF", :public) }.to raise_error(RuntimeError)
+  end
+
+  it "throws exception with ipv6 address passed to ipv4" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    expect { @cloud_attr_obj.add_ipv4_addr("3ffe:506:2::1", :public) }.to raise_error(RuntimeError)
+  end
+
+  it "throws exception with ipv4 address passed to ipv6" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    expect {  @cloud_attr_obj.add_ipv6_addr("1.2.3.4", :public) }.to raise_error(RuntimeError)
+  end
+
+end
 
 describe Ohai::System, "plugin cloud" do
   before(:each) do
@@ -29,27 +84,40 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:eucalyptus] = nil
       @plugin[:linode] = nil
       @plugin[:azure] = nil
+      @plugin[:gce] = nil
       @plugin[:digital_ocean] = nil
       @plugin.run
       expect(@plugin[:cloud]).to be_nil
+      expect(@plugin[:cloud_v2]).to be_nil
+    end
+  end
+
+  describe "with a cloud mash" do
+    before do
+      @plugin[:ec2] = Mash.new
+    end
+
+    it "populates cloud public ip" do
+      @plugin.run
+      expect(@plugin[:cloud]).to eq(@plugin[:cloud_v2])
     end
   end
 
   describe "with EC2 mash" do
     before do
-      @plugin[:ec2] = Mash.new()
+      @plugin[:ec2] = Mash.new
     end
 
     it "populates cloud public ip" do
       @plugin[:ec2]["public_ipv4"] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:public_ips][0]).to eq(@plugin[:ec2]["public_ipv4"])
+      expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq(@plugin[:ec2]["public_ipv4"])
     end
 
     it "populates cloud private ip" do
       @plugin[:ec2]["local_ipv4"] = "10.252.42.149"
       @plugin.run
-      expect(@plugin[:cloud][:private_ips][0]).to eq(@plugin[:ec2]["local_ipv4"])
+      expect(@plugin[:cloud][:local_ipv4_addrs][0]).to eq(@plugin[:ec2]["local_ipv4"])
     end
 
     it "populates cloud provider" do
@@ -58,9 +126,69 @@ describe Ohai::System, "plugin cloud" do
     end
   end
 
+  describe "with GCE mash" do
+    describe "with a public IP" do
+      before do
+        @plugin[:gce] = Mash.new
+        @plugin[:gce]["instance"] = Mash.new
+        @plugin[:gce]["instance"]["networkInterfaces"] = [
+          {
+            "accessConfigs" => [ { "externalIp" => "8.35.198.173", "type" => "ONE_TO_ONE_NAT" } ],
+            "ip" => "10.240.0.102",
+            "network" => "projects/foo/networks/default",
+          },
+        ]
+      end
+
+      it "populates cloud public ip" do
+        @plugin.run
+        expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq("8.35.198.173")
+      end
+
+      it "populates cloud private ip" do
+        @plugin.run
+        expect(@plugin[:cloud][:local_ipv4_addrs][0]).to eq("10.240.0.102")
+      end
+
+      it "populates cloud provider" do
+        @plugin.run
+        expect(@plugin[:cloud][:provider]).to eq("gce")
+      end
+    end
+
+    describe "with no public IP" do
+      before do
+        @plugin[:gce] = Mash.new
+        @plugin[:gce]["instance"] = Mash.new
+        @plugin[:gce]["instance"]["networkInterfaces"] = [
+          {
+            "accessConfigs" => [ { "externalIp" => "", "type" => "ONE_TO_ONE_NAT" } ],
+            "ip" => "10.240.0.102",
+            "network" => "projects/foo/networks/default",
+          },
+        ]
+      end
+
+      it "does not populate cloud public ip" do
+        @plugin.run
+        expect(@plugin[:cloud][:public_ipv4_addrs]).to be_nil
+      end
+
+      it "populates cloud private ip" do
+        @plugin.run
+        expect(@plugin[:cloud][:local_ipv4_addrs][0]).to eq("10.240.0.102")
+      end
+
+      it "populates cloud provider" do
+        @plugin.run
+        expect(@plugin[:cloud][:provider]).to eq("gce")
+      end
+    end
+  end
+
   describe "with rackspace" do
     before do
-      @plugin[:rackspace] = Mash.new()
+      @plugin[:rackspace] = Mash.new
     end
 
     it "populates cloud public ip" do
@@ -90,13 +218,13 @@ describe Ohai::System, "plugin cloud" do
     it "populates first cloud public ip" do
       @plugin[:rackspace][:public_ipv4] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:public_ips].first).to eq(@plugin[:rackspace][:public_ipv4])
+      expect(@plugin[:cloud][:public_ipv4_addrs].first).to eq(@plugin[:rackspace][:public_ipv4])
     end
 
     it "populates first cloud public ip" do
       @plugin[:rackspace][:local_ipv4] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:private_ips].first).to eq(@plugin[:rackspace][:local_ipv4])
+      expect(@plugin[:cloud][:local_ipv4_addrs].first).to eq(@plugin[:rackspace][:local_ipv4])
     end
 
     it "populates cloud provider" do
@@ -107,25 +235,25 @@ describe Ohai::System, "plugin cloud" do
 
   describe "with linode mash" do
     before do
-      @plugin[:linode] = Mash.new()
+      @plugin[:linode] = Mash.new
     end
 
     it "populates cloud public ip" do
       @plugin[:linode]["public_ip"] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:public_ips][0]).to eq(@plugin[:linode][:public_ip])
+      expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq(@plugin[:linode][:public_ip])
     end
 
     it "populates cloud private ip" do
       @plugin[:linode]["private_ip"] = "10.252.42.149"
       @plugin.run
-      expect(@plugin[:cloud][:private_ips][0]).to eq(@plugin[:linode][:private_ip])
+      expect(@plugin[:cloud][:local_ipv4_addrs][0]).to eq(@plugin[:linode][:private_ip])
     end
 
     it "populates first cloud public ip" do
       @plugin[:linode]["public_ip"] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:public_ips].first).to eq(@plugin[:linode][:public_ip])
+      expect(@plugin[:cloud][:public_ipv4_addrs].first).to eq(@plugin[:linode][:public_ip])
     end
 
     it "populates cloud provider" do
@@ -136,19 +264,19 @@ describe Ohai::System, "plugin cloud" do
 
   describe "with eucalyptus mash" do
     before do
-      @plugin[:eucalyptus] = Mash.new()
+      @plugin[:eucalyptus] = Mash.new
     end
 
     it "populates cloud public ip" do
       @plugin[:eucalyptus]["public_ipv4"] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:public_ips][0]).to eq(@plugin[:eucalyptus]["public_ipv4"])
+      expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq(@plugin[:eucalyptus]["public_ipv4"])
     end
 
     it "populates cloud private ip" do
       @plugin[:eucalyptus]["local_ipv4"] = "10.252.42.149"
       @plugin.run
-      expect(@plugin[:cloud][:private_ips][0]).to eq(@plugin[:eucalyptus]["local_ipv4"])
+      expect(@plugin[:cloud][:local_ipv4_addrs][0]).to eq(@plugin[:eucalyptus]["local_ipv4"])
     end
 
     it "populates cloud provider" do
@@ -159,39 +287,31 @@ describe Ohai::System, "plugin cloud" do
 
   describe "with Azure mash" do
     before do
-      @plugin[:azure] = Mash.new()
-    end
-
-    it "populates cloud private ip" do
-      @plugin[:azure]["private_ip"] = "10.0.0.1"
-      @plugin.run
-      expect(@plugin[:cloud][:private_ips][0]).to eq(@plugin[:azure]["private_ip"])
+      @plugin[:azure] = Mash.new
     end
 
     it "populates cloud public ip" do
       @plugin[:azure]["public_ip"] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:public_ips][0]).to eq(@plugin[:azure]["public_ip"])
-      expect(@plugin[:cloud][:public_ipv4]).to eq(@plugin[:azure]["public_ip"])
+      expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq(@plugin[:azure]["public_ip"])
     end
 
-    it "populates cloud vm_name" do
+    it "doesn't populates cloud vm_name" do
       @plugin[:azure]["vm_name"] = "linux-vm"
       @plugin.run
-      expect(@plugin[:cloud][:vm_name]).to eq(@plugin[:azure]["vm_name"])
+      expect(@plugin[:cloud][:vm_name]).not_to eq(@plugin[:azure]["vm_name"])
     end
 
-    it "populates cloud public_fqdn" do
+    it "populates cloud public_hostname" do
       @plugin[:azure]["public_fqdn"] = "linux-vm-svc.cloudapp.net"
       @plugin.run
-      expect(@plugin[:cloud][:public_fqdn]).to eq(@plugin[:azure]["public_fqdn"])
       expect(@plugin[:cloud][:public_hostname]).to eq(@plugin[:azure]["public_fqdn"])
     end
 
-    it "populates cloud public_ssh_port" do
+    it "doesn't populate cloud public_ssh_port" do
       @plugin[:azure]["public_ssh_port"] = "22"
       @plugin.run
-      expect(@plugin[:cloud][:public_ssh_port]).to eq(@plugin[:azure]["public_ssh_port"])
+      expect(@plugin[:cloud][:public_ssh_port]).to be_nil
     end
 
     it "should not populate cloud public_ssh_port when winrm is used" do
@@ -203,7 +323,7 @@ describe Ohai::System, "plugin cloud" do
     it "populates cloud public_winrm_port" do
       @plugin[:azure]["public_winrm_port"] = "5985"
       @plugin.run
-      expect(@plugin[:cloud][:public_winrm_port]).to eq(@plugin[:azure]["public_winrm_port"])
+      expect(@plugin[:cloud][:public_winrm_port]).to be_nil
     end
 
     it "populates cloud provider" do
@@ -215,54 +335,94 @@ describe Ohai::System, "plugin cloud" do
   describe "with digital_ocean mash" do
     before do
       @plugin[:digital_ocean] = Mash.new
-      @plugin[:digital_ocean][:name] = "public.example.com"
-      @plugin[:digital_ocean][:networks] = Mash.new
-      @plugin[:digital_ocean][:networks][:v4] = [{ "ip_address" => "1.2.3.4", "type" => "public" },
-                                                 { "ip_address" => "5.6.7.8", "type" => "private" }]
-      @plugin[:digital_ocean][:networks][:v6] = [{ "ip_address" => "fe80::4240:95ff:fe47:6eee", "type" => "public" },
-                                                 { "ip_address" => "fdf8:f53b:82e4::53", "type" => "private" }]
+      @plugin[:digital_ocean][:interfaces] = Mash.new
+      @plugin[:digital_ocean][:interfaces] = {
+        "private" =>
+          [
+            {
+              "ipv4" =>
+              {
+                "ip_address" => "10.135.32.4",
+                "netmask" => "255.255.0.0",
+                "gateway" => "10.135.0.1",
+              },
+              "mac" => "36:9e:23:65:c1:fe",
+              "type" => "private",
+            },
+          ],
+        "public" =>
+          [
+            {
+              "ipv4" =>
+                {
+                  "ip_address" => "207.154.221.42",
+                  "netmask" => "255.255.240.0",
+                  "gateway" => "207.154.208.1",
+                },
+              "ipv6" =>
+                {
+                  "ip_address" => "2A03:B0C0:0003:00D0:0000:0000:3B15:B001",
+                  "cidr" => 64,
+                  "gateway" => "2A03:B0C0:0003:00D0:0000:0000:0000:0001",
+                },
+              "anchor_ipv4" =>
+                {
+                  "ip_address" => "10.19.0.5",
+                  "netmask" => "255.255.0.0",
+                  "gateway" => "10.19.0.1",
+                },
+              "mac" => "9a:80:15:02:7a:c1",
+              "type" => "public",
+            },
+          ],
+        }
     end
 
     before(:each) do
       @plugin.run
     end
 
-    it "populates cloud public hostname" do
-      expect(@plugin[:cloud][:public_hostname]).to eq("public.example.com")
-    end
-
     it "populates cloud local hostname" do
       expect(@plugin[:cloud][:local_hostname]).to be_nil
     end
 
-    it "populates cloud public ips" do
-      expect(@plugin[:cloud][:public_ips]).to eq(@plugin[:digital_ocean][:networks][:v4].select { |ip| ip["type"] == "public" } +
-                                             @plugin[:digital_ocean][:networks][:v6].select { |ip| ip["type"] == "public" })
+    it "populates cloud public_ipv4_addrs" do
+      expect(@plugin[:cloud][:public_ipv4_addrs]).to eq(["207.154.221.42"])
+
     end
 
-    it "populates cloud private ips" do
-      expect(@plugin[:cloud][:private_ips]).to eq(@plugin[:digital_ocean][:networks][:v4].select { |ip| ip["type"] == "private" } +
-                                              @plugin[:digital_ocean][:networks][:v6].select { |ip| ip["type"] == "private" })
+    it "populates cloud local_ipv4_addrs" do
+      expect(@plugin[:cloud][:local_ipv4_addrs]).to eq(["10.135.32.4"])
+
     end
 
     it "populates cloud public_ipv4" do
-      expect(@plugin[:cloud][:public_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find { |ip| ip["type"] == "public" })
+      expect(@plugin[:cloud][:public_ipv4]).to eq("207.154.221.42")
     end
 
     it "populates cloud local_ipv4" do
-      expect(@plugin[:cloud][:local_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find { |ip| ip["type"] == "private" })
+      expect(@plugin[:cloud][:local_ipv4]).to eq("10.135.32.4")
+    end
+
+    it "populates cloud public_ipv6_addrs" do
+      expect(@plugin[:cloud][:public_ipv6_addrs]).to eq(["2a03:b0c0:3:d0::3b15:b001"])
+    end
+
+    it "populates cloud local_ipv6_addrs" do
+      expect(@plugin[:cloud][:local_ipv6_addrs]).to be_nil
     end
 
     it "populates cloud public_ipv6" do
-      expect(@plugin[:cloud][:public_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find { |ip| ip["type"] == "public" })
+      expect(@plugin[:cloud][:public_ipv6]).to eq("2a03:b0c0:3:d0::3b15:b001")
     end
 
     it "populates cloud local_ipv6" do
-      expect(@plugin[:cloud][:local_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find { |ip| ip["type"] == "private" })
+      expect(@plugin[:cloud][:local_ipv6]).to be_nil
     end
 
     it "populates cloud provider" do
       expect(@plugin[:cloud][:provider]).to eq("digital_ocean")
     end
   end
+
 end