ohai 8.10.0 → 8.11.1

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 File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "AIX network plugin" do
 
@@ -94,15 +94,15 @@ ARP_AN
     end
 
     it "detects network information" do
-      expect(@plugin['network']).not_to be_nil
+      expect(@plugin["network"]).not_to be_nil
     end
 
     it "detects the interfaces" do
-      expect(@plugin['network']['interfaces'].keys.sort).to eq(["en0", "en1", "lo0"])
+      expect(@plugin["network"]["interfaces"].keys.sort).to eq(%w{en0 en1 lo0})
     end
 
     it "detects the ip addresses of the interfaces" do
-      expect(@plugin['network']['interfaces']['en0']['addresses'].keys).to include('172.29.174.58')
+      expect(@plugin["network"]["interfaces"]["en0"]["addresses"].keys).to include("172.29.174.58")
     end
   end
 
@@ -124,11 +124,11 @@ ARP_AN
       end
 
       it "returns the default gateway of the system's network" do
-        expect(@plugin[:network][:default_gateway]).to eq('172.31.8.1')
+        expect(@plugin[:network][:default_gateway]).to eq("172.31.8.1")
       end
 
       it "returns the default interface of the system's network" do
-        expect(@plugin[:network][:default_interface]).to eq('en0')
+        expect(@plugin[:network][:default_interface]).to eq("en0")
       end
     end
   end
@@ -155,42 +155,42 @@ ARP_AN
   describe "lsdev -Cc if" do
     it "detects the state of the interfaces in the system" do
       @plugin.run
-      expect(@plugin['network']['interfaces']['en0'][:state]).to eq("up")
+      expect(@plugin["network"]["interfaces"]["en0"][:state]).to eq("up")
     end
 
     describe "ifconfig interface" do
       it "detects the CHAIN network flag" do
         @plugin.run
-        expect(@plugin['network']['interfaces']['en0'][:flags]).to include('CHAIN')
+        expect(@plugin["network"]["interfaces"]["en0"][:flags]).to include("CHAIN")
       end
 
       it "detects the metric network flag" do
         @plugin.run
-        expect(@plugin['network']['interfaces']['en0'][:metric]).to eq('1')
+        expect(@plugin["network"]["interfaces"]["en0"][:metric]).to eq("1")
       end
 
       context "inet entries" do
         before do
           @plugin.run
-          @inet_entry = @plugin['network']['interfaces']['en0'][:addresses]["172.29.174.58"]
+          @inet_entry = @plugin["network"]["interfaces"]["en0"][:addresses]["172.29.174.58"]
         end
 
         it "detects the family" do
-          expect(@inet_entry[:family]).to eq('inet')
+          expect(@inet_entry[:family]).to eq("inet")
         end
 
         it "detects the netmask" do
-          expect(@inet_entry[:netmask]).to eq('255.255.192.0')
+          expect(@inet_entry[:netmask]).to eq("255.255.192.0")
         end
 
         it "detects the broadcast" do
-          expect(@inet_entry[:broadcast]).to eq('172.29.191.255')
+          expect(@inet_entry[:broadcast]).to eq("172.29.191.255")
         end
 
         it "detects all key-values" do
-          expect(@plugin['network']['interfaces']['en0'][:tcp_sendspace]).to eq("262144")
-          expect(@plugin['network']['interfaces']['en0'][:tcp_recvspace]).to eq("262144")
-          expect(@plugin['network']['interfaces']['en0'][:rfc1323]).to eq("1")
+          expect(@plugin["network"]["interfaces"]["en0"][:tcp_sendspace]).to eq("262144")
+          expect(@plugin["network"]["interfaces"]["en0"][:tcp_recvspace]).to eq("262144")
+          expect(@plugin["network"]["interfaces"]["en0"][:rfc1323]).to eq("1")
         end
 
         # For an output with no netmask like inet 172.29.174.59 broadcast 172.29.191.255
@@ -200,13 +200,13 @@ ARP_AN
           end
 
           it "detects the default prefixlen" do
-            @inet_entry = @plugin['network']['interfaces']['en0'][:addresses]["172.29.174.59"]
-            expect(@inet_entry[:prefixlen]).to eq('32')
+            @inet_entry = @plugin["network"]["interfaces"]["en0"][:addresses]["172.29.174.59"]
+            expect(@inet_entry[:prefixlen]).to eq("32")
           end
 
           it "detects the default netmask" do
-            @inet_entry = @plugin['network']['interfaces']['en0'][:addresses]["172.29.174.59"]
-            expect(@inet_entry[:netmask]).to eq('255.255.255.255')
+            @inet_entry = @plugin["network"]["interfaces"]["en0"][:addresses]["172.29.174.59"]
+            expect(@inet_entry[:netmask]).to eq("255.255.255.255")
           end
         end
       end
@@ -214,15 +214,15 @@ ARP_AN
       context "inet6 entries" do
         before do
           @plugin.run
-          @inet_entry = @plugin['network']['interfaces']['en0'][:addresses]["::1"]
+          @inet_entry = @plugin["network"]["interfaces"]["en0"][:addresses]["::1"]
         end
 
         it "detects the prefixlen" do
-          expect(@inet_entry[:prefixlen]).to eq('0')
+          expect(@inet_entry[:prefixlen]).to eq("0")
         end
 
         it "detects the family" do
-          expect(@inet_entry[:family]).to eq('inet6')
+          expect(@inet_entry[:family]).to eq("inet6")
         end
       end
     end
@@ -230,10 +230,10 @@ ARP_AN
     context "entstat -d interface" do
       before do
         @plugin.run
-        @inet_interface_addresses = @plugin['network']['interfaces']['en0'][:addresses]["BE:42:80:00:B0:05"]
+        @inet_interface_addresses = @plugin["network"]["interfaces"]["en0"][:addresses]["BE:42:80:00:B0:05"]
       end
       it "detects the family" do
-        expect(@inet_interface_addresses[:family]).to eq('lladdr')
+        expect(@inet_interface_addresses[:family]).to eq("lladdr")
       end
     end
   end
@@ -245,39 +245,39 @@ ARP_AN
 
     context "inet" do
       it "detects the route destinations" do
-        expect(@plugin['network']['interfaces']['en0'][:routes][0][:destination]).to eq("default")
-        expect(@plugin['network']['interfaces']['en0'][:routes][1][:destination]).to eq("172.29.128.0")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][0][:destination]).to eq("default")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][1][:destination]).to eq("172.29.128.0")
       end
 
       it "detects the route family" do
-        expect(@plugin['network']['interfaces']['en0'][:routes][0][:family]).to eq("inet")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][0][:family]).to eq("inet")
       end
 
       it "detects the route gateway" do
-        expect(@plugin['network']['interfaces']['en0'][:routes][0][:via]).to eq("172.29.128.13")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][0][:via]).to eq("172.29.128.13")
       end
 
       it "detects the route flags" do
-        expect(@plugin['network']['interfaces']['en0'][:routes][0][:flags]).to eq("UG")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][0][:flags]).to eq("UG")
       end
     end
 
     context "inet6" do
 
       it "detects the route destinations" do
-        expect(@plugin['network']['interfaces']['en0'][:routes][4][:destination]).to eq("::1%1")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][4][:destination]).to eq("::1%1")
       end
 
       it "detects the route family" do
-        expect(@plugin['network']['interfaces']['en0'][:routes][4][:family]).to eq("inet6")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][4][:family]).to eq("inet6")
       end
 
       it "detects the route gateway" do
-        expect(@plugin['network']['interfaces']['en0'][:routes][4][:via]).to eq("::1%1")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][4][:via]).to eq("::1%1")
       end
 
       it "detects the route flags" do
-        expect(@plugin['network']['interfaces']['en0'][:routes][4][:flags]).to eq("UH")
+        expect(@plugin["network"]["interfaces"]["en0"][:routes][4][:flags]).to eq("UH")
       end
     end
   end
@@ -287,15 +287,15 @@ ARP_AN
       @plugin.run
     end
     it "supresses the hostname entries" do
-      expect(@plugin['network']['arp'][0][:remote_host]).to eq("?")
+      expect(@plugin["network"]["arp"][0][:remote_host]).to eq("?")
     end
 
     it "detects the remote ip entry" do
-      expect(@plugin['network']['arp'][0][:remote_ip]).to eq("172.29.131.16")
+      expect(@plugin["network"]["arp"][0][:remote_ip]).to eq("172.29.131.16")
     end
 
     it "detects the remote mac entry" do
-      expect(@plugin['network']['arp'][0][:remote_mac]).to eq("6e:87:70:0:40:3")
+      expect(@plugin["network"]["arp"][0][:remote_mac]).to eq("6e:87:70:0:40:3")
     end
   end
 
@@ -304,7 +304,7 @@ ARP_AN
       @plugin.run
     end
     it "converts a netmask from hexadecimal form to decimal form" do
-      expect(@plugin.hex_to_dec_netmask('0xffff0000')).to eq("255.255.0.0")
+      expect(@plugin.hex_to_dec_netmask("0xffff0000")).to eq("255.255.0.0")
     end
   end
 end

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 File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "AIX os plugin" do
   before(:each) do
@@ -32,4 +32,3 @@ describe Ohai::System, "AIX os plugin" do
     expect(@plugin[:os_version]).to eql("6")
   end
 end
-

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 File.expand_path(File.dirname(__FILE__) + "/../../../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 File.expand_path(File.dirname(__FILE__) + "/../../../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 "spec_helper"
 
 describe Ohai::System, "AIX virtualization plugin" do
 
@@ -254,24 +254,24 @@ LSWPAR_L
       expect(plugin[:virtualization][:lpar_name]).to eq("l273pp027")
     end
 
-    context 'when WPARs exist on the LPAR' do
+    context "when WPARs exist on the LPAR" do
       before do
         plugin.run
       end
 
       let(:wpar1) do
-        plugin[:virtualization][:wpars]['applejack-541ba3']
+        plugin[:virtualization][:wpars]["applejack-541ba3"]
       end
 
       let(:wpar2) do
-        plugin[:virtualization][:wpars]['fluttershy-5c969f']
+        plugin[:virtualization][:wpars]["fluttershy-5c969f"]
       end
 
-      it 'detects all WPARs present (2)' do
+      it "detects all WPARs present (2)" do
         expect(plugin[:virtualization][:wpars].length).to eq(2)
       end
 
-      context 'when collecting WPAR info' do
+      context "when collecting WPAR info" do
         it 'finds the WPAR\'s hostname correctly' do
           expect(wpar1[:hostname]).to eq("applejack-pony-541ba3.ponyville.com")
           expect(wpar2[:hostname]).to eq("fluttershy-pony-5c969f.ponyville.com")
@@ -282,20 +282,20 @@ LSWPAR_L
           expect(wpar2[:address]).to eq("192.168.0.18")
         end
 
-        it 'parses device exports properly' do
-          expect(wpar1['device exports']['/dev/nvram']['type']).to eq("pseudo")
-          expect(wpar1['device exports']['/dev/nvram']['status']).to eq("EXPORTED")
+        it "parses device exports properly" do
+          expect(wpar1["device exports"]["/dev/nvram"]["type"]).to eq("pseudo")
+          expect(wpar1["device exports"]["/dev/nvram"]["status"]).to eq("EXPORTED")
         end
       end
     end
 
     context 'when WPARs don\'t exist on the LPAR' do
       before do
-        allow(plugin).to receive(:shell_out).with("lswpar -L").and_return(mock_shell_out(0, '', nil))
+        allow(plugin).to receive(:shell_out).with("lswpar -L").and_return(mock_shell_out(0, "", nil))
         plugin.run
       end
 
-      it 'detects all WPARs present (0)' do
+      it "detects all WPARs present (0)" do
         expect(plugin[:virtualization][:wpars]).to be_nil
       end
     end

data/spec/unit/plugins/azure_spec.rb

@@ -16,57 +16,155 @@
 # limitations under the License.
 #
 
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-require 'open-uri'
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require "open-uri"
 
 describe Ohai::System, "plugin azure" do
   before(:each) do
     @plugin = get_plugin("azure")
   end
 
-  describe "with azure cloud file" do
+  describe "with azure hint file" do
     before(:each) do
-      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/azure.json').and_return(true)
-      allow(File).to receive(:read).with('/etc/chef/ohai/hints/azure.json').and_return('{"public_ip":"137.135.46.202","vm_name":"test-vm","public_fqdn":"service.cloudapp.net","public_ssh_port":"22", "public_winrm_port":"5985"}')
+      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(true)
+      allow(File).to receive(:read).with("/etc/chef/ohai/hints/azure.json").and_return('{"public_ip":"137.135.46.202","vm_name":"test-vm","public_fqdn":"service.cloudapp.net","public_ssh_port":"22", "public_winrm_port":"5985"}')
       allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(true)
       allow(File).to receive(:read).with('C:\chef\ohai\hints/azure.json').and_return('{"public_ip":"137.135.46.202","vm_name":"test-vm","public_fqdn":"service.cloudapp.net","public_ssh_port":"22", "public_winrm_port":"5985"}')
       @plugin.run
     end
 
-    it 'should set the azure cloud attributes' do
+    it "should set the azure cloud attributes" do
       expect(@plugin[:azure]).not_to be_nil
-      expect(@plugin[:azure]['public_ip']).to  eq("137.135.46.202")
-      expect(@plugin[:azure]['vm_name']).to eq("test-vm")
-      expect(@plugin[:azure]['public_fqdn']).to eq("service.cloudapp.net")
-      expect(@plugin[:azure]['public_ssh_port']).to eq("22")
-      expect(@plugin[:azure]['public_winrm_port']).to eq("5985")
+      expect(@plugin[:azure]["public_ip"]).to eq("137.135.46.202")
+      expect(@plugin[:azure]["vm_name"]).to eq("test-vm")
+      expect(@plugin[:azure]["public_fqdn"]).to eq("service.cloudapp.net")
+      expect(@plugin[:azure]["public_ssh_port"]).to eq("22")
+      expect(@plugin[:azure]["public_winrm_port"]).to eq("5985")
     end
 
   end
 
-  describe "without azure cloud file" do
+  describe "without azure hint file or agent or dhcp options" do
     before(:each) do
-      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/azure.json').and_return(false)
+      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
       allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
+      allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
+      allow(File).to receive(:exist?).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(true)
+      @double_file = double("/var/lib/dhcp/dhclient.eth0.leases")
+      allow(@double_file).to receive(:each).
+        and_yield("lease {").
+        and_yield('  interface "eth0";').
+        and_yield("  fixed-address 192.168.1.194;").
+        and_yield("  option subnet-mask 255.255.255.0;").
+        and_yield("  option routers 192.168.1.1;").
+        and_yield("  option dhcp-lease-time 86400;").
+        and_yield("  option dhcp-message-type 5;").
+        and_yield("  option domain-name-servers 8.8.8.8;").
+        and_yield("  option dhcp-server-identifier 192.168.1.2;").
+        and_yield("  option interface-mtu 1454;").
+        and_yield("  option dhcp-renewal-time 42071;").
+        and_yield("  option broadcast-address 192.168.1.255;").
+        and_yield("  option dhcp-rebinding-time 74471;").
+        and_yield('  option host-name "host-192-168-1-194";').
+        and_yield('  option domain-name "openstacklocal";').
+        and_yield("  renew 2 2016/03/01 01:49:41;").
+        and_yield("  rebind 2 2016/03/01 13:22:07;").
+        and_yield("  expire 2 2016/03/01 16:40:56;").
+        and_yield("}")
+      allow(File).to receive(:open).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(@double_file)
+      @plugin.run
     end
 
-    it 'should not behave like azure' do
+    it "should not behave like azure" do
       expect(@plugin[:azure]).to be_nil
     end
   end
 
-  describe "with rackspace cloud file" do
+  describe "with rackspace hint file no agent and no dhcp lease" do
     before(:each) do
-      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
-      allow(File).to receive(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
+      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(true)
+      allow(File).to receive(:read).with("/etc/chef/ohai/hints/rackspace.json").and_return("")
       allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
+      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return("")
+      allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
+      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
+      allow(File).to receive(:exist?).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(false)
+      @plugin.run
     end
 
-    it 'should not behave like azure' do
+    it "should not behave like azure" do
       expect(@plugin[:azure]).to be_nil
     end
   end
 
+  describe "without azure hint file but with agent on linux" do
+    before(:each) do
+      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(true)
+      allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
+      @plugin.run
+    end
+
+    it "should create empty azure mash" do
+      expect(@plugin[:azure]).to be_empty
+    end
+  end
+
+  describe "without azure hint file but with agent on windows" do
+    before(:each) do
+      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
+      allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(true)
+      @plugin.run
+    end
+
+    it "should create empty azure mash" do
+      puts "The dir exists?:" + "#{Dir.exist?('C:\WindowsAzure')}"
+      expect(@plugin[:azure]).to be_empty
+    end
+  end
+
+  describe "without azure hint or agent but with dhcp option" do
+    before(:each) do
+      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
+      allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
+      allow(File).to receive(:exist?).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(true)
+      @double_file = double("/var/lib/dhcp/dhclient.eth0.leases")
+      allow(@double_file).to receive(:each).
+        and_yield("lease {").
+        and_yield('  interface "eth0";').
+        and_yield("  fixed-address 10.1.0.5;").
+        and_yield('  server-name "RD24BE05C6F140";').
+        and_yield("  option subnet-mask 255.255.255.0;").
+        and_yield("  option dhcp-lease-time 4294967295;").
+        and_yield("  option routers 10.1.0.1;").
+        and_yield("  option dhcp-message-type 5;").
+        and_yield("  option dhcp-server-identifier 168.63.129.16;").
+        and_yield("  option domain-name-servers 168.63.129.16;").
+        and_yield("  option dhcp-renewal-time 4294967295;").
+        and_yield("  option rfc3442-classless-static-routes 0,10,1,0,1,32,168,63,129,16,10,1,0,1;").
+        and_yield("  option unknown-245 a8:3f:81:10;").
+        and_yield("  option dhcp-rebinding-time 4294967295;").
+        and_yield('  option domain-name "v4wvfurds4relghweduc4zqjmd.dx.internal.cloudapp.net";').
+        and_yield("  renew 5 2152/03/10 09:03:39;").
+        and_yield("  rebind 5 2152/03/10 09:03:39;").
+        and_yield("  expire 5 2152/03/10 09:03:39;").
+        and_yield("}")
+      allow(File).to receive(:open).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(@double_file)
+      @plugin.run
+    end
+
+    it "should create empty azure mash" do
+      puts "The dir exists?:" + "#{Dir.exist?('C:\WindowsAzure')}"
+      expect(@plugin[:azure]).to be_empty
+    end
+  end
+
 end