rightscale-ohai 0.3.3.1 → 0.3.3.2

data/lib/ohai/plugins/cloud.rb

@@ -17,19 +17,42 @@
 provides "cloud"
 
 require_plugin "ec2"
+require_plugin "rackspace"
 
+#
+# EC2
+# 
 def on_ec2?
   ec2 != nil
 end
 
 def get_ec2_values
-  cloud[:instance_id] = ec2['instance_id']
+  cloud[:instance_uid] = ec2['instance_id']
   cloud[:public_ip] = ec2['public_ipv4']
   cloud[:private_ip] = ec2['local_ipv4']
   cloud[:provider] = "ec2"
 end
 
+#
+# rackspace
+#
+def on_rackspace?
+  rackspace != nil
+end
+
+def get_rackspace_values
+  cloud[:instance_uid] = rackspace['instance_uid']
+  cloud[:public_ip] = rackspace['public_ip']
+  cloud[:private_ip] = rackspace['private_ip']
+  cloud[:provider] = "rackspace"
+end
+
 if on_ec2?
   cloud Mash.new
   get_ec2_values
 end
+
+if on_rackspace?
+  cloud Mash.new
+  get_rackspace_values
+end

data/lib/ohai/plugins/rightscale.rb

@@ -13,21 +13,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+require 'json'
  
 provides "rightscale"
- 
-require_plugin "ec2"
 
- 
-def on_rightscale_platform?
-  return false if (ec2 == nil || ec2[:userdata].match(/RS_/) == nil) # only ec2 supported
-  true
+class RightScale
+  MetaDataFile = "/var/spool/rackspace/user-data.txt"  
 end
 
 # this is a hack to convert the RS_<server> tokens into something more 
 # intuative.  Hopefully this will be removed when we stop using EC2
 # userdata. 
 def add_server(key, data)
+  rightscale[:server] = Mash.new unless rightscale.has_key?(:server)
   server_names = {
     "RS_sketchy" => "sketchy",
     "RS_syslog" => "syslog",
@@ -37,9 +36,18 @@ def add_server(key, data)
   rightscale[:server][server_names[key]] = data unless (server_names[key] == nil)
 end
 
+#
+# EC2
+# 
+require_plugin "ec2"
+ 
+def on_rightscale_ec2_platform?
+  return false if (ec2 == nil || ec2[:userdata].match(/RS_/) == nil) # only ec2 supported
+  true
+end
+
 # add all 'RS_' tokens in userdata, but perform translation for server names
-def get_data
-  rightscale[:server] = Mash.new
+def get_data_from_ec2_user_date
   data_array = ec2[:userdata].split('&')
   data_array.each do |d|
     key, data = d.split('=')
@@ -47,7 +55,39 @@ def get_data
   end
 end
  
+if on_rightscale_ec2_platform?
+  rightscale Mash.new
+  get_data_from_ec2_user_date 
+end
+
+
+#
+# Generic cloud
+#
+def on_rightscale_platform?
+  File.exists?(RightScale::MetaDataFile)
+end
+
+# TODO: future
+# def get_data_json
+#   file = File.open(RightScale::MetaDataFile)
+#   json = ""
+#   file.each { |line| json << line }  
+#   data = JSON.parse(json)
+#   data["rightscale"].each { |key, data| rightscale[key] = data }
+# end
+
+def get_data
+  data_array = File.open(RightScale::MetaDataFile)
+  data_array.each do |d|
+    key, data = d.split('=')
+    key.strip!
+    data.strip!
+    rightscale[key.sub(/RS_/,'')] = data unless add_server(key,data) 
+  end
+end
+
 if on_rightscale_platform?
   rightscale Mash.new
-  get_data 
-end
+  get_data
+end  

data/spec/ohai/plugins/cloud_spec.rb

@@ -40,7 +40,7 @@ describe Ohai::System, "plugin cloud" do
       @ohai[:ec2]['instance_id'] = "i-05714c6c"
       @ohai._require_plugin("cloud")
       @ohai[:cloud].should_not be_nil
-      @ohai[:cloud][:instance_id].should == @ohai[:ec2]['instance_id']
+      @ohai[:cloud][:instance_uid].should == @ohai[:ec2]['instance_id']
     end
     
     it "should populate cloud public ip" do
@@ -61,4 +61,34 @@ describe Ohai::System, "plugin cloud" do
     end
   end
   
+  describe "with rackspace" do
+    before(:each) do
+      @ohai[:rackspace] = Mash.new()
+    end  
+    
+    it "should populate cloud id" do      
+      @ohai[:rackspace]['instance_uid'] = "i-05714c6c"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud].should_not be_nil
+      @ohai[:cloud][:instance_uid].should == @ohai[:rackspace][:instance_uid]
+    end
+    
+    it "should populate cloud public ip" do
+      @ohai[:rackspace]['public_ipv4'] = "174.129.150.8"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_ip].should == @ohai[:rackspace][:public_ip]
+    end
+        
+    it "should populate cloud private ip" do
+      @ohai[:rackspace]['local_ipv4'] = "10.252.42.149"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:private_ip].should == @ohai[:rackspace][:private_ip]
+    end
+        
+    it "should populate cloud provider" do
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:provider].should == "rackspace"
+    end
+  end
+  
 end

data/spec/ohai/plugins/rightscale_spec.rb

@@ -16,6 +16,7 @@
 #
  
 require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require 'flexmock'
  
 describe Ohai::System, "plugin rightscale" do
   before(:each) do
@@ -23,6 +24,9 @@ describe Ohai::System, "plugin rightscale" do
     @ohai.stub!(:require_plugin).and_return(true)
   end
   
+  #
+  # EC2 Cloud Support
+  #
   describe "ec2 with RightScale platform" do
     before(:each) do
       @ohai[:ec2] = Mash.new()
@@ -68,4 +72,81 @@ describe Ohai::System, "plugin rightscale" do
     end
   end
   
+  #
+  # Generic Cloud Support
+  #
+  describe "cloud without rightscale" do
+    before(:each) do
+      @ohai[:cloud] = Mash.new()
+    end
+   
+    it "should NOT populate the rightscale data" do
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale].should be_nil
+    end
+  end
+  
+  describe "cloud with RightScale platform" do
+    before(:each) do
+      @ohai[:cloud] = Mash.new()
+      @ohai[:cloud][:provider] = "rackspace"
+      File.stub!(:exists?).and_return(true)
+      @mock_file = mock("datafile")
+      @mock_file.stub!(:each).
+          # json input file (future?)
+          #and_yield('{"rightscale":{"token":"8bd736d4a8de91b143bcebbb3e513f5f","server":{"syslog":"syslog.rightscale.com","sketchy":"sketchy1-11.rightscale.com","core":"my.rightscale.com","lumberjack":"lumberjack.rightscale.com"},"api_url":"https:\/\/my.rightscale.com\/api\/inst\/ec2_instances\/40e9d3956ad2e059f9f4054c6272ce2a38155273"}}')
+          and_yield('RS_syslog=syslog.rightscale.com').
+          and_yield('RS_sketchy=sketchy1-11.rightscale.com').
+          and_yield('RS_server=my.rightscale.com').
+          and_yield('RS_lumberjack=lumberjack.rightscale.com').
+          and_yield('RS_src=dobedobedo').
+          and_yield('RS_token=8bd736d4a8de91b143bcebbb3e513f5f').
+          and_yield('RS_api_url=https://my.rightscale.com/api/inst/ec2_instances/40e9d3956ad2e059f9f4054c6272ce2a38155273').
+          and_yield('RS_token_id=blabla').
+          and_yield('RS_amqp_url=yakityyakyak')       
+        File.stub!(:open).and_return(@mock_file) 
+    end
+    
+    it "should create rightscale mash" do     
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale].should_not be_nil
+    end
+    
+    it "should create rightscale server mash" do
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale][:server].should_not be_nil
+    end
+         
+    it "should populate sketchy server attribute" do
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale][:server][:sketchy].should == "sketchy1-11.rightscale.com"
+    end
+
+    it "should populate core server attribute" do
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale][:server][:core].should == "my.rightscale.com"
+    end
+
+    it "should populate syslog server attribute" do
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale][:server][:syslog].should == "syslog.rightscale.com"
+    end
+
+    it "should populate lumberjack server attribute" do
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale][:server][:lumberjack].should == "lumberjack.rightscale.com"
+    end
+
+    it "should populate token attribute" do
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale][:token].should == "8bd736d4a8de91b143bcebbb3e513f5f"
+    end
+    
+    it "should populate api_url attribute" do
+      @ohai._require_plugin("rightscale")
+      @ohai[:rightscale][:api_url].should == "https://my.rightscale.com/api/inst/ec2_instances/40e9d3956ad2e059f9f4054c6272ce2a38155273"
+    end
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rightscale-ohai
 version: !ruby/object:Gem::Version 
-  version: 0.3.3.1
+  version: 0.3.3.2
 platform: ruby
 authors: 
 - Adam Jacob