onering-report 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ec8274d268a961e2138cb05c7371610982db522
-  data.tar.gz: 0faf9d2467b487596783743c9485940149016d89
+  metadata.gz: 52a32d9a3ce8d7cf810b725c475de4f73897be43
+  data.tar.gz: 2d9baebdcbc0bf1f33e9c13ad0aa8c1137f208c6
 SHA512:
-  metadata.gz: 73c92ee34a7b60620f9c9d232a1ee11ea72d53dd5f23e32c29e3baeb74b995f1a3aee9eb2397181971a9fc2f755bea98f5cade44ce5bc9be3471c768b6a51d2e
-  data.tar.gz: 9a79363d52c99399801d87206bf9171708f5930b698d5e2dea9174ab2468495329d9ffd2a2ecab3b53c60eb6418c531e7c2f132111498a9057d271a6e40eb664
+  metadata.gz: 68f3bf0756d41ac91af178c26c19dbfe06ae7e3bd4ef43407e4fcb039fe10e2b6b399199d075d5255efc360436aad6efd94849e2ae4a6a8f065c9995fdd5f118
+  data.tar.gz: 2ae2657444af6fdf86949cd232e381dc12fcb369e42da71fa21bdffce857bf533f51d877b35e8143f59afd79b01a2e2f3ccb2f3e5e061c94d85fcfd24b70fdb3

data/README.md

@@ -0,0 +1,3 @@
+# Intro
+
+A set of Pupppet Facter facts for onering agent.

data/lib/facter/onering_properties_physical.rb

@@ -1,22 +1,24 @@
+require 'timeout'
+
 Facter.add('site') do
   setcode do
     if File.size?('/etc/onering/static/site')
-      site = File.read('/etc/onering/static/site').strip.chomp
+	site = File.read('/etc/onering/static/site').strip.chomp
 
     else
-      if File.exists?('/proc/cmdline')
-        site = (File.read('/proc/cmdline').chomp.split(' ').select{|i| i =~ /^domain=/ }.first rescue nil)
-        site = site.split('=', 2).last if site
-        site = site.split('.').first if site
-      end
+	if File.exists?('/proc/cmdline')
+	  site = (File.read('/proc/cmdline').chomp.split(' ').select{|i| i =~ /^domain=/ }.first rescue nil)
+	  site = site.split('=', 2).last if site
+	  site = site.split('.').first if site
+	end
     end
 
     site = nil if ['test', 'hw', 'vm'].include?(site)
 
     if site
-      site
+	site
     else
-      Facter.value('fqdn').split('.')[-3].downcase rescue nil
+	Facter.value('fqdn').split('.')[-3].downcase rescue nil
     end
   end
 end
@@ -27,13 +29,13 @@ Facter.add('environment') do
 
     case env
     when 'dev'
-      'development'
+	'development'
     when /(stg|stage)/
-      'staging'
+	'staging'
     when 'prod'
-      'production'
+	'production'
     else
-      nil
+	nil
     end
   end
 end
@@ -46,42 +48,52 @@ Facter.add('slot') do
   end
 end
 
+def ipmi_ok?
+  begin
+    ipmi = IPMI_PATH if defined? IPMI_PATH 
+    ipmi ||= 'ipmiutil'
+    Timeout::timeout(1) {
+	Facter::Util::Resolution.exec("#{ipmi} health 2> /dev/null | tail -n1 | grep failed").nil?
+    }
+  rescue Timeout::Error
+    $stderr.puts "timed out while running #{ipmi}"
+    false
+  end
+end
 
-ipmi_ok = (Facter::Util::Resolution.exec("ipmiutil health 2> /dev/null | tail -n1 | grep failed") === nil)
-
-if ipmi_ok
+if ipmi_ok?
   ipmi_lan = Facter::Util::Resolution.exec("ipmitool lan print 1 2> /dev/null")
 
   if ipmi_lan
     ipmi_lan_data = {}
 
     ipmi_lan.lines.each do |line|
-      key, value = line.split(/:/, 2)
-      value = value.strip.squeeze(' ').chomp
+	key, value = line.split(/:/, 2)
+	value = value.strip.squeeze(' ').chomp
 
-      case key
-      when /^IP Address/i
-        ipmi_lan_data[:ip] = value
+	case key
+	when /^IP Address/i
+	  ipmi_lan_data[:ip] = value
 
-      when /^Subnet Mask/i
-        ipmi_lan_data[:netmask] = value
+	when /^Subnet Mask/i
+	  ipmi_lan_data[:netmask] = value
 
-      when /^MAC Address/i
-        ipmi_lan_data[:macaddress] = value.upcase
+	when /^MAC Address/i
+	  ipmi_lan_data[:macaddress] = value.upcase
 
-      when /^Default Gateway IP/i
-        ipmi_lan_data[:gateway] = value
+	when /^Default Gateway IP/i
+	  ipmi_lan_data[:gateway] = value
 
-      when /^SNMP Community String/i
-        ipmi_lan_data[:snmp_community] = value
+	when /^SNMP Community String/i
+	  ipmi_lan_data[:snmp_community] = value
 
-      end
+	end
     end
 
     ipmi_lan_data.each do |key, value|
-      Facter.add("ipmi_#{key}") do
-        setcode { value }
-      end
+	Facter.add("ipmi_#{key}") do
+	  setcode { value }
+	end
     end
   end
 end

data/onering-report.gemspec

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = 'onering-report'
-  gem.version       = "0.6.5"
+  gem.version       = '0.6.6'
   gem.authors       = ['rnarkis']
   gem.email         = ['rnarkis@outbrain.com']
   gem.description   = %q{Onering facter facts}
   gem.summary       = %q{Onering facter facts}
-  gem.homepage      = ""
+  gem.homepage      = '' 
   gem.add_runtime_dependency 'onering-client'
   gem.add_development_dependency('puppet')
   gem.add_development_dependency('pry')

data/test/bin/ipmiutil

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+sleep 10

data/test/ipmi_test.rb

@@ -0,0 +1,37 @@
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'minitest/autorun'
+require_relative 'test_helper'
+require 'facter'
+
+IPMI_PATH = '/bin/bash test/bin/ipmiutil'
+
+require 'facter/onering_properties_physical'
+
+class IpmiTest < MiniTest::Unit::TestCase
+  include FileUtils
+
+  def setup
+  end
+
+  def teardown 
+    rm_rf 'foo-sandbox'
+  end
+
+  def with_cwd(dir)
+    Dir.chdir dir do
+	yield  
+    end
+  end
+
+  def test_sanity
+    # sanity
+    assert_match(/\d*.\d*.\d*.\d*/, Facter.fact(:netmask).value)
+  end
+
+  def test_ipmi_ok_timeout
+    assert_equal  false, ipmi_ok?
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'rubygems'
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onering-report
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - rnarkis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onering-client
@@ -65,6 +65,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Makefile
+- README.md
 - Rakefile
 - lib/etc/facter.list
 - lib/facter/onering_disk_smart.rb
@@ -100,6 +101,9 @@ files:
 - lib/reporter/default/stats_virident.rb
 - lib/reporter/default/stats_zfs.rb
 - onering-report.gemspec
+- test/bin/ipmiutil
+- test/ipmi_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -123,4 +127,7 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Onering facter facts
-test_files: []
+test_files:
+- test/bin/ipmiutil
+- test/ipmi_test.rb
+- test/test_helper.rb