fairchild-poolparty 1.3.5 → 1.3.17

data/test/fixtures/resources/fake_plugin.rb

@@ -7,10 +7,15 @@ module PoolParty
         "fake_plugin"
       end
       
+      def name
+        "fake_plugin"
+      end
+      
       def after_loaded
         has_file "/etc/my_configs/special_config" do
           requires get_directory("/etc/my_configs")
         end
+        has_directory("/etc/my_configs")
       end
       
     end

data/test/fixtures/resources/fake_subclassed_plugin.rb

@@ -0,0 +1,19 @@
+module PoolParty
+  module Resources
+    
+    class FakeSubclassedPlugin < Resource
+      
+      def self.has_method_name
+        "subclassed"
+      end
+      
+      def after_loaded
+        has_file "/etc/my_configs/special_config" do
+          requires get_directory("/etc/my_configs")
+        end
+      end
+      
+    end
+    
+  end
+end

data/test/lib/cloud_providers/ec2/ec2_instance_test.rb

@@ -1,11 +1,20 @@
 require "#{File.dirname(__FILE__)}/../../../test_helper"
 require File.dirname(__FILE__)+"/ec2_test.rb"
 
+stub_keypair_searchable_paths
+
 class Ec2InstanceTest < Test::Unit::TestCase
   include CloudProviders
-
+  
+  def setup
+    clear!
+    @filepath = fixtures_dir/"clouds/simple_cloud.rb"
+    @pool = PoolParty::Pool.load_from_file(@filepath)
+    @cloud = @pool.clouds[@pool.clouds.keys.first]
+  end
+  
   def inst
-    @inst ||= clouds['app'].describe_instances.first
+    @inst ||= @cloud.describe_instances.first
   end
   
   def test_has_cloud_provider
@@ -20,18 +29,18 @@ class Ec2InstanceTest < Test::Unit::TestCase
   def test_to_s
     vals = inst.to_s.split("\t")
     assert_equal 3, vals.size
-    assert_equal 'app', vals.first
+    assert_equal 'simple_cloud', vals.first
   end
   
   def test_has_cloud_set_when_created_from_cloud
-    assert_equal clouds['app'], clouds['app'].cloud_provider.cloud
-    assert_equal clouds['app'], inst.cloud
-    assert_equal 'app', inst.dsl_options[:cloud_name]
-    assert_equal 'app', inst.to_hash[:cloud_name]
+    assert_equal @cloud, @cloud.cloud_provider.cloud
+    assert_equal @cloud, inst.cloud
+    assert_equal 'simple_cloud', inst.dsl_options[:cloud_name]
+    assert_equal 'simple_cloud', inst.to_hash[:cloud_name]
   end
   
   def test_cloud_keypair
-    assert_equal  clouds['app'].keypair.to_s,  inst.keypair.to_s
+    assert_equal  @cloud.keypair.to_s,  inst.keypair.to_s
   end
 
   def test_refresh!

data/test/lib/cloud_providers/ec2/ec2_test.rb

@@ -5,7 +5,7 @@ stub_ec2_calls
 class Ec2ProviderTest < Test::Unit::TestCase
   
   def ec2
-    @ec2 ||= clouds['app'].cloud_provider
+    @ec2 ||= @cloud.cloud_provider
   end
   
   def setup
@@ -13,11 +13,15 @@ class Ec2ProviderTest < Test::Unit::TestCase
                   :image_id => "ami-abc123", 
                   :keypair => fixtures_dir/'keys/test_key'
                 )
+                
+    @filepath = fixtures_dir/"clouds/simple_cloud.rb"
+    @pool = PoolParty::Pool.load_from_file(@filepath)
+    @cloud = @pool.clouds[@pool.clouds.keys.first]
   end
   
   def test_setup
-    assert_not_nil clouds['app']
-    assert_not_nil clouds['app'].keypair
+    assert_not_nil @cloud
+    assert_not_nil @cloud.keypair
   end
   
   
@@ -67,9 +71,9 @@ class Ec2ProviderTest < Test::Unit::TestCase
   end
   
   def test_basic_setup
-    assert_equal :ec2, clouds['app'].cloud_provider_name
-    assert_instance_of CloudProviders::Ec2, clouds['app'].cloud_provider
-    assert_instance_of RightAws::Ec2, clouds['app'].cloud_provider.ec2
+    assert_equal :ec2, @cloud.cloud_provider_name
+    assert_instance_of CloudProviders::Ec2, @cloud.cloud_provider
+    assert_instance_of RightAws::Ec2, @cloud.cloud_provider.ec2
   end
   
   def test_that_test_ec2_env_variables_are_set
@@ -89,7 +93,7 @@ class Ec2ProviderTest < Test::Unit::TestCase
   end
   
   def test_cloud_is_set_when_created_from_a_cloud
-    assert_equal clouds['app'], clouds['app'].cloud_provider.cloud
+    assert_equal @cloud, @cloud.cloud_provider.cloud
   end
   
   def test_inherited_default_options
@@ -98,10 +102,10 @@ class Ec2ProviderTest < Test::Unit::TestCase
   end
    
    def amazon?
-     stub(clouds['app'].cloud_provider).ec2_url  {'http://example.com'}
-     assert clouds['app'].cloud_provider.eucalyptus?
-     stub(clouds['app'].cloud_provider).ec2_url  {'https://ec2.amazonaws.com'}
-     assert !clouds['app'].cloud_provider.eucalyptus?
+     stub(@cloud.cloud_provider).ec2_url  {'http://example.com'}
+     assert @cloud.cloud_provider.eucalyptus?
+     stub(@cloud.cloud_provider).ec2_url  {'https://ec2.amazonaws.com'}
+     assert !@cloud.cloud_provider.eucalyptus?
    end
    
    def test_aws_hash

data/test/lib/core/array_test.rb

@@ -42,7 +42,11 @@ class ArrayTest < Test::Unit::TestCase
     arr = %w(a b c d e f)
     assert_equal [["a","b"],["b","c"],["c","d"],["d","e"],["e","f"]], arr.zip_offset(1)
     assert_equal [["a","b"],["b","c"],["c","d"],["d","e"]], arr.zip_offset(2)
+    assert_equal [["a","b"],["b","c"],["c","d"]], arr.zip_offset(3)
     assert_equal [["a","b"]], arr.zip_offset(5)
+    
+    assert_equal [["a","b"],["b","c"],["c","d"],["d","e"]], %w(a b c d e).zip_offset(1)
+    assert_equal [["a","b"],["b","c"],["c","d"]], %w(a b c d e).zip_offset(2)
   end
   
   def test_rotate

data/test/lib/dependency_resolvers/base_test.rb

@@ -30,7 +30,7 @@ template "/etc/motd" do
   source "/etc/motd.erb"
   action :create
   backup 5
-  mode 0644
+  mode "0644"
   owner "root"
 end
       EOE

data/test/lib/dependency_resolvers/chef/resources/remote_directory_test.rb

@@ -26,10 +26,10 @@ class RemoteDirectoryResourceTest < Test::Unit::TestCase
 remote_directory "/tmp/remote_something" do
   source "something"
   files_backup 10
-  files_mode 0644
+  files_mode "0644"
   action :create
   recursive false
-  mode 0755
+  mode "0755"
   owner "nobody"
   group "nobody"
   files_owner "root"

data/test/lib/dependency_resolvers/chef/resources/remote_file_test.rb

@@ -22,7 +22,7 @@ remote_file "/tmp/testfile" do
   source "http://www.example.com/tempfiles/testfile"
   action :create
   backup 5
-  mode 0644
+  mode "0644"
   owner "root"
   checksum "08da002l"
 end

data/test/lib/dependency_resolvers/chef_test.rb

@@ -54,7 +54,7 @@ class ChefTest < Test::Unit::TestCase
     
   def test_compile_to_the_recipes
     @base.compile_to(@resources[:files], test_dir)
-    assert_equal "template \"/etc/motd\" do\n  source \"/etc/motd.erb\"\n  action :create\n  backup 5\n  mode 0644\n  owner \"root\"\nend\n", open(@cookboox_directory/"recipes"/"default.rb").read
+    assert_equal "template \"/etc/motd\" do\n  source \"/etc/motd.erb\"\n  action :create\n  backup 5\n  mode \"0644\"\n  owner \"root\"\nend\n", open(@cookboox_directory/"recipes"/"default.rb").read
   end
     
   def test_compile_the_recipes
@@ -78,14 +78,14 @@ template "/etc/motd" do
   source "/etc/motd.erb"
   action :create
   backup 5
-  mode 0644
+  mode "0644"
   owner "root"
 end
 
 directory "/etc/poolparty" do
   action :create
   recursive true
-  mode 0644
+  mode "0644"
   owner "root"
   group "root"
 end

data/test/lib/poolparty/base_test.rb

@@ -29,7 +29,7 @@ class BaseTest < Test::Unit::TestCase
     assert_equal %w(c), @b.all_resources.map {|r| r.name }
   end
   
-  def test_resource_graph
+  def test_resource_graph_generation
     assert_equal GRATR::Digraph, inst.resources_graph.class
   end
   

data/test/lib/poolparty/cloud_test.rb

@@ -1,6 +1,7 @@
 require "#{File.dirname(__FILE__)}/../../test_helper"
 # require 'rr'
 stub_ec2_calls
+include_fixture_resources
 
 class CloudTest < Test::Unit::TestCase
   # include RR::Adapters::TestUnit
@@ -34,93 +35,165 @@ class CloudTest < Test::Unit::TestCase
   end
   
   def test_have_a_keypair
-    assert_not_nil clouds['app'].keypair
-    assert_equal 'test_key', clouds['app'].keypair.basename
+    assert_not_nil @cloud.keypair
+    assert_equal 'test_key', @cloud.keypair.basename
   end
   
   def test_set_the_dependency_resolver
-    clouds['app'].dependency_resolver(:chef)
-    assert_equal DependencyResolvers::Chef, clouds['app'].dependency_resolver
+    @cloud.dependency_resolver(:chef)
+    assert_equal DependencyResolvers::Chef, @cloud.dependency_resolver
   end
   
   def test_can_use_basic_resources
-    clouds['app'].instance_eval do
+    @cloud.instance_eval do
       has_file "/etc/motd"
     end
-    assert_equal "/etc/motd", clouds['app'].files.first.name
+    assert_equal "/etc/motd", @cloud.files.first.name
   end
   
   def test_have_a_temp_path_of_the_name_as_Default_tmp_path_pool_name_cloud_name
-    assert_equal PoolParty::Default.tmp_path/"poolparty"/"app", @cloud.tmp_path
+    assert_equal PoolParty::Default.tmp_path/"poolparty"/"simple_cloud", @cloud.tmp_path
   end
   
   def test_be_using_ec2_cloud_provider_by_default
-    assert_equal :ec2, clouds['app'].cloud_provider_name
-    assert_kind_of ::CloudProviders::Ec2, clouds['app'].cloud_provider
+    assert_equal :ec2, @cloud.cloud_provider_name
+    assert_kind_of ::CloudProviders::Ec2, @cloud.cloud_provider
   end
   
   def test_raise_if_the_cloud_provider_is_not_a_known_type
     PoolParty::PoolPartyError.create("UnknownCloudProviderError")
     assert_raises UnknownCloudProviderError do
-      clouds["app"].cloud_provider_name = :not_a_cloud_provider
-      clouds["app"].cloud_provider
+      @cloud.cloud_provider_name = :not_a_cloud_provider
+      @cloud.cloud_provider
     end
   end
     
   def test_set_the_cloud_provider_cloud_and_keypair_with_cloud_provider
-    assert_equal clouds["app"], clouds["app"].cloud_provider.cloud
-    assert_equal clouds["app"].keypair.basename, clouds["app"].cloud_provider.keypair_name
+    assert_equal @cloud, @cloud.cloud_provider.cloud
+    assert_equal @cloud.keypair.basename, @cloud.cloud_provider.keypair_name
   end
   
   def test_set_the_cloud_provider_with_a_using_block
-    clouds["app"].instance_eval do
+    @cloud.instance_eval do
+      keypair "test_key"
       using :ec2 do
         image_id 'emi-39921602'
       end
     end
-    assert_equal :ec2, clouds["app"].cloud_provider_name
-    assert_equal CloudProviders::Ec2, clouds["app"].cloud_provider.class
-    assert_equal "emi-39921602", clouds["app"].cloud_provider.image_id
+    assert_equal :ec2, @cloud.cloud_provider_name
+    assert_equal CloudProviders::Ec2, @cloud.cloud_provider.class
+    assert_equal "emi-39921602", @cloud.cloud_provider.image_id
   end
   
   def test_nodes
-    assert_respond_to clouds['app'], :nodes
-    assert_respond_to clouds['app'].nodes, :each
-    assert clouds['app'].nodes.size>1
+    assert_respond_to @cloud, :nodes
+    assert_respond_to @cloud.nodes, :each
+    assert @cloud.nodes.size>1
   end
   
   def test_terminate!
-    assert clouds['app'].nodes.size > 0
-    result = clouds['app'].terminate!
+    assert @cloud.nodes.size > 0
+    result = @cloud.terminate!
     assert_respond_to result, :each
     assert_equal 'shutting-down', result.first.status
   end
   
+  def test_resource_graph_generation
+    pool "resource" do
+      cloud "graph" do
+        
+        has_file "a", :content => "a"
+        has_file "g", :content => "g", :requires => get_file("c")
+        has_file "b", :content => "b"
+        has_file "c", :content => "c"
+        has_file "d", :content => "d"
+        has_file "e", :content => "e"
+        has_file "f", :content => "f"
+
+      end
+    end
+    
+    # p clouds["graph"].ordered_resources.map {|a| a.name }
+    assert_equal %w(g), clouds["graph"].resources_with_dependencies.map {|a| a.name}
+    assert_equal %w(a b c d e f), clouds["graph"].resources_without_dependencies.map {|a| a.name }
+    assert_equal %w(a b c g d e f), clouds["graph"].ordered_resources.map {|a| a.name }
+    
+  end
+  
+  def test_deep_resources_graph_generation
+    pool "resource" do
+      cloud "graph2" do
+        
+        os :ubuntu
+        
+        keypair "test_key", fixtures_dir/"keys"
+        
+        has_fake_plugin do
+          has_exec "a", :requires => get_file("b")
+        end
+        has_exec "c", :requires => get_exec("a")
+        has_file "b", :content => "b"
+        has_file "q", :requires => get_exec("a")
+
+      end
+    end
+    
+    # Non-deterministic... figure out fix
+    # assert_equal ["fake_plugin", "/etc/my_configs", "/etc/my_configs/special_config", "b", "a", "q", "c"], clouds["graph2"].ordered_resources.map {|a| a.name}
+  end
+  
   def test_run
     # WHAT?
-    result = clouds['app'].run('uptime')
-    assert_match /uptime/, result["app"]
+    # result = @cloud.run('uptime')
+    # assert_match /uptime/, result["app"]
   end
   
   def test_os
-    assert_equal :centos, clouds['app'].os
+    assert_equal :centos, @cloud.os
   end
   
   def test_expansion
     #TODO: improve this test
-    # size = clouds["app"].nodes.size
-    # assert_equal size+1, clouds["app"].expand.nodes.size
-    # assert_nothing_raised clouds['app'].expand
+    # size = @cloud.nodes.size
+    # assert_equal size+1, @cloud.expand.nodes.size
+    # assert_nothing_raised @cloud.expand
   end
   
   def test_contract!
     #TODO: need to better mock the terminate! ec2 call
-    # size = clouds['app'].nodes.size
-    # result = clouds['app'].contract!
+    # size = @cloud.nodes.size
+    # result = @cloud.contract!
     # assert_equal 'shuttin-down',  result.status
-    # assert_equal size-1, clouds['app'].nodes.size
+    # assert_equal size-1, @cloud.nodes.size
+  end
+  
+  def test_change_ssh_port
+    clear!
+    pool "ssh_port" do
+      cloud "babity" do
+        keypair "test_key"
+        ssh_port 1922
+      end
+    end
+    assert_equal 1922, clouds["babity"].ssh_port
+    assert_equal 22, clouds["noneity"].ssh_port
   end
   
+  def test_change_ssh_port
+    clear!
+    pool "ssher" do
+      cloud "custom" do
+        keypair "test_key"
+        # ssh_options("-P" => "1992")
+      end
+      cloud "noneity" do
+        keypair "test_key"
+      end
+    end
+    # assert_equal "1992", clouds["custom"].ssh_options["-P"]
+  end
+  
+  
   def test_children_getting_parent_options
     clear!
     pool "outside" do
@@ -145,12 +218,46 @@ class CloudTest < Test::Unit::TestCase
           configure if v < 0.2
           vote_for(:expand) if v > 1.1
         end
+        
+        monitor :load do |a|
+          # [0.42 0.43 0.37]
+          vote_for(:expand) if a[0] > 0.8
+        end
+        
+        monitor_format :load do |d|
+          d.split(",").map {|ele| ele.to_f }
+        end
+        
       end
     end
     
-    assert_equal 1, clouds["monitor_app"].monitors.size
-    assert_equal [:cpu], clouds["monitor_app"].monitors.map {|m,v| v.name }
+    assert_equal 2, clouds["monitor_app"].monitors.size
+    assert_equal [:cpu, :load], clouds["monitor_app"].monitors.map {|m,v| v.name }
     assert_equal({:configure => []}, clouds["monitor_app"].run_monitor("cpu", "0.1"))
     assert_equal({:vote_for => [:expand]}, clouds["monitor_app"].run_monitor("cpu", "1.4"))
+    assert_equal({:vote_for => [:expand]}, clouds["monitor_app"].run_monitor("load", "0.98, 0.23, 0.1"))
+  end
+  
+  def test_add_monitoring_stack_if_needed
+    clear!
+    pool "monitoring2" do
+      cloud "app_cloud" do
+        keypair "test_key", fixtures_dir/"keys"
+        platform :ubuntu
+        monitor "cpu-idle" do |c|
+          vote_for(:expand) if c > 0.8
+        end
+      end
+    end
+    
+    assert_equal 1, clouds["app_cloud"].monitors.size
+    
+    clouds["app_cloud"].compile
+    
+    compile_dir = clouds["app_cloud"].tmp_path/"etc"/"chef"/"cookbooks"/"poolparty"
+    recipe_file = compile_dir/"recipes"/"default.rb"
+    recipe_contents = open(recipe_file).read
+    
+    assert_match /install_hermes/, recipe_contents
   end
 end