fog 0.9.0 → 0.10.0

data/tests/aws/signed_params_tests.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Shindo.tests('AWS | signed_params', ['aws']) do
-  returns( Fog::AWS.escape( "'Stop!' said Fred_-~." ) ) { "%27Stop%21%27%20said%20Fred_-~." }
+  returns( Fog::AWS.escape( "'Stöp!' said Fred_-~." ) ) { "%27St%C3%B6p%21%27%20said%20Fred_-~." }
 end

data/tests/compute/models/aws/volume_tests.rb

@@ -13,12 +13,25 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
 
     @instance.wait_for { state == 'in-use' }
 
+    tests('#server').succeeds do
+      @instance.server
+    end
+
     tests('#server = nil').succeeds do
       @instance.server = nil
     end
 
     @instance.wait_for { ready? }
 
+    @instance.server = @server
+    @instance.wait_for { state == 'in-use' }
+
+    tests('#force_detach').succeeds do
+      @instance.force_detach
+    end
+
+    @instance.wait_for { ready? }
+
   end
 
   @server.destroy

data/tests/compute/models/vcloud/helper.rb

@@ -0,0 +1,25 @@
+class Vcloud
+  module Compute
+    module TestSupport
+
+      if Fog.mocking?
+        def self.template
+          'mock_template'
+        end
+      else
+        def self.template
+          template_name = ENV['VCLOUD_TEMPLATE']
+          raise "Specify VApp template name in VCLOUD_TEMPLATE env var" unless template_name
+          template_res = Vcloud.catalogs.item_by_name template_name
+          raise "URI Not found for specified template - check template name" unless template_res
+          template_res.href
+        end
+      end
+
+    end
+
+    module Formats
+    end
+
+  end
+end

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

@@ -0,0 +1,95 @@
+Shindo.tests("Vcloud::Compute | servers", ['vcloud']) do
+
+  tests("#server.new('#{Vcloud::Compute::TestSupport::template}')").returns(true) do
+    pending if Fog.mocking?
+    @svr = Vcloud.servers.create :catalog_item_uri => Vcloud::Compute::TestSupport::template, :name => 'fog_test_run', :password => 'password'
+    print "Waiting for server to be ready"
+    @svr.wait_for(1200) { print '.' ; ready? }
+    puts ""
+    @svr.ready?
+  end
+
+  tests("#svr.power_on()").returns(true) do
+    pending if Fog.mocking?
+    @svr.power_on
+    @svr.wait_for { on? }
+    @svr.wait_for { ready? }
+    @svr.on?
+  end
+
+  tests("#svr.description(\"testing\")").returns("testing") do
+    pending if Fog.mocking?
+    @svr.wait_for { ready? }
+    @svr.description = "testing"
+    @svr.save
+    @svr.wait_for { ready? }
+    @svr.description
+  end
+
+  # Power off only stops the OS, doesn't free up resources. #undeploy is for this.
+  tests("#svr.undeploy()").returns(true) do
+    pending if Fog.mocking?
+    @svr.undeploy
+    @svr.wait_for { off? }
+    @svr.wait_for { ready? }
+    @svr.off?
+  end
+
+  tests("#svr.memory(384)").returns(384) do
+    pending if Fog.mocking?
+    raise 'Server template memory already 384m - change to something different' if @svr.memory[:amount] == 384
+    @svr.wait_for { ready? }
+    @svr.memory = 384
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.memory[:amount] == '384'
+      sleep 1
+    end
+    @svr.reload.memory[:amount]
+  end
+
+  tests("#svr.add_disk(4096)").returns([2, "4096"]) do
+    pending if Fog.mocking?
+    raise 'Server template already has two disks' if @svr.disks.size == 2
+    @svr.wait_for { ready? }
+    @svr.add_disk(4096)
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.disks.size == 2
+      sleep 1
+    end
+    [
+     @svr.disks.size,
+     @svr.disks[1][:resource][:vcloud_capacity]
+    ]
+  end
+
+  tests("#svr.delete_disk(1)").returns(1) do
+    pending if Fog.mocking?
+    raise "Server doesn't have two disks - did previous step fail? " if @svr.disks.size != 2
+    @svr.wait_for { ready? }
+    sleep 5 # otherwise complains about being busy
+    @svr.delete_disk 1
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.disks.size == 1
+      sleep 1
+    end
+    @svr.disks.size
+  end
+
+  tests("#svr.destroy").raises(Excon::Errors::Forbidden) do
+    pending if Fog.mocking?
+    @svr.destroy
+    sleep 5 # allow cleanup..
+    Vcloud.servers.get(@svr.href) == nil
+  end
+
+
+end

data/tests/compute/requests/aws/address_tests.rb

@@ -10,7 +10,7 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
 
   @server = Fog::Compute[:aws].servers.create
   @server.wait_for { ready? }
-  @ip_address = @server.ip_address
+  @ip_address = @server.public_ip_address
 
   tests('success') do
 

data/tests/compute/requests/aws/instance_tests.rb

@@ -15,11 +15,15 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
     'keyName'             => Fog::Nullable::String,
     'launchTime'          => Time,
     'monitoring'          => {'state' => Fog::Boolean},
-    'placement'           => {'availabilityZone' => String},
+    'placement'           => {
+      'availabilityZone' => String,
+      'groupName' => Fog::Nullable::String,
+      'tenancy' => String
+    },
     'privateDnsName'      => NilClass,
     # 'privateIpAddress'    => String,
     'productCodes'        => [],
-    'ramdiskId'           => Fog::Nullable::String,
+    # 'ramdiskId'           => Fog::Nullable::String,
     'reason'              => Fog::Nullable::String,
     # 'rootDeviceName'      => String,
     'rootDeviceType'      => String,
@@ -75,6 +79,48 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
     'requestId'     => String
   }
 
+  @describe_reserved_instances_offerings_format = {
+    'reservedInstancesOfferingsSet' => [{
+      'reservedInstancesOfferingId'     => String,
+      'instanceType'                    => String,
+      'availabilityZone'                => String,
+      'duration'                        => Integer,
+      'fixedPrice'                      => Float,
+      'usagePrice'                      => Float,
+      'productDescription'              => String,
+      'instanceTenancy'                 => String,
+      'currencyCode'                    => String
+    }],
+    'requestId'     => String
+  }
+
+  @purchase_reserved_instances_offering_format = {
+    'reservedInstancesId' => String,
+    'requestId' => String
+  }
+
+  @describe_reserved_instances_format = {
+    'reservedInstancesSet' => [{
+      'reservedInstancesId' => String,
+      'instanceType'        => String,
+      'availabilityZone'    => String,
+      'start'               => Time,
+      'duration'            => Integer,
+      'fixedPrice'          => Float,
+      'usagePrice'          => Float,
+      'instanceCount'       => Integer,
+      'productDescription'  => String,
+      'state'               => String,
+      'tagSet'              => [{
+        'key'                   => String,
+        'value'                 => String
+      }],
+      'instanceTenancy'     => String,
+      'currencyCode'        => String
+    }],
+    'requestId'     => String
+  }
+
   tests('success') do
 
     @instance_id = nil
@@ -100,7 +146,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
     server.wait_for { ready? }
 
     tests("#describe_instances").formats(@describe_instances_format) do
-       Fog::Compute[:aws].describe_instances.body
+       Fog::Compute[:aws].describe_instances('instance-state-name' => 'running').body
     end
 
     # Launch another instance to test filters
@@ -135,7 +181,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
         String === pkey.private_decrypt(decoded_password)
       end
       result
-    end
+    end unless ENV['FASTER_TEST_PLEASE']
 
     key.destroy
 
@@ -147,6 +193,21 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       Fog::Compute[:aws].terminate_instances(@instance_id).body
     end
 
+    tests("#describe_reserved_instances_offerings").formats(@describe_reserved_instances_offerings_format) do
+      @reserved_instances = Fog::Compute[:aws].describe_reserved_instances_offerings.body
+      @reserved_instances
+    end
+
+    if Fog.mocking?
+      @reserved_instance_offering_id = @reserved_instances["reservedInstancesOfferingsSet"].first["reservedInstancesOfferingId"]
+      tests("#purchase_reserved_instances_offering('#{@reserved_instance_offering_id}')").formats(@purchase_reserved_instances_offering_format) do
+        Fog::Compute[:aws].purchase_reserved_instances_offering(@reserved_instance_offering_id, 1).body
+      end
+
+      tests("#describe_reserved_instances").formats(@describe_reserved_instances_format) do
+        Fog::Compute[:aws].describe_reserved_instances.body
+      end
+    end
   end
 
   tests('failure') do

data/tests/compute/requests/aws/placement_group_tests.rb

@@ -0,0 +1,48 @@
+Shindo.tests('Fog::Compute[:aws] | placement group requests', ['aws']) do
+  @placement_group_format = {
+    'requestId'         => String,
+    'placementGroupSet' => [{
+      'groupName' => String,
+      'state'     => String,
+      'strategy'  => String
+    }]
+  }
+
+  tests('success') do
+    tests("#create_placement_group('fog_placement_group', 'cluster')").formats(AWS::Compute::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster').body
+    end
+
+    tests("#describe_placement_groups").formats(@placement_group_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:aws].describe_placement_groups.body
+    end
+
+    tests("#describe_placement_groups('group-name' => 'fog_placement_group)").formats(@placement_group_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:aws].describe_placement_groups('group-name' => 'fog_security_group').body
+    end
+
+    tests("#delete_placement_group('fog_placement_group')").formats(AWS::Compute::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::Compute[:aws].delete_placement_group('fog_placement_group').body
+    end
+  end
+
+  tests('failure') do
+    pending if Fog.mocking?
+
+    Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster')
+
+    tests("duplicate #create_placement_group('fog_placement_group', 'cluster')").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster')
+    end
+
+    tests("#delete_placement_group('not_a_group_name')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].delete_placement_group('not_a_group_name')
+    end
+
+    Fog::Compute[:aws].delete_placement_group('fog_placement_group')
+  end
+end

data/tests/compute/requests/aws/spot_datafeed_subscription_tests.rb

@@ -0,0 +1,47 @@
+Shindo.tests('Fog::Compute[:aws] | spot datafeed subscription requests', ['aws']) do
+  @spot_datafeed_subscription_format = {
+    'spotDatafeedSubscription' => {
+      'bucket'  => String,
+      'ownerId' => String,
+      'prefix'  => String,
+      'state'   => String
+    },
+    'requestId' => String
+  }
+
+  @directory = Fog::Storage[:aws].directories.create(:key => 'fogspotdatafeedsubscriptiontests')
+
+  tests('success') do
+    pending if Fog.mocking?
+
+    tests("#create_spot_datafeed_subscription('fogspotdatafeedsubscriptiontests', 'fogspotdatafeedsubscription/')").formats(@spot_datafeed_subscription_format) do
+      Fog::Compute[:aws].create_spot_datafeed_subscription('fogspotdatafeedsubscriptiontests', 'fogspotdatafeedsubscription/').body
+    end
+
+    tests("duplicate #create_spot_datafeed_subscription('fogspotdatafeedsubscriptiontests', 'fogspotdatafeedsubscription/')").succeeds do
+      Fog::Compute[:aws].create_spot_datafeed_subscription('fogspotdatafeedsubscriptiontests', 'fogspotdatafeedsubscription/')
+    end
+
+    tests("#describe_spot_datafeed_subscription").formats(@spot_datafeed_subscription_format) do
+      Fog::Compute[:aws].describe_spot_datafeed_subscription.body
+    end
+
+    tests("#delete_spot_datafeed_subscription").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].delete_spot_datafeed_subscription.body
+    end
+
+    tests("duplicate #delete_spot_datafeed_subscription").succeeds do
+      Fog::Compute[:aws].delete_spot_datafeed_subscription
+    end
+  end
+
+  tests('failure') do
+    pending if Fog.mocking?
+
+    tests("#describe_spot_datafeed_subscription").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].describe_spot_datafeed_subscription
+    end
+  end
+
+  @directory.destroy
+end

data/tests/compute/requests/aws/spot_instance_tests.rb

@@ -0,0 +1,53 @@
+Shindo.tests('Fog::Compute[:aws] | spot instance requests', ['aws']) do
+
+  @spot_instance_requests_format = {
+    'spotInstanceRequestSet' => [{
+      'createTime'                => Time,
+      'instanceId'                => Fog::Nullable::String,
+      'launchedAvailabilityZone'  => Fog::Nullable::String,
+      'launchSpecification'       => {
+        'blockDeviceMapping'  => [],
+        'groupSet'            => [String],
+        'keyName'             => Fog::Nullable::String,
+        'imageId'             => String,
+        'instanceType'        => String,
+        'monitoring'          => Fog::Boolean
+      },
+      'productDescription'        => String,
+      'spotInstanceRequestId'     => String,
+      'spotPrice'                 => Float,
+      'state'                     => String,
+      'type'                      => String
+    }],
+    'requestId' => String
+  }
+
+  @cancel_spot_instance_request_format = {
+    'spotInstanceRequestSet' => [{
+      'spotInstanceRequestId' => String,
+      'state'                 => String
+    }],
+    'requestId' => String
+  }
+
+  tests('success') do
+
+    pending if Fog.mocking?
+
+    tests("#request_spot_instances('ami-3202f25b', 't1.micro', '0.001')").formats(@spot_instance_requests_format) do
+      data = Fog::Compute[:aws].request_spot_instances('ami-3202f25b', 't1.micro', '0.001').body
+      @spot_instance_request_id = data['spotInstanceRequestSet'].first['spotInstanceRequestId']
+      data
+    end
+
+    tests("#describe_spot_instance_requests").formats(@spot_instance_requests_format) do
+      Fog::Compute[:aws].describe_spot_instance_requests.body
+    end
+
+    tests("#cancel_spot_instance_requests('#{@spot_instance_request_id}')").formats(@cancel_spot_instance_request_format) do
+      Fog::Compute[:aws].cancel_spot_instance_requests(@spot_instance_request_id).body
+    end
+
+  end
+
+end

data/tests/compute/requests/aws/spot_price_history_tests.rb

@@ -0,0 +1,24 @@
+Shindo.tests('Fog::Compute[:aws] | spot price history requests', ['aws']) do
+
+  @spot_price_history_format = {
+    'spotPriceHistorySet'   => [{
+      'availabilityZone'    => String,
+      'instanceType'        => String,
+      'spotPrice'           => Float,
+      'productDescription'  => String,
+      'timestamp'           => Time
+    }],
+    'requestId' => String
+  }
+
+  tests('success') do
+
+    pending # Some history data doesn't have an availability zone
+
+    tests("#describe_spot_price_history").formats(@spot_price_history_format) do
+      Fog::Compute[:aws].describe_spot_price_history.body
+    end
+
+  end
+
+end