Merge pull request jhoblitt#30 from jhoblitt/feature/megaraid_facts

update megaraid_serial fact to deal with SM motherboards
samuraiii · May 22, 2014 · 97af513 · 97af513
2 parents 34ccdd4 + 9d2d44b
commit 97af513
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/lib/facter/megaraid_serial.rb b/lib/facter/megaraid_serial.rb
@@ -6,6 +6,7 @@
       output = Facter::Util::Resolution.exec("#{megacli} -Version -Ctrl -aALL -NoLog")
       next if output.nil?
       m = output.match(/Serial No : (\S+)\s*$/)
+      next if m.nil?
       next unless m.size == 2
       m[1]
     end

diff --git a/spec/fixtures/megacli/version-ctrl-aall-sm_no_serial b/spec/fixtures/megacli/version-ctrl-aall-sm_no_serial
@@ -0,0 +1,10 @@
+
+        CTRL VERSION:
+        ================
+
+Product Name : Supermicro SMC2208
+Serial No : 
+Fw Package Build : 23.9.0-0015
+FW Version : 3.220.05-1881
+
+Exit Code: 0x00
diff --git a/spec/unit/facts/megaraid_serial_spec.rb b/spec/unit/facts/megaraid_serial_spec.rb
@@ -25,6 +25,16 @@
         returns(File.read(fixtures('megacli', 'version-ctrl-aall-8.07.07')))
       Facter.fact(:megaraid_serial).value.should == 'SV22925366'
     end
+
+    context 'megacli output is missing serial number' do
+      it 'should get the version string' do
+        Facter.fact(:megacli).stubs(:value).returns('/usr/bin/MegaCli')
+        Facter::Util::Resolution.stubs(:exec).
+          with('/usr/bin/MegaCli -Version -Ctrl -aALL -NoLog').
+          returns(File.read(fixtures('megacli', 'version-ctrl-aall-sm_no_serial')))
+        Facter.fact(:megaraid_serial).value.should be_nil
+      end
+    end
   end
 
 end