fog 1.19.0 → 1.20.0

data/tests/dns/models/zone_tests.rb

@@ -1,7 +1,7 @@
 for provider, config in dns_providers
 
   # FIXME: delay/timing breaks things :(
-  next if [:dnsmadeeasy].include?(provider)
+  next if [:dnsmadeeasy, :rage4].include?(provider)
 
   domain_name = uniq_id + '.com'
 

data/tests/dns/models/zones_tests.rb

@@ -1,7 +1,7 @@
 for provider, config in dns_providers
 
   # FIXME: delay/timing breaks things :(
-  next if [:dnsmadeeasy].include?(provider)
+  next if [:dnsmadeeasy, :rage4].include?(provider)
 
   domain_name = uniq_id + '.com'
 

data/tests/google/helpers/disk_helper.rb

@@ -0,0 +1,12 @@
+# create a disk to be used in tests
+def create_test_disk(connection, zone)
+  zone = 'us-central1-a'
+  disk = connection.disks.create({
+    :name => "fogservername",
+    :size_gb => "2",
+    :zone_name => zone,
+    :source_image => "debian-7-wheezy-v20131120",
+  })
+  disk.wait_for { ready? }
+  disk
+end

data/tests/google/models/compute/server_tests.rb

@@ -1,6 +1,9 @@
 Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
 
-  model_tests(Fog::Compute[:google].disks, {:name => 'fogservername', :zone_name => 'us-central1-a', :machine_type => 'n1-standard-1'})
+  @zone = 'us-central1-a'
+  @disk = create_test_disk(Fog::Compute[:google], @zone)
+
+  model_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => @zone, :machine_type => 'n1-standard-1', :disks => [@disk]})
 
   tests('servers') do
     @instance = nil

data/tests/google/models/compute/servers_tests.rb

@@ -1,5 +1,8 @@
 Shindo.tests("Fog::Compute[:google] | servers", ['google']) do
 
-  collection_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => 'us-central1-a', :machine_type => 'n1-standard-1'})
+  @zone = 'us-central1-a'
+  @disk = create_test_disk(Fog::Compute[:google], @zone)
+
+  collection_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => @zone, :machine_type => 'n1-standard-1', :disks => [@disk]})
 
 end

data/tests/google/requests/compute/image_tests.rb

@@ -24,7 +24,6 @@ Shindo.tests('Fog::Compute[:google] | image requests', ['google']) do
       'name' => String,
       'description' => String,
       'sourceType' => String,
-      'preferredKernel' => String,
       'rawDisk' => {
         'containerType' => String,
         'source' => String

data/tests/google/requests/compute/server_tests.rb

@@ -59,10 +59,11 @@ Shindo.tests('Fog::Compute[:google] | server requests', ['google']) do
     zone_name = "us-central1-a"
 
     tests("#insert_server").formats(@insert_server_format) do
+      disk = create_test_disk(Fog::Compute[:google], zone_name)
       @google.insert_server(
         server_name,
         zone_name,
-        { 'image' => image_name, 'machineType' => machine_type }
+        { 'image' => image_name, 'machineType' => machine_type, 'disks' => [disk] }
       ).body
     end
 

data/tests/helper.rb

@@ -1,6 +1,6 @@
 require 'simplecov'
 
-if ENV['COVERAGE'] != 'false' && RUBY_VERSION != "1.9.2"
+if ENV['COVERAGE'] == 'true' && RUBY_VERSION != "1.9.2"
   require 'coveralls'
   SimpleCov.command_name "shindo:#{Process.pid.to_s}"
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
@@ -39,6 +39,12 @@ available_providers = Fog.available_providers.map {|provider| provider.downcase}
 
 unavailable_providers = all_providers - available_providers
 
+if !ENV['PROVIDER'].nil? && unavailable_providers.include?(ENV['PROVIDER'])
+  Formatador.display_line("[red]Requested provider #{ENV['PROVIDER']} is not available.[/]" + 
+                          "[red]Check if .fog file has correct configuration (see '#{Fog.credentials_path}')[/]")
+  exit(0)
+end
+
 for provider in unavailable_providers
   Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '#{Fog.credentials_path}' to run them)[/]")
   Thread.current[:tags] << ('-' << provider)

data/tests/helpers/compute/server_helper.rb

@@ -10,6 +10,7 @@ def server_tests(connection, params = {}, mocks_implemented = true)
     end
 
     responds_to([:ready?, :state])
+    yield if block_given?
 
     tests('#reboot').succeeds do
       pending if Fog.mocking? && !mocks_implemented

data/tests/helpers/compute/servers_helper.rb

@@ -4,6 +4,7 @@ def servers_tests(connection, params = {}, mocks_implemented = true)
 
     if !Fog.mocking? || mocks_implemented
       @instance.wait_for { ready? }
+      yield if block_given?
     end
 
   end

data/tests/openstack/models/network/security_group_rule_tests.rb

@@ -0,0 +1,27 @@
+Shindo.tests('Fog::Network[:openstack] | security_group_rule model', ['openstack']) do
+
+  @secgroup   = Fog::Network[:openstack].security_groups.create({:name => "fogsecgroup"})
+  attributes  = {:security_group_id => @secgroup.id, :direction => "ingress"}
+  model_tests(Fog::Network[:openstack].security_group_rules, attributes, true)
+
+  tests('success') do
+    tests('#create').succeeds do
+      attributes = {
+        :security_group_id  => @secgroup.id,
+        :direction          => "ingress",
+        :protocol           => "tcp",
+        :port_range_min     => 22,
+        :port_range_max     => 22,
+        :remote_ip_prefix   => "0.0.0.0/0"
+      }
+      @secgrouprule = Fog::Network[:openstack].security_group_rules.create(attributes)
+      @secgrouprule.wait_for { ready? } unless Fog.mocking?
+      !@secgrouprule.id.nil?
+    end
+
+    tests('#destroy').succeeds do
+      @secgrouprule.destroy
+    end
+  end
+  @secgroup.destroy
+end

data/tests/openstack/models/network/security_group_rules_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Network[:openstack] | security_group_rules collection', ['openstack']) do
+
+  @secgroup   = Fog::Network[:openstack].security_groups.create({:name => "my_secgroup"})
+  attributes  = {:security_group_id => @secgroup.id, :direction => "ingress"}
+  collection_tests(Fog::Network[:openstack].security_group_rules, attributes, true)
+
+  tests('success') do
+    attributes = {
+      :security_group_id  => @secgroup.id,
+      :direction          => "ingress",
+      :protocol           => "tcp",
+      :port_range_min     => 22,
+      :port_range_max     => 22,
+      :remote_ip_prefix   => "0.0.0.0/0"
+    }
+    @secgrouprule = Fog::Network[:openstack].security_group_rules.create(attributes)
+
+    tests('#all(filter)').succeeds do
+      secgrouprule = Fog::Network[:openstack].security_group_rules.all({:direction => "ingress"})
+      secgrouprule.first.direction == "ingress"
+    end
+    @secgrouprule.destroy
+  end
+  @secgroup.destroy
+end

data/tests/openstack/models/network/security_group_tests.rb

@@ -0,0 +1,17 @@
+Shindo.tests('Fog::Network[:openstack] | security_group model', ['openstack']) do
+
+  model_tests(Fog::Network[:openstack].security_groups, {:name => "fogsecgroup"}, true)
+
+  tests('success') do
+    tests('#create').succeeds do
+      attributes = {:name => "my_secgroup", :description => "my sec group desc"}
+      @secgroup = Fog::Network[:openstack].security_groups.create(attributes)
+      @secgroup.wait_for { ready? } unless Fog.mocking?
+      !@secgroup.id.nil?
+    end
+
+    tests('#destroy').succeeds do
+      @secgroup.destroy
+    end
+  end
+end

data/tests/openstack/models/network/security_groups_tests.rb

@@ -0,0 +1,16 @@
+Shindo.tests('Fog::Network[:openstack] | security_groups collection', ['openstack']) do
+
+  attributes = {:name => "my_secgroup", :description => "my sec group desc"}
+  collection_tests(Fog::Network[:openstack].security_groups, attributes, true)
+
+  tests('success') do
+    attributes = {:name => "fogsecgroup", :description => "fog sec group desc"}
+    @secgroup = Fog::Network[:openstack].security_groups.create(attributes)
+
+    tests('#all(filter)').succeeds do
+      secgroup = Fog::Network[:openstack].security_groups.all({:name => "fogsecgroup"})
+      secgroup.first.name == "fogsecgroup"
+    end
+    @secgroup.destroy
+  end
+end

data/tests/openstack/requests/compute/helper.rb

@@ -35,3 +35,8 @@ def set_password_enabled
   pw_enabled = ENV['OPENSTACK_SET_PASSWORD_ENABLED'] || "true"
   return pw_enabled == "true"
 end
+
+def get_security_group_ref
+  compute = Fog::Compute[:openstack]
+  ENV['OPENSTACK_SECURITY_GROUP_REF'] || compute.list_security_groups.body['security_groups'].first['name']
+end

data/tests/openstack/requests/compute/server_tests.rb

@@ -49,6 +49,7 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
     @image_id = get_image_ref
     @snapshot_id = nil
     @flavor_id = get_flavor_ref
+    @security_group_name = get_security_group_ref
 
     tests('#create_server("test", #{@image_id} , 19)').formats(@create_format, false) do
       data = Fog::Compute[:openstack].create_server("test", @image_id, @flavor_id).body['server']
@@ -112,6 +113,16 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
       Fog::Compute[:openstack].update_server(@server_id, :name => 'fogupdatedserver')
     end
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? }
+    
+    #ADD SECURITY GROUP
+    tests("#add_security_group(#{@server_id}, #{@security_group_name})").succeeds do
+      Fog::Compute[:openstack].add_security_group(@server_id, @security_group_name)
+    end
+
+    #REMOVE SECURITY GROUP
+    tests("#remove_security_group(#{@server_id}, #{@security_group_name})").succeeds do
+      Fog::Compute[:openstack].remove_security_group(@server_id, @security_group_name)
+    end
 
     #CREATE IMAGE WITH METADATA
     tests("#create_image(#{@server_id}, 'fog')").formats('image' => @image_format) do

data/tests/openstack/requests/network/security_group_rule_tests.rb

@@ -0,0 +1,58 @@
+Shindo.tests('Fog::Network[:openstack] | security_grouprule requests', ['openstack']) do
+
+  @security_group_rule_format = {
+    "id"                    => String,
+    "remote_group_id"       => Fog::Nullable::String,
+    "direction"             => String,
+    "remote_ip_prefix"      => Fog::Nullable::String,
+    "protocol"              => Fog::Nullable::String,
+    "ethertype"             => String,
+    "port_range_max"        => Fog::Nullable::Integer,
+    "port_range_min"        => Fog::Nullable::Integer,
+    "security_group_id"     => String,
+    "tenant_id"             => String
+  }
+
+  tests('success') do
+    attributes          = {:name => "my_security_group", :description => "tests group"}
+    data                = Fog::Network[:openstack].create_security_group(attributes).body["security_group"]
+    @sec_group_id       = data["id"]
+    @sec_group_rule_id  = nil
+
+    tests("#create_security_group_rule(#{@sec_group_id}, 'ingress', attributes)").formats(@security_group_rule_format) do
+      attributes = {
+        :remote_ip_prefix => "0.0.0.0/0",
+        :protocol         => "tcp",
+        :port_range_min   => 22,
+        :port_range_max   => 22
+      }
+      data = Fog::Network[:openstack].create_security_group_rule(@sec_group_id, 'ingress', attributes).body["security_group_rule"]
+      @sec_group_rule_id = data["id"]
+      data
+    end
+
+    tests("#get_security_group_rule('#{@sec_group_rule_id}')").formats(@security_group_rule_format) do
+      Fog::Network[:openstack].get_security_group_rule(@sec_group_rule_id).body["security_group_rule"]
+    end
+
+    tests("#list_security_group_rules").formats("security_group_rules" => [@security_group_rule_format]) do
+      Fog::Network[:openstack].list_security_group_rules.body
+    end
+
+    tests("#delete_security_group_rule('#{@sec_group_rule_id}')").succeeds do
+      Fog::Network[:openstack].delete_security_group_rule(@sec_group_rule_id)
+    end
+
+  end
+
+  tests('failure') do
+    tests('#get_security_group_rule(0)').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].get_security_group_rule(0)
+    end
+
+    tests('#delete_security_group_rule(0)').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].delete_security_group_rule(0)
+    end
+  end
+  Fog::Network[:openstack].delete_security_group(@sec_group_id)
+end

data/tests/openstack/requests/network/security_group_tests.rb

@@ -0,0 +1,43 @@
+Shindo.tests('Fog::Network[:openstack] | security_group requests', ['openstack']) do
+
+  @security_group_format = {
+    "id"                    => String,
+    "name"                  => String,
+    "description"           => String,
+    "tenant_id"             => String,
+    "security_group_rules"  => [Hash]
+  }
+
+  tests('success') do
+    @sec_group_id = nil
+
+    tests("#create_security_group('fog_security_group', 'tests group')").formats(@security_group_format) do
+      attributes    = {:name => "fog_security_group", :description => "tests group"}
+      data          = Fog::Network[:openstack].create_security_group(attributes).body["security_group"]
+      @sec_group_id = data["id"]
+      data
+    end
+
+    tests("#get_security_group('#{@sec_group_id}')").formats(@security_group_format) do
+      Fog::Network[:openstack].get_security_group(@sec_group_id).body["security_group"]
+    end
+
+    tests("#list_security_groups").formats('security_groups' => [@security_group_format]) do
+      Fog::Network[:openstack].list_security_groups.body
+    end
+
+    tests("#delete_security_group('#{@sec_group_id}')").succeeds do
+      Fog::Network[:openstack].delete_security_group(@sec_group_id)
+    end
+  end
+
+  tests('failure') do
+    tests("#get_security_group(0)").raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].get_security_group(0)
+    end
+
+    tests("#delete_security_group(0)").raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].delete_security_group(0)
+    end
+  end
+end

data/tests/rackspace/identity_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests('Fog::Rackspace::Identity', ['rackspace']) do
 
   tests('current authentication') do
-    pending if Fog.mocking?
-
     tests('variables populated').returns(200)  do
       @service = Fog::Rackspace::Identity.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true}
       returns(true, "auth token populated") { !@service.auth_token.nil? }
@@ -14,8 +12,6 @@ Shindo.tests('Fog::Rackspace::Identity', ['rackspace']) do
   end
 
   tests('reauthentication') do
-    pending if Fog.mocking?
-
     tests('should reauth with valid credentials') do
       @service = Fog::Rackspace::Identity.new  :rackspace_region => :ord
       returns(true, "auth token populated") { !@service.auth_token.nil? }

data/tests/rackspace/models/compute_v2/server_tests.rb

@@ -198,30 +198,58 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
   end
 
   tests('#setup') do
-    perform_setup = lambda { |attributes|
+    ATTRIBUTES = {
+      :name => "foo",
+      :image_id => 42,
+      :flavor_id => 42
+    }
+
+    create_server = lambda { |attributes|
+      service = Fog::Compute::RackspaceV2.new
+      attributes.merge!(:service => service)
+
       Fog::SSH::Mock.data.clear
 
       server = Fog::Compute::RackspaceV2::Server.new(attributes)
+      server.save(attributes)
 
-      address = 123
+      @address = 123
 
-      server.ipv4_address = address
+      server.ipv4_address = @address
       server.identity = "bar"
       server.public_key = "baz"
 
       server.setup
 
-      Fog::SSH::Mock.data[address].first[:commands]
+      server
+    }
+
+    commands = lambda { 
+      Fog::SSH::Mock.data[@address].first[:commands] 
     }
 
     test("leaves user unlocked only when requested") do
-      perform_setup.call(:service => service, :no_passwd_lock => true)
-                   .none? { |c| c =~ /passwd\s+-l\s+root/ } 
+      create_server.call(ATTRIBUTES.merge(:no_passwd_lock => true))
+      commands.call.none? { |c| c =~ /passwd\s+-l\s+root/ } 
+    end
+
+    test("provide a password when the passed isn't locked") do
+      pwd = create_server.call(
+        ATTRIBUTES.merge(:no_passwd_lock => true)
+      ).password
+
+      # shindo expects a boolean not truthyness :-(
+      !!pwd
     end
 
     test("locks user by default") do
-      perform_setup.call(:service => service)
-                   .one? { |c| c =~ /passwd\s+-l\s+root/ }
+      create_server.call(ATTRIBUTES)
+      commands.call.one? { |c| c =~ /passwd\s+-l\s+root/ }
+    end
+
+    test("nils password when password is locked") do
+      pwd = create_server.call(ATTRIBUTES).password
+      pwd.nil?
     end
   end
 

data/tests/rackspace/models/queues/claim_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues | claim', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
@@ -17,7 +15,7 @@ Shindo.tests('Fog::Rackspace::Queues | claim', ['rackspace']) do
   }
 
   begin
-    model_tests(queue.claims, params, false) do
+    model_tests(queue.claims, params) do
       tests('#messages') do
         returns(1) { @instance.messages.length }
         returns('body') { @instance.messages.first.body['random'] }