fog 0.0.91 → 0.0.92

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

@@ -0,0 +1,88 @@
+Shindo.tests('AWS::EC2 | address requests', ['aws']) do
+
+  @server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
+  @server.wait_for { ready? }
+
+  tests('success') do
+
+    @public_ip = nil
+
+    test('#allocate_address') do
+      @data = AWS[:ec2].allocate_address.body
+      @public_ip = @data['publicIp']
+      has_format(
+        @data,
+        {
+          'publicIp'  => String,
+          'requestId' => String
+        }
+      )
+    end
+
+    test("#describe_addresses") do
+      @data = AWS[:ec2].describe_addresses.body
+      has_format(@data, AWS::EC2::Formats::ADDRESSES)
+    end
+
+    test("#describe_addresses('#{@public_ip}')") do
+      @data = AWS[:ec2].describe_addresses(@public_ip).body
+      has_format(@data, AWS::EC2::Formats::ADDRESSES)
+    end
+
+    test("#associate_address('#{@server.identity}', '#{@public_ip}')") do
+      @data = AWS[:ec2].associate_address(@server.identity, @public_ip).body
+      has_format(@data, AWS::EC2::Formats::BASIC)
+    end
+
+    test("#disassociate_address('#{@public_ip}')") do
+      @data = AWS[:ec2].disassociate_address(@public_ip).body
+      has_format(@data, AWS::EC2::Formats::BASIC)
+    end
+
+    test("#release_address('#{@public_ip}')") do
+      @data = AWS[:ec2].release_address(@public_ip).body
+      has_format(@data, AWS::EC2::Formats::BASIC)
+    end
+
+  end
+  tests ('failure') do
+
+    @address = AWS[:ec2].addresses.create
+
+    test("#describe_addresses('127.0.0.1') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].describe_addresses('127.0.0.1')
+      end
+    end
+
+    test("#associate_addresses('i-00000000', '#{@address.identity}') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].associate_address('i-00000000', @address.identity)
+      end
+    end
+
+    test("#associate_addresses('#{@server.identity}', '127.0.0.1') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].associate_address(@server.identity, '127.0.0.1')
+      end
+    end
+
+    test("#disassociate_addresses('127.0.0.1') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].disassociate_address('127.0.0.1')
+      end
+    end
+
+    test("#release_address('127.0.0.1') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].release_address('127.0.0.1')
+      end
+    end
+
+    @address.destroy
+
+  end
+
+  @server.destroy
+
+end

data/tests/aws/requests/ec2/snapshot_tests.rb

@@ -0,0 +1,50 @@
+Shindo.tests('AWS::EC2 | snapshot requests', ['aws']) do
+
+  @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
+
+  tests('success') do
+
+    @snapshot_id = nil
+
+    test("#create_snapshot(#{@volume.identity})") do
+      @data = AWS[:ec2].create_snapshot(@volume.identity).body
+      @snapshot_id = @data['snapshotId']
+      has_format(@data, AWS::EC2::Formats::SNAPSHOT.merge('progress' => NilClass, 'requestId' => String))
+    end
+
+    test("#describe_snapshots") do
+      AWS[:ec2].snapshots.get(@snapshot_id).wait_for { ready? }
+      @data = AWS[:ec2].describe_snapshots.body
+      has_format(@data, AWS::EC2::Formats::SNAPSHOTS)
+    end
+
+    test("#describe_snapshots('#{@snapshot_id}')") do
+      @data = AWS[:ec2].describe_snapshots(@snapshot_id).body
+      has_format(@data, AWS::EC2::Formats::SNAPSHOTS)
+    end
+
+    test("#delete_snapshots(#{@snapshot_id})") do
+      @data = AWS[:ec2].delete_snapshot(@snapshot_id).body
+      has_format(@data, AWS::EC2::Formats::BASIC)
+    end
+
+  end
+  tests ('failure') do
+
+    test("#describe_snapshot('snap-00000000') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].describe_snapshots('snap-00000000')
+      end
+    end
+
+    test("#delete_snapshot('snap-00000000') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].delete_snapshot('snap-00000000')
+      end
+    end
+
+  end
+
+  @volume.destroy
+
+end

data/tests/aws/requests/ec2/volume_tests.rb

@@ -0,0 +1,84 @@
+Shindo.tests('AWS::EC2 | volume requests', ['aws']) do
+
+  @server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
+  @server.wait_for { ready? }
+
+  tests('success') do
+
+    @volume_id = nil
+
+    test('#create_volume') do
+      @data = AWS[:ec2].create_volume(@server.availability_zone, 1).body
+      @volume_id = @data['volumeId']
+      has_format(@data, AWS::EC2::Formats::VOLUME)
+    end
+
+    test('#describe_volumes') do
+      @data = AWS[:ec2].describe_volumes.body
+      has_format(@data, AWS::EC2::Formats::VOLUMES)
+    end
+
+    test("#describe_volumes(#{@volume_id})") do
+      @data = AWS[:ec2].describe_volumes.body
+      has_format(@data, AWS::EC2::Formats::VOLUMES)
+    end
+
+    test("#attach_volume(#{@server.identity}, #{@volume_id}, '/dev/sdh')") do
+      @data = AWS[:ec2].attach_volume(@server.identity, @volume_id, '/dev/sdh').body
+      has_format(@data, AWS::EC2::Formats::VOLUME_ATTACHMENT)
+    end
+
+    test("#detach_volume('#{@volume_id}')") do
+      AWS[:ec2].volumes.get(@volume_id).wait_for { state == 'attached' }
+      @data = AWS[:ec2].detach_volume(@volume_id).body
+      has_format(@data, AWS::EC2::Formats::VOLUME_ATTACHMENT)
+    end
+
+    test("#delete_volume('#{@volume_id}')") do
+      AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
+      @data = AWS[:ec2].delete_volume(@volume_id).body
+      has_format(@data, AWS::EC2::Formats::BASIC)
+    end
+
+  end
+  tests ('failure') do
+
+    @volume = AWS[:ec2].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
+
+    test("#describe_volume('vol-00000000') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].describe_volumes('vol-00000000')
+      end
+    end
+
+    test("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
+      end
+    end
+
+    test("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
+      end
+    end
+
+    test("#detach_volume('vol-00000000') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].detach_volume('vol-00000000')
+      end
+    end
+
+    test("#delete_volume('vol-00000000') raises BadRequest error") do
+      has_error(Excon::Errors::BadRequest) do
+        AWS[:ec2].delete_volume('vol-00000000')
+      end
+    end
+
+    @volume.destroy
+
+  end
+
+  @server.destroy
+
+end

data/tests/helper.rb

@@ -1,34 +1,49 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog', 'bin'))
 
-# TODO: Currently is true even if some of the keys in format do not appear
-def validate_format(original_data, format)
+if ENV["FOG_MOCK"] == "true"
+  Fog.mock!
+end
+
+def has_error(error, &block)
+  begin
+    yield
+    @formatador.display_line("[red]did not raise #{error}[/]")
+    false
+  rescue error
+    true
+  end
+end
+
+def has_format(original_data, original_format)
   valid = true
   data = original_data.dup
+  format = original_format.dup
   for key, value in format
     valid &&= data.has_key?(key)
     datum = data.delete(key)
+    format.delete(key)
     case value
     when Array
       valid &&= datum.is_a?(Array)
       for element in datum
         type = value.first
         if type.is_a?(Hash)
-          valid &&= validate_format({:element => element}, {:element => type})
+          valid &&= has_format({:element => element}, {:element => type})
         else
           valid &&= element.is_a?(type)
         end
       end
     when Hash
       valid &&= datum.is_a?(Hash)
-      valid &&= validate_format(datum, value)
+      valid &&= has_format(datum, value)
     else
       valid &&= datum.is_a?(value)
     end
   end
-  valid &&= data.empty?
+  valid &&= data.empty? && format.empty?
   unless valid
-    @formatador.display_line("[red]#{original_data.inspect} does not match #{format.inspect}[/]")
+    @formatador.display_line("[red]#{original_data.inspect} does not match #{original_format.inspect}[/]")
   end
   valid
 end

data/tests/helper_tests.rb

@@ -1,18 +1,48 @@
 Shindo.tests('test_helper', 'meta') do
-  tests('#validate_data_format') do
+
+  tests('#has_error') do
+
+    tests('returns true') do
+
+      test('when expected error is raised') do
+        has_error(StandardError) { raise StandardError.new }
+      end
+
+    end
+
+    tests('returns false') do
+
+      test('when no error is raised') do
+        !has_error(StandardError) {}
+      end
+
+      test('when a different error is raised') do
+        begin
+          !has_error(StandardError) { raise Interrupt.new }
+          false
+        rescue Interrupt
+          true
+        end
+      end
+
+    end
+
+  end
+
+  tests('#has_format') do
 
     tests('returns true') do
 
       test('when format of value matches') do
-        validate_format({:a => :b}, {:a => Symbol})
+        has_format({:a => :b}, {:a => Symbol})
       end
 
       test('when format of nested array elements matches') do
-        validate_format({:a => [:b, :c]}, {:a => [Symbol]})
+        has_format({:a => [:b, :c]}, {:a => [Symbol]})
       end
 
       test('when format of nested hash matches') do
-        validate_format({:a => {:b => :c}}, {:a => {:b => Symbol}})
+        has_format({:a => {:b => :c}}, {:a => {:b => Symbol}})
       end
 
     end
@@ -20,18 +50,19 @@ Shindo.tests('test_helper', 'meta') do
     tests('returns false') do
 
       test('when format of value does not match') do
-        !validate_format({:a => :b}, {:a => String})
+        !has_format({:a => :b}, {:a => String})
       end
 
       test('when not all keys are checked') do
-        !validate_format({:a => :b}, {})
+        !has_format({:a => :b}, {})
       end
 
       test('when some keys do not appear') do
-        !validate_format({}, {:a => String})
+        !has_format({}, {:a => String})
       end
 
     end
 
   end
+
 end

data/tests/rackspace/requests/servers/create_image_tests.rb

@@ -15,7 +15,7 @@ Shindo.tests('Rackspace::Servers#create_image', 'rackspace') do
     end
 
     test('has proper output format') do
-      validate_format(@data, Rackspace::Servers::Formats::IMAGE)
+      has_format(@data, Rackspace::Servers::Formats::IMAGE)
     end
 
   end

data/tests/rackspace/requests/servers/create_server_tests.rb

@@ -13,7 +13,7 @@ Shindo.tests('Rackspace::Servers#create_server', 'rackspace') do
     end
 
     test('has proper output format') do
-      validate_format(@data, Rackspace::Servers::Formats::SERVER.merge('adminPass' => String))
+      has_format(@data, Rackspace::Servers::Formats::SERVER.merge('adminPass' => String))
     end
 
   end

data/tests/rackspace/requests/servers/delete_image_tests.rb

@@ -20,11 +20,8 @@ Shindo.tests('Rackspace::Servers#delete_image', 'rackspace') do
   tests('failure') do
 
     test('raises NotFound error if image does not exist') do
-      begin
+      has_error(Excon::Errors::NotFound) do
         Rackspace[:servers].delete_image(0)
-        false
-      rescue Excon::Errors::NotFound
-        true
       end
     end
 

data/tests/rackspace/requests/servers/delete_server_tests.rb

@@ -14,11 +14,8 @@ Shindo.tests('Rackspace::Servers#delete_server', 'rackspace') do
   tests('failure') do
 
     test('raises NotFound error if server does not exist') do
-      begin
+      has_error(Excon::Errors::NotFound) do
         Rackspace[:servers].delete_server(0)
-        false
-      rescue Excon::Errors::NotFound
-        true
       end
     end
 

data/tests/rackspace/requests/servers/get_flavor_details_tests.rb

@@ -6,18 +6,15 @@ Shindo.tests('Rackspace::Servers#get_flavor_details', 'rackspace') do
     end
 
     test('has proper output format') do
-      validate_format(@data, Rackspace::Servers::Formats::FLAVOR)
+      has_format(@data, Rackspace::Servers::Formats::FLAVOR)
     end
 
   end
   tests('failure') do
 
     test('raises NotFound error if flavor does not exist') do
-      begin
+      has_error(Excon::Errors::NotFound) do
         Rackspace[:servers].get_flavor_details(0)
-        false
-      rescue Excon::Errors::NotFound
-        true
       end
     end
 

data/tests/rackspace/requests/servers/get_image_details_tests.rb

@@ -6,18 +6,15 @@ Shindo.tests('Rackspace::Servers#get_image_details', 'rackspace') do
     end
 
     test('has proper output format') do
-      validate_format(@data, Rackspace::Servers::Formats::IMAGE)
+      has_format(@data, Rackspace::Servers::Formats::IMAGE)
     end
 
   end
   tests('failure') do
 
     test('raises NotFound error if image does not exist') do
-      begin
+      has_error(Excon::Errors::NotFound) do
         Rackspace[:servers].get_image_details(0)
-        false
-      rescue Excon::Errors::NotFound
-        true
       end
     end