Skip to content

Commit

Permalink
Merge pull request #2025 from florindragos/FACT-2726
Browse files Browse the repository at this point in the history
(FACT-2726) Add solaris dmi facts
  • Loading branch information
Bogdan Irimie authored Aug 12, 2020
2 parents 835641d + 1d3ac12 commit 54e882c
Show file tree
Hide file tree
Showing 28 changed files with 837 additions and 2 deletions.
2 changes: 1 addition & 1 deletion acceptance/tests/facts/dmi.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
test_name "C96148: verify dmi facts" do
tag 'risk:med'
tag 'risk:high'

confine :except, :platform => 'aix' # no dmi support
confine :except, :platform => 'huawei' # no dmi support
Expand Down
2 changes: 1 addition & 1 deletion acceptance/tests/facts/productname.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
test_name "C89604: verify productname fact" do
tag 'risk:low'
tag 'risk:high'

confine :except, :platform => 'aix' # not supported on
confine :except, :platform => 'huawei' # not supported on
Expand Down
24 changes: 24 additions & 0 deletions lib/facter/facts/solaris/dmi/bios/release_date.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
module Bios
class ReleaseDate
FACT_NAME = 'dmi.bios.release_date'
ALIASES = 'bios_release_date'

def call_the_resolver
fact_value = nil
fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:bios_release_date) if isa == 'i386'
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
end
24 changes: 24 additions & 0 deletions lib/facter/facts/solaris/dmi/bios/vendor.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
module Bios
class Vendor
FACT_NAME = 'dmi.bios.vendor'
ALIASES = 'bios_vendor'

def call_the_resolver
fact_value = nil
fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:bios_vendor) if isa == 'i386'
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
end
24 changes: 24 additions & 0 deletions lib/facter/facts/solaris/dmi/bios/version.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
module Bios
class Version
FACT_NAME = 'dmi.bios.version'
ALIASES = 'bios_version'

def call_the_resolver
fact_value = nil
fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:bios_version) if isa == 'i386'
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
end
24 changes: 24 additions & 0 deletions lib/facter/facts/solaris/dmi/chassis/asset_tag.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
module Chassis
class AssetTag
FACT_NAME = 'dmi.chassis.asset_tag'
ALIASES = 'chassisassettag'

def call_the_resolver
fact_value = nil
fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:chassis_asset_tag) if isa == 'i386'
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
end
24 changes: 24 additions & 0 deletions lib/facter/facts/solaris/dmi/chassis/type.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
module Chassis
class Type
FACT_NAME = 'dmi.chassis.type'
ALIASES = 'chassistype'

def call_the_resolver
fact_value = nil
fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:chassis_type) if isa == 'i386'
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
end
25 changes: 25 additions & 0 deletions lib/facter/facts/solaris/dmi/manufacturer.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
class Manufacturer
FACT_NAME = 'dmi.manufacturer'
ALIASES = 'manufacturer'

def call_the_resolver
fact_value = if isa == 'i386'
Facter::Resolvers::Solaris::Dmi.resolve(:manufacturer)
elsif isa == 'sparc'
Facter::Resolvers::Solaris::DmiSparc.resolve(:manufacturer)
end
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
27 changes: 27 additions & 0 deletions lib/facter/facts/solaris/dmi/product/name.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
module Product
class Name
FACT_NAME = 'dmi.product.name'
ALIASES = 'productname'

def call_the_resolver
fact_value = if isa == 'i386'
Facter::Resolvers::Solaris::Dmi.resolve(:product_name)
elsif isa == 'sparc'
Facter::Resolvers::Solaris::DmiSparc.resolve(:product_name)
end
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
end
27 changes: 27 additions & 0 deletions lib/facter/facts/solaris/dmi/product/serial_number.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
module Product
class SerialNumber
FACT_NAME = 'dmi.product.serial_number'
ALIASES = 'serialnumber'

def call_the_resolver
fact_value = if isa == 'i386'
Facter::Resolvers::Solaris::Dmi.resolve(:serial_number)
elsif isa == 'sparc'
Facter::Resolvers::Solaris::DmiSparc.resolve(:serial_number)
end
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
end
24 changes: 24 additions & 0 deletions lib/facter/facts/solaris/dmi/product/uuid.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# frozen_string_literal: true

module Facts
module Solaris
module Dmi
module Product
class Uuid
FACT_NAME = 'dmi.product.uuid'
ALIASES = 'uuid'

def call_the_resolver
fact_value = nil
fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:product_uuid) if isa == 'i386'
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
end

def isa
Facter::Resolvers::Uname.resolve(:processor)
end
end
end
end
end
end
57 changes: 57 additions & 0 deletions lib/facter/resolvers/solaris/dmi.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# frozen_string_literal: true

module Facter
module Resolvers
module Solaris
class Dmi < BaseResolver
@semaphore = Mutex.new
@fact_list ||= {}

class << self
private

def post_resolve(fact_name)
@fact_list.fetch(fact_name) { read_facts(fact_name) }
end

SMBIOS_PARAMS = {
'SMB_TYPE_BIOS' => {
bios_version: 'Version String: (.+)',
bios_vendor: 'Vendor: (.+)',
bios_release_date: 'Release Date: (.+)'
},
'SMB_TYPE_SYSTEM' => {
manufacturer: 'Manufacturer: (.+)',
product_name: 'Product: (.+)',
serial_number: 'Serial Number: (.+)',
product_uuid: 'UUID: (.+)'
},
'SMB_TYPE_CHASSIS' => {
chassis_asset_tag: 'Asset Tag: (.+)',
chassis_type: '(?:Chassis )?Type: (.+)'
}
}.freeze

def read_facts(fact_name)
param = SMBIOS_PARAMS.find { |_key, hash| hash[fact_name] }
return nil unless param

output = exec_smbios(param[0])
facts = param[1]
facts.each do |name, regx|
@fact_list[name] = output.match(/#{regx}/)&.captures&.first
end

@fact_list[fact_name]
end

def exec_smbios(args)
return unless File.executable?('/usr/sbin/smbios')

Facter::Core::Execution.execute("/usr/sbin/smbios -t #{args}", logger: log)
end
end
end
end
end
end
47 changes: 47 additions & 0 deletions lib/facter/resolvers/solaris/dmi_sparc.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# frozen_string_literal: true

module Facter
module Resolvers
module Solaris
class DmiSparc < BaseResolver
@semaphore = Mutex.new
@fact_list ||= {}

class << self
private

def post_resolve(fact_name)
@fact_list.fetch(fact_name) { read_facts(fact_name) }
end

def read_facts(fact_name)
output = exec_prtdiag
return unless output

matches = output.match(/System Configuration:\s+(.+?)\s+sun\d+\S+\s+(.+)/)&.captures

@fact_list[:manufacturer] = matches[0]&.strip
@fact_list[:product_name] = matches[1]&.strip

sneep = exec_sneep&.strip
@fact_list[:serial_number] = sneep

@fact_list[fact_name]
end

def exec_prtdiag
return unless File.executable?('/usr/sbin/prtdiag')

Facter::Core::Execution.execute('/usr/sbin/prtdiag', logger: log)
end

def exec_sneep
return unless File.executable?('/usr/sbin/sneep')

Facter::Core::Execution.execute('/usr/sbin/sneep', logger: log)
end
end
end
end
end
end
27 changes: 27 additions & 0 deletions spec/facter/facts/solaris/dmi/bios/release_date_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# frozen_string_literal: true

describe Facts::Solaris::Dmi::Bios::ReleaseDate do
describe '#call_the_resolver' do
subject(:fact) { Facts::Solaris::Dmi::Bios::ReleaseDate.new }

let(:date) { '07/03/2018' }

before do
allow(Facter::Resolvers::Solaris::Dmi).to \
receive(:resolve).with(:bios_release_date).and_return(date)
allow(Facter::Resolvers::Uname).to \
receive(:resolve).with(:processor).and_return('i386')
end

it 'calls Facter::Resolvers::Solaris::Dmi' do
fact.call_the_resolver
expect(Facter::Resolvers::Solaris::Dmi).to have_received(:resolve).with(:bios_release_date)
end

it 'returns bios release date fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
contain_exactly(an_object_having_attributes(name: 'dmi.bios.release_date', value: date),
an_object_having_attributes(name: 'bios_release_date', value: date, type: :legacy))
end
end
end
Loading

0 comments on commit 54e882c

Please sign in to comment.