diff options
| -rw-r--r-- | lib/ohai/plugins/linux/platform.rb | 6 | ||||
| -rw-r--r-- | spec/unit/plugins/linux/platform_spec.rb | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb index 96beb4cf..d06c61d0 100644 --- a/lib/ohai/plugins/linux/platform.rb +++ b/lib/ohai/plugins/linux/platform.rb @@ -209,6 +209,9 @@ Ohai.plugin(:Platform) do contents = File.read("/etc/parallels-release").chomp platform get_redhatish_platform(contents) platform_version contents.match(/(\d\.\d\.\d)/)[0] + elsif File.exist?("/etc/Eos-release") + platform "arista_eos" + platform_version File.read("/etc/Eos-release").strip.split[-1] elsif File.exist?("/etc/redhat-release") contents = File.read("/etc/redhat-release").chomp platform get_redhatish_platform(contents) @@ -232,9 +235,6 @@ Ohai.plugin(:Platform) do else platform "suse" end - elsif File.exist?("/etc/Eos-release") - platform "arista_eos" - platform_version File.read("/etc/Eos-release").strip.split[-1] elsif os_release_file_is_cisco? raise "unknown Cisco /etc/os-release or /etc/cisco-release ID_LIKE field" if os_release_info["ID_LIKE"].nil? || !os_release_info["ID_LIKE"].include?("wrlinux") diff --git a/spec/unit/plugins/linux/platform_spec.rb b/spec/unit/plugins/linux/platform_spec.rb index 5560fc84..4f0f1a38 100644 --- a/spec/unit/plugins/linux/platform_spec.rb +++ b/spec/unit/plugins/linux/platform_spec.rb @@ -445,6 +445,8 @@ OS_DATA describe "on arista eos" do + let(:have_system_release) { true } + let(:have_redhat_release) { true } let(:have_eos_release) { true } before(:each) do @@ -452,11 +454,11 @@ OS_DATA end it "should set platform to arista_eos" do - expect(File).to receive(:read).with("/etc/Eos-release").and_return("Arista Networks EOS 4.16.7M") + expect(File).to receive(:read).with("/etc/Eos-release").and_return("Arista Networks EOS 4.21.1.1F") plugin.run expect(plugin[:platform]).to eq("arista_eos") expect(plugin[:platform_family]).to eq("fedora") - expect(plugin[:platform_version]).to eq("4.16.7M") + expect(plugin[:platform_version]).to eq("4.21.1.1F") end end |