ohai 8.13.0 → 8.14.0

data/spec/unit/plugins/digital_ocean_spec.rb

@@ -43,15 +43,15 @@ describe Ohai::System, "plugin digital_ocean" do
         "eth0" => {
           "addresses" => {
             "00:D3:AD:B3:3F:00" => {
-              "family" => "lladdr"
+              "family" => "lladdr",
             },
             "1.2.3.4" => {
-              "netmask" => "255.255.255.0"
+              "netmask" => "255.255.255.0",
             },
             "2400:6180:0000:00d0:0000:0000:0009:7001" => {},
-          }
-        }
-      }
+          },
+        },
+      },
     }
 
     allow(File).to receive(:exist?).with(hint_path_nix).and_return(true)
@@ -132,10 +132,10 @@ describe Ohai::System, "plugin digital_ocean" do
         @plugin[:network][:interfaces][:eth1] = {
           "addresses" => {
             "10.128.142.89" => {
-              "netmask" => "255.255.255.0"
+              "netmask" => "255.255.255.0",
             },
             "fdf8:f53b:82e4:0000:0000:0000:0000:0053" => {},
-          }
+          },
         }
 
         @plugin.run

data/spec/unit/plugins/dmi_spec.rb

@@ -116,16 +116,16 @@ describe Ohai::System, "plugin dmi" do
   {
     :bios => {
       :vendor => "Phoenix Technologies LTD",
-      :release_date => "12/31/2009"
+      :release_date => "12/31/2009",
     },
     :system => {
       :manufacturer => "VMware, Inc.",
-      :product_name => "VMware Virtual Platform"
+      :product_name => "VMware Virtual Platform",
     },
     :chassis => {
       :lock => "Not Present",
-      :asset_tag => "No Asset Tag"
-    }
+      :asset_tag => "No Asset Tag",
+    },
   }.each do |id, data|
     data.each do |attribute, value|
       it "should have [:dmi][:#{id}][:#{attribute}] set" do

data/spec/unit/plugins/ec2_spec.rb

@@ -22,27 +22,29 @@ require "open-uri"
 require "base64"
 
 describe Ohai::System, "plugin ec2" do
+
   before(:each) do
-    @plugin = get_plugin("ec2")
-    @plugin[:network] = { :interfaces => { :eth0 => {} } }
     allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(false)
     allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
-    allow(File).to receive(:exist?).with("/usr/bin/ec2metadata").and_return(false)
-    allow(File).to receive(:exist?).with("/usr/bin/rackspace-monitoring-agent").and_return(false)
+    allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(false)
   end
 
   shared_examples_for "!ec2" do
-    it "should NOT attempt to fetch the ec2 metadata or set ec2 attribute" do
-      expect(@plugin).not_to receive(:http_client)
-      expect(@plugin[:ec2]).to be_nil
-      @plugin.run
+    let(:plugin) { get_plugin("ec2") }
+
+    it "DOESN'T attempt to fetch the ec2 metadata or set ec2 attribute" do
+      expect(plugin).not_to receive(:http_client)
+      expect(plugin[:ec2]).to be_nil
+      plugin.run
     end
   end
 
   shared_examples_for "ec2" do
+    let(:plugin) { get_plugin("ec2") }
+
     before(:each) do
       @http_client = double("Net::HTTP client")
-      allow(@plugin).to receive(:http_client).and_return(@http_client)
+      allow(plugin).to receive(:http_client).and_return(@http_client)
       allow(IO).to receive(:select).and_return([[], [1], []])
       t = double("connection")
       allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
@@ -71,12 +73,12 @@ describe Ohai::System, "plugin ec2" do
           with("/2012-01-12/user-data/").
           and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
 
-        @plugin.run
+        plugin.run
 
-        expect(@plugin[:ec2]).not_to be_nil
-        expect(@plugin[:ec2]["instance_type"]).to eq("c1.medium")
-        expect(@plugin[:ec2]["ami_id"]).to eq("ami-5d2dc934")
-        expect(@plugin[:ec2]["security_groups"]).to eql %w{group1 group2}
+        expect(plugin[:ec2]).not_to be_nil
+        expect(plugin[:ec2]["instance_type"]).to eq("c1.medium")
+        expect(plugin[:ec2]["ami_id"]).to eq("ami-5d2dc934")
+        expect(plugin[:ec2]["security_groups"]).to eql %w{group1 group2}
       end
 
       it "fetches binary userdata opaquely" do
@@ -89,17 +91,17 @@ describe Ohai::System, "plugin ec2" do
           with("/2012-01-12/user-data/").
           and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
 
-        @plugin.run
+        plugin.run
 
-        expect(@plugin[:ec2]).not_to be_nil
-        expect(@plugin[:ec2]["instance_type"]).to eq("c1.medium")
-        expect(@plugin[:ec2]["ami_id"]).to eq("ami-5d2dc934")
-        expect(@plugin[:ec2]["security_groups"]).to eql %w{group1 group2}
-        expect(@plugin[:ec2]["userdata"]).to eq(Base64.decode64("Xl88OEI+XkheSDxDNz5VXkBeQ3NvbWV0aGluZ15AS1Q8Qzg+PEM5PiwpPEM5\nPklVKEktLkk8Q0I+PENDPkk8RTU+XkJeQF5RejxCRj48QjA+XlJeQF5AXkA="))
+        expect(plugin[:ec2]).not_to be_nil
+        expect(plugin[:ec2]["instance_type"]).to eq("c1.medium")
+        expect(plugin[:ec2]["ami_id"]).to eq("ami-5d2dc934")
+        expect(plugin[:ec2]["security_groups"]).to eql %w{group1 group2}
+        expect(plugin[:ec2]["userdata"]).to eq(Base64.decode64("Xl88OEI+XkheSDxDNz5VXkBeQ3NvbWV0aGluZ15AS1Q8Qzg+PEM5PiwpPEM5\nPklVKEktLkk8Q0I+PENDPkk8RTU+XkJeQF5RejxCRj48QjA+XlJeQF5AXkA="))
       end
     end
 
-    it "should parse ec2 network/ directory as a multi-level hash" do
+    it "parses ec2 network/ directory as a multi-level hash" do
       expect(@http_client).to receive(:get).
         with("/2012-01-12/meta-data/").
         and_return(double("Net::HTTP Response", :body => "network/", :code => "200"))
@@ -122,10 +124,10 @@ describe Ohai::System, "plugin ec2" do
         with("/2012-01-12/user-data/").
         and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
 
-      @plugin.run
+      plugin.run
 
-      expect(@plugin[:ec2]).not_to be_nil
-      expect(@plugin[:ec2]["network_interfaces_macs"]["12:34:56:78:9a:bc"]["public_hostname"]).to eql("server17.opscode.com")
+      expect(plugin[:ec2]).not_to be_nil
+      expect(plugin[:ec2]["network_interfaces_macs"]["12:34:56:78:9a:bc"]["public_hostname"]).to eql("server17.opscode.com")
     end # context with common metadata paths
 
     context "with ec2_iam hint file" do
@@ -139,7 +141,7 @@ describe Ohai::System, "plugin ec2" do
         end
       end
 
-      it "should parse ec2 iam/ directory and collect iam/security-credentials/" do
+      it "parses ec2 iam/ directory and collect iam/security-credentials/" do
         expect(@http_client).to receive(:get).
           with("/2012-01-12/meta-data/").
           and_return(double("Net::HTTP Response", :body => "iam/", :code => "200"))
@@ -156,11 +158,11 @@ describe Ohai::System, "plugin ec2" do
           with("/2012-01-12/user-data/").
           and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
 
-        @plugin.run
+        plugin.run
 
-        expect(@plugin[:ec2]).not_to be_nil
-        expect(@plugin[:ec2]["iam"]["security-credentials"]["MyRole"]["Code"]).to eql "Success"
-        expect(@plugin[:ec2]["iam"]["security-credentials"]["MyRole"]["Token"]).to eql "12345678"
+        expect(plugin[:ec2]).not_to be_nil
+        expect(plugin[:ec2]["iam"]["security-credentials"]["MyRole"]["Code"]).to eql "Success"
+        expect(plugin[:ec2]["iam"]["security-credentials"]["MyRole"]["Token"]).to eql "12345678"
       end
     end
 
@@ -173,7 +175,7 @@ describe Ohai::System, "plugin ec2" do
         end
       end
 
-      it "should parse ec2 iam/ directory and NOT collect iam/security-credentials/" do
+      it "parses ec2 iam/ directory and NOT collect iam/security-credentials/" do
         expect(@http_client).to receive(:get).
           with("/2012-01-12/meta-data/").
           and_return(double("Net::HTTP Response", :body => "iam/", :code => "200"))
@@ -190,14 +192,14 @@ describe Ohai::System, "plugin ec2" do
           with("/2012-01-12/user-data/").
           and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
 
-        @plugin.run
+        plugin.run
 
-        expect(@plugin[:ec2]).not_to be_nil
-        expect(@plugin[:ec2]["iam"]).to be_nil
+        expect(plugin[:ec2]).not_to be_nil
+        expect(plugin[:ec2]["iam"]).to be_nil
       end
     end
 
-    it "should ignore \"./\" and \"../\" on ec2 metadata paths to avoid infinity loops" do
+    it "ignores \"./\" and \"../\" on ec2 metadata paths to avoid infinity loops" do
       expect(@http_client).to receive(:get).
         with("/2012-01-12/meta-data/").
         and_return(double("Net::HTTP Response", :body => ".\n./\n..\n../\npath1/.\npath2/./\npath3/..\npath4/../", :code => "200"))
@@ -229,12 +231,12 @@ describe Ohai::System, "plugin ec2" do
         with("/2012-01-12/user-data/").
         and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
 
-      @plugin.run
+      plugin.run
 
-      expect(@plugin[:ec2]).not_to be_nil
+      expect(plugin[:ec2]).not_to be_nil
     end
 
-    it "should complete the run despite unavailable metadata" do
+    it "completes the run despite unavailable metadata" do
       expect(@http_client).to receive(:get).
         with("/2012-01-12/meta-data/").
         and_return(double("Net::HTTP Response", :body => "metrics/", :code => "200"))
@@ -248,46 +250,50 @@ describe Ohai::System, "plugin ec2" do
         with("/2012-01-12/user-data/").
         and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
 
-      @plugin.run
+      plugin.run
 
-      expect(@plugin[:ec2]).not_to be_nil
-      expect(@plugin[:ec2]["metrics"]).to be_nil
-      expect(@plugin[:ec2]["metrics_vhostmd"]).to be_nil
+      expect(plugin[:ec2]).not_to be_nil
+      expect(plugin[:ec2]["metrics"]).to be_nil
+      expect(plugin[:ec2]["metrics_vhostmd"]).to be_nil
     end
   end # shared examples for ec2
 
-  describe "without dmi or ec2metadata binary, with xen mac, and metadata address connected" do
+  describe "with ec2 dmi data" do
+    it_behaves_like "ec2"
+
     before(:each) do
-      allow(IO).to receive(:select).and_return([[], [1], []])
-      @plugin[:network][:interfaces][:eth0][:arp] = { "169.254.1.0" => "fe:ff:ff:ff:ff:ff" }
+      plugin[:dmi] = { :bios => { :all_records => [ { :Version => "4.2.amazon" } ] } }
     end
+  end
 
-    it_should_behave_like "ec2"
+  describe "with amazon kernel data" do
+    it_behaves_like "ec2"
 
-    it "warns that the arp table method is deprecated" do
-      expect(Ohai::Log).to receive(:warn).with(/will be removed/)
-      @plugin.has_xen_mac?
+    before(:each) do
+      plugin[:kernel] = { :os_info => { :organization => "Amazon.com" } }
     end
   end
 
-  describe "with ec2metadata binary" do
-    it_should_behave_like "ec2"
+  describe "with EC2 Xen UUID" do
+    it_behaves_like "ec2"
 
     before(:each) do
-      allow(File).to receive(:exist?).with("/usr/bin/ec2metadata").and_return(true)
+      allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(true)
+      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("ec2a0561-e4d6-8e15-d9c8-2e0e03adcde8")
     end
   end
 
-  describe "with ec2 dmi data" do
-    it_should_behave_like "ec2"
+  describe "with non-EC2 Xen UUID" do
+    it_behaves_like "!ec2"
 
     before(:each) do
-      @plugin[:dmi] = { :bios => { :all_records => [ { :Version => "4.2.amazon" } ] } }
+      allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(true)
+      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("123a0561-e4d6-8e15-d9c8-2e0e03adcde8")
     end
   end
 
   describe "with ec2 hint file" do
-    it_should_behave_like "ec2"
+    it_behaves_like "ec2"
 
     before(:each) do
       if windows?
@@ -301,7 +307,7 @@ describe Ohai::System, "plugin ec2" do
   end
 
   describe "with rackspace hint file" do
-    it_should_behave_like "!ec2"
+    it_behaves_like "!ec2"
 
     before(:each) do
       allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(true)
@@ -311,24 +317,13 @@ describe Ohai::System, "plugin ec2" do
     end
   end
 
-  describe "with ec2metadata, but with rackspace-monitoring-agent" do
-    it_should_behave_like "!ec2"
-
-    before(:each) do
-      allow(File).to receive(:exist?).with("/usr/bin/ec2metadata").and_return(true)
-      allow(File).to receive(:exist?).with("/usr/bin/rackspace-monitoring-agent").and_return(true)
-    end
-  end
-
   describe "without any hints that it is an ec2 system" do
-    it_should_behave_like "!ec2"
+    it_behaves_like "!ec2"
 
     before(:each) do
       allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(false)
       allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
-      allow(File).to receive(:exist?).with("/usr/bin/ec2metadata").and_return(false)
-      @plugin[:dmi] = nil
-      @plugin[:network][:interfaces][:eth0][:arp] = { "169.254.1.0" => "00:50:56:c0:00:08" }
+      plugin[:dmi] = nil
     end
   end
 

data/spec/unit/plugins/linode_spec.rb

@@ -38,11 +38,11 @@ describe Ohai::System, "plugin linode" do
               "family" => "inet6",
             },
             "40:40:95:47:6E:ED" => {
-              "family" => "lladdr"
+              "family" => "lladdr",
             },
-          }
-        }
-      }
+          },
+        },
+      },
     }
   end
 
@@ -103,9 +103,9 @@ describe Ohai::System, "plugin linode" do
               "family" => "inet6",
             },
             "40:40:F5:AB:28:36" => {
-              "family" => "lladdr"
+              "family" => "lladdr",
             },
-          }
+          },
         }
       end
 

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

@@ -665,6 +665,13 @@ CISCO_RELEASE
         expect(@plugin[:platform]).to eq("opensuse")
         expect(@plugin[:platform_family]).to eq("suse")
       end
+
+      it "should read the platform as opensuseleap on openSUSE Leap" do
+        expect(File).to receive(:read).with("/etc/SuSE-release").and_return("openSUSE 42.1 (x86_64)\nVERSION = 42.1\nCODENAME = Malachite\n")
+        @plugin.run
+        expect(@plugin[:platform]).to eq("opensuseleap")
+        expect(@plugin[:platform_family]).to eq("suse")
+      end
     end
   end
 

data/spec/unit/plugins/linux/sessions_spec.rb

@@ -60,7 +60,7 @@ LOGINCTL_OUT
           "uid" => "1000",
           "user" => "joe",
           "seat" => nil,
-        }
+        },
       },
       "by_user" => {
         "Debian-gdm" => [{
@@ -73,7 +73,7 @@ LOGINCTL_OUT
           "session" => "318",
           "uid" => "0",
           "user" => "root",
-          "seat" => nil
+          "seat" => nil,
         }, {
           "session" => "46",
           "uid" => "0",

data/spec/unit/plugins/network_spec.rb

@@ -58,7 +58,7 @@ describe Ohai::System, "Network Plugin" do
             "flags" => %w{UP BROADCAST RUNNING SIMPLEX MULTICAST},
             "addresses" => {
               "00:00:24:c9:5e:b8" => {
-                "family" => "lladdr"
+                "family" => "lladdr",
               },
               "fe80::200:24ff:fec9:5eb8" => {
                 "family" => "inet6",
@@ -83,7 +83,7 @@ describe Ohai::System, "Network Plugin" do
             "flags" => %w{UP BROADCAST RUNNING PROMISC SIMPLEX MULTICAST},
             "addresses" => {
               "00:00:24:c9:5e:b9" => {
-                "family" => "lladdr"
+                "family" => "lladdr",
               },
               "fe80::200:24ff:fec9:5eb9" => {
                 "family" => "inet6",
@@ -99,7 +99,7 @@ describe Ohai::System, "Network Plugin" do
             "flags" => %w{UP BROADCAST RUNNING PROMISC SIMPLEX MULTICAST},
             "addresses" => {
               "00:00:24:c9:5e:ba" => {
-                "family" => "lladdr"
+                "family" => "lladdr",
               },
               "fe80::200:24ff:fec9:5eba" => {
                 "family" => "inet6",
@@ -115,7 +115,7 @@ describe Ohai::System, "Network Plugin" do
             "flags" => %w{UP BROADCAST RUNNING PROMISC SIMPLEX MULTICAST},
             "addresses" => {
               "00:00:24:c9:5e:bb" => {
-                "family" => "lladdr"
+                "family" => "lladdr",
               },
               "fe80::200:24ff:fec9:5ebb" => {
                 "family" => "inet6",
@@ -158,7 +158,7 @@ describe Ohai::System, "Network Plugin" do
             "flags" => %w{LEARNING DISCOVER AUTOEDGE AUTOPTP},
             "addresses" => {
               "02:20:6f:d2:c4:00" => {
-                "family" => "lladdr"
+                "family" => "lladdr",
               },
               "192.168.2.1" => {
                 "family" => "inet",
@@ -197,7 +197,7 @@ describe Ohai::System, "Network Plugin" do
                 "zoneid" => "gif0",
                 "prefixlen" => "64",
                 "scopeid" => "0xa",
-              }
+              },
             },
           },
         },
@@ -205,7 +205,7 @@ describe Ohai::System, "Network Plugin" do
         "default_interface" => "vr0",
         "default_inet6_gateway" => "2001:470:d:cb4::2",
         "default_inet6_interface" => "bridge0",
-      }
+      },
     },
     "linux" => {
       "network" => {
@@ -241,7 +241,7 @@ describe Ohai::System, "Network Plugin" do
                 "family" => "inet6",
               },
               "00:16:3E:2F:36:79" => {
-                "family" => "lladdr"
+                "family" => "lladdr",
               },
               "192.168.66.33" => {
                 "scope" => "Global",
@@ -271,7 +271,7 @@ describe Ohai::System, "Network Plugin" do
                 "family" => "inet6",
               },
               "00:16:3E:2F:36:80" => {
-                "family" => "lladdr"
+                "family" => "lladdr",
               },
               "192.168.99.11" => {
                 "scope" => "Global",
@@ -295,7 +295,7 @@ describe Ohai::System, "Network Plugin" do
         "default_interface" => "eth0",
         "default_inet6_gateway" => "3ffe:1111:2222::",
         "default_inet6_interface" => "eth0",
-      }
+      },
     },
     "windows" => {
       "network" => {
@@ -314,17 +314,17 @@ describe Ohai::System, "Network Plugin" do
                 "scope" => "Link",
               },
               "52:54:44:66:66:02" => {
-                "family" => "lladdr"
+                "family" => "lladdr",
               },
             },
             "mtu" => nil,
             "type" => "Ethernet 802.3",
             "encapsulation" => "Ethernet",
-          }
+          },
         },
         "default_gateway" => "172.19.0.1",
         "default_interface" => "0xb",
-      }
+      },
     },
   }
 
@@ -936,13 +936,13 @@ describe Ohai::System, "Network Plugin" do
               @plugin["ip6address"] = "3ffe:8888:9999::1"
               @expected_results = {
                 "freebsd" => {
-                  "macaddress" => "02:20:6f:d2:c4:00"
+                  "macaddress" => "02:20:6f:d2:c4:00",
                 },
                 "linux" => {
-                  "macaddress" => "00:16:3E:2F:36:79"
+                  "macaddress" => "00:16:3E:2F:36:79",
                 },
                 "windows" => {
-                  "macaddress" => "52:54:44:66:66:02"
+                  "macaddress" => "52:54:44:66:66:02",
                 },
               }
             end