fog 0.0.84 → 0.0.85

data/lib/fog/terremark/vcloud.rb

@@ -5,6 +5,13 @@ module Fog
      module Bin
      end
 
+     module Defaults
+       HOST   = 'services.vcloudexpress.terremark.com'
+       PATH   = '/api/v0.8'
+       PORT   = 443
+       SCHEME = 'https'
+     end
+
      extend Fog::Terremark::Shared
 
      def self.new(options={})
@@ -31,11 +38,10 @@ module Fog
         def initialize(options={})
           @terremark_password = options[:terremark_vcloud_password]
           @terremark_username = options[:terremark_vcloud_username]
-          @host   = options[:host]   || "services.vcloudexpress.terremark.com"
-          @path   = options[:path]   || "/api/v0.8"
-          @port   = options[:port]   || 443
-          @scheme = options[:scheme] || 'https'
-          @cookie = get_organizations.headers['Set-Cookie']
+          @host   = options[:host]   || Fog::Terremark::Vcloud::Defaults::HOST
+          @path   = options[:path]   || Fog::Terremark::Vcloud::Defaults::PATH
+          @port   = options[:port]   || Fog::Terremark::Vcloud::Defaults::PORT
+          @scheme = options[:scheme] || Fog::Terremark::Vcloud::Defaults::SCHEME
         end
 
         def default_vdc_id
@@ -92,6 +98,9 @@ module Fog
 
        def initialize(option = {})
          super
+         @base_url = Fog::Terremark::Vcloud::Defaults::SCHEME + "://" +
+                     Fog::Terremark::Vcloud::Defaults::HOST +
+                     Fog::Terremark::Vcloud::Defaults::PATH
          @data = self.class.data[:terremark_vcloud_username]
        end
      end

data/spec/aws/models/ec2/address_spec.rb

@@ -44,9 +44,7 @@ describe 'Fog::AWS::EC2::Address' do
     end
 
     after(:each) do
-      if @address.public_ip
-        @address.destroy
-      end
+      @address.destroy
       @server.destroy
     end
 

data/spec/aws/models/ec2/snapshot_spec.rb

@@ -1,6 +1,22 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe 'Fog::AWS::EC2::Snapshots' do
+describe 'Fog::AWS::EC2::Snapshot' do
+
+  before(:all) do
+    @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+    @volume.wait_for { ready? }
+  end
+
+  after(:all) do
+    @volume.destroy
+  end
+
+  after(:each) do
+    if @snapshot && !@snapshot.new_record?
+      @snapshot.wait_for { ready? }
+      @snapshot.destroy
+    end
+  end
 
   describe "#initialize" do
 
@@ -17,27 +33,13 @@ describe 'Fog::AWS::EC2::Snapshots' do
 
   end
 
-  describe "#collection" do
-
-    it "should return a Fog::AWS::EC2::Snapshots" do
-      AWS[:ec2].snapshots.new.collection.should be_a(Fog::AWS::EC2::Snapshots)
-    end
-
-    it "should be the snapshots the snapshot is related to" do
-      snapshots = AWS[:ec2].snapshots
-      snapshots.new.collection.should == snapshots
-    end
-
-  end
-
   describe "#destroy" do
 
     it "should return true if the snapshot is deleted" do
-      volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      snapshot = volume.snapshots.create
-      snapshot.wait_for { ready? }
-      snapshot.destroy.should be_true
-      volume.destroy
+      @snapshot = @volume.snapshots.create
+      @snapshot.wait_for { ready? }
+      @snapshot.destroy.should be_true
+      @snapshot = nil # avoid the after(:each) block
     end
 
   end
@@ -45,22 +47,13 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#reload" do
 
     before(:each) do
-      @volume   = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       @snapshot = @volume.snapshots.create
       @reloaded = @snapshot.reload
     end
 
-    after(:each) do
-      @snapshot.destroy
-      @volume.destroy
-    end
-
-    it "should return a Fog::AWS::EC2::Snapshot" do
+    it "should match the original" do
       @reloaded.should be_a(Fog::AWS::EC2::Snapshot)
-    end
-
-    it "should reset attributes to remote state" do
-      @snapshot.attributes.should == @reloaded.attributes
+      @reloaded.attributes.should == @snapshot.attributes
     end
 
   end
@@ -68,30 +61,13 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#save" do
 
     before(:each) do
-      @volume   = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      @volume.wait_for { ready? }
       @snapshot = @volume.snapshots.new
     end
 
-    after(:each) do
-      @volume.destroy
-    end
-
-    it "should return true when it succeeds" do
-      @snapshot.save.should be_true
-      @snapshot.wait_for { ready? }
-      @snapshot.destroy
-    end
-
-    it "should not exist in snapshots before save" do
+    it "should persist the snapshot" do
       AWS[:ec2].snapshots.get(@snapshot.id).should be_nil
-    end
-
-    it "should exist in snapshots after save" do
-      @snapshot.save
+      @snapshot.save.should be_true
       AWS[:ec2].snapshots.get(@snapshot.id).should_not be_nil
-      @snapshot.wait_for { ready? }
-      @snapshot.destroy
     end
 
   end

data/spec/aws/models/ec2/snapshots_spec.rb

@@ -2,31 +2,39 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe 'Fog::AWS::EC2::Snapshots' do
 
+  before(:all) do
+    @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+    @volume.wait_for { ready? }
+  end
+
+  after(:all) do
+    @volume.destroy
+  end
+
+  after(:each) do
+    if @snapshot && !@snapshot.new_record?
+      @snapshot.wait_for { ready? }
+      @snapshot.destroy
+    end
+  end
+
   describe "#all" do
 
-    it "should return a Fog::AWS::EC2::Snapshots" do
-      AWS[:ec2].snapshots.all.should be_a(Fog::AWS::EC2::Snapshots)
+    before(:each) do
+      @snapshot = @volume.snapshots.create
     end
 
     it "should include persisted snapshots" do
-      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      eventually { @snapshot = @volume.snapshots.create }
       AWS[:ec2].snapshots.all.map {|snapshot| snapshot.id}.should include(@snapshot.id)
-      @snapshot.destroy
-      @volume.destroy
     end
 
     it "should limit snapshots by volume if present" do
-      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       @other_volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      @volume.wait_for { ready?}
-      @snapshot = @volume.snapshots.create
-      @other_volume.snapshots.all.map {|snapshot| snapshot.id}.should_not include(@snapshot.id)
 
-      @snapshot.wait_for { ready? }
-      @snapshot.destroy
+      @volume.snapshots.map {|snapshot| snapshot.id}.should include(@snapshot.identity)
+      @other_volume.snapshots.map {|snapshot| snapshot.id}.should_not include(@snapshot.identity)
+
       @other_volume.destroy
-      @volume.destroy
     end
 
   end
@@ -34,21 +42,9 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#create" do
 
     before(:each) do
-      @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      @volume.wait_for { ready? }
       @snapshot = @volume.snapshots.create
     end
 
-    after(:each) do
-      @snapshot.wait_for { ready? }
-      @snapshot.destroy
-      @volume.destroy
-    end
-
-    it "should return a Fog::AWS::EC2::Snapshot" do
-      @snapshot.should be_a(Fog::AWS::EC2::Snapshot)
-    end
-
     it "should exist on ec2" do
       AWS[:ec2].snapshots.get(@snapshot.id).should_not be_nil
     end
@@ -58,12 +54,10 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#get" do
 
     it "should return a Fog::AWS::EC2::Snapshot if a matching snapshot exists" do
-      volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      snapshot = volume.snapshots.create
-      snapshot.wait_for { ready? }
-      get = AWS[:ec2].snapshots.get(snapshot.id)
-      snapshot.attributes.should == get.attributes
-      snapshot.destroy
+      @snapshot = @volume.snapshots.create
+      @snapshot.wait_for { ready? }
+      get = AWS[:ec2].snapshots.get(@snapshot.id)
+      @snapshot.attributes.should == get.attributes
     end
 
     it "should return nil if no matching address exists" do

data/spec/aws/models/ec2/volume_spec.rb

@@ -46,14 +46,20 @@ describe 'Fog::AWS::EC2::Volume' do
   end
 
   describe "#server=" do
-    before(:each) do
+    before(:all) do
       @server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
-      @volume = AWS[:ec2].volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
       @server.wait_for { ready? }
     end
 
-    after(:each) do
+    after(:all) do
       @server.destroy
+    end
+
+    before(:each) do
+      @volume = AWS[:ec2].volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
+    end
+
+    after(:each) do
       if @volume.id
         @volume.wait_for { state == 'attached' }
         @volume.server = nil

data/spec/aws/models/s3/directory_spec.rb

@@ -8,10 +8,10 @@ describe 'Fog::AWS::S3::Directory' do
       now = Time.now
       directory = Fog::AWS::S3::Directory.new(
         'CreationDate' => now,
-        'Name'         => 'directoryname'
+        'Key'         => 'directorykey'
       )
       directory.creation_date.should == now
-      directory.name.should == 'directoryname'
+      directory.key.should == 'directorykey'
     end
 
   end
@@ -28,12 +28,12 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#destroy" do
 
     it "should return true if the directory is deleted" do
-      directory = AWS[:s3].directories.create(:name => 'fogmodeldirectory')
+      directory = AWS[:s3].directories.create(:key => 'fogmodeldirectory')
       directory.destroy.should be_true
     end
 
     it "should return false if the directory does not exist" do
-      directory = AWS[:s3].directories.new(:name => 'fogmodeldirectory')
+      directory = AWS[:s3].directories.new(:key => 'fogmodeldirectory')
       directory.destroy.should be_false
     end
 
@@ -42,7 +42,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#location" do
 
     it "should return the location constraint" do
-      directory = AWS[:s3].directories.create(:name => 'fogmodeleudirectory', :location => 'EU')
+      directory = AWS[:s3].directories.create(:key => 'fogmodeleudirectory', :location => 'EU')
       directory.location.should == 'EU'
       AWS[:eu_s3].directories.get('fogmodeleudirectory').destroy
     end
@@ -52,7 +52,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#payer" do
 
     it "should return the request payment value" do
-      directory = AWS[:s3].directories.create(:name => 'fogmodeldirectory')
+      directory = AWS[:s3].directories.create(:key => 'fogmodeldirectory')
       directory.payer.should == 'BucketOwner'
       directory.destroy.should be_true
     end
@@ -62,7 +62,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#payer=" do
 
     it "should set the request payment value" do
-      directory = AWS[:s3].directories.create(:name => 'fogmodeldirectory')
+      directory = AWS[:s3].directories.create(:key => 'fogmodeldirectory')
       (directory.payer = 'Requester').should == 'Requester'
       directory.destroy.should
     end
@@ -72,7 +72,7 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#reload" do
 
     before(:each) do
-      @directory = AWS[:s3].directories.create(:name => 'fogmodeldirectory')
+      @directory = AWS[:s3].directories.create(:key => 'fogmodeldirectory')
       @reloaded = @directory.reload
     end
 
@@ -89,7 +89,11 @@ describe 'Fog::AWS::S3::Directory' do
   describe "#save" do
 
     before(:each) do
-      @directory = AWS[:s3].directories.new(:name => 'fogmodeldirectory')
+      @directory = AWS[:s3].directories.new(:key => 'fogmodeldirectory')
+    end
+
+    it "should not exist in directories before save" do
+      AWS[:s3].directories.all.map {|directory| directory.key}.include?(@directory.key).should be_false
     end
 
     it "should return true when it succeeds" do
@@ -97,13 +101,9 @@ describe 'Fog::AWS::S3::Directory' do
       @directory.destroy
     end
 
-    it "should not exist in directories before save" do
-      AWS[:s3].directories.all.map {|directory| directory.name}.include?(@directory.name).should be_false
-    end
-
     it "should exist in directories after save" do
       @directory.save
-      AWS[:s3].directories.all.map {|directory| directory.name}.include?(@directory.name).should be_true
+      AWS[:s3].directories.all.map {|directory| directory.key}.include?(@directory.key).should be_true
       @directory.destroy
     end
 

data/spec/aws/requests/ec2/associate_address_spec.rb

@@ -6,6 +6,7 @@ describe 'EC2.associate_address' do
     before(:each) do
       @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
       @public_ip = AWS[:ec2].allocate_address.body['publicIp']
+      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
     end
 
     after(:each) do
@@ -14,11 +15,9 @@ describe 'EC2.associate_address' do
     end
 
     it "should return proper attributes" do
-      eventually(128) do
-        actual = AWS[:ec2].associate_address(@instance_id, @public_ip)
-        actual.body['requestId'].should be_a(String)
-        [false, true].should include(actual.body['return'])
-      end
+      actual = AWS[:ec2].associate_address(@instance_id, @public_ip)
+      actual.body['requestId'].should be_a(String)
+      [false, true].should include(actual.body['return'])
     end
 
   end

data/spec/aws/requests/ec2/attach_volume_spec.rb

@@ -6,28 +6,26 @@ describe 'EC2.attach_volume' do
     before(:each) do
       @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1, {'Placement.AvailabilityZone' => 'us-east-1a'}).body['instancesSet'].first['instanceId']
       @volume_id = AWS[:ec2].create_volume('us-east-1a', 1).body['volumeId']
+      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
+      AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
     end
 
     after(:each) do
-      eventually do
-        AWS[:ec2].detach_volume(@volume_id)
-      end
-      eventually do
-        AWS[:ec2].delete_volume(@volume_id)
-        AWS[:ec2].terminate_instances(@instance_id)
-      end
+      AWS[:ec2].volumes.get(@volume_id).wait_for { state == 'attached' }
+      AWS[:ec2].detach_volume(@volume_id)
+      AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
+      AWS[:ec2].delete_volume(@volume_id)
+      AWS[:ec2].terminate_instances(@instance_id)
     end
 
     it "should return proper attributes" do
-      eventually(128) do
-        actual = AWS[:ec2].attach_volume(@instance_id, @volume_id, '/dev/sdh')
-        actual.body['attachTime'].should be_a(Time)
-        actual.body['device'].should be_a(String)
-        actual.body['instanceId'].should be_a(String)
-        actual.body['requestId'].should be_a(String)
-        actual.body['status'].should be_a(String)
-        actual.body['volumeId'].should be_a(String)
-      end
+      actual = AWS[:ec2].attach_volume(@instance_id, @volume_id, '/dev/sdh')
+      actual.body['attachTime'].should be_a(Time)
+      actual.body['device'].should be_a(String)
+      actual.body['instanceId'].should be_a(String)
+      actual.body['requestId'].should be_a(String)
+      actual.body['status'].should be_a(String)
+      actual.body['volumeId'].should be_a(String)
     end
 
   end

data/spec/aws/requests/ec2/create_snapshot_spec.rb

@@ -9,9 +9,8 @@ describe 'EC2.create_snapshot' do
 
     after(:each) do
       AWS[:ec2].delete_volume(@volume_id)
-      eventually do
-        AWS[:ec2].delete_snapshot(@snapshot_id)
-      end
+      AWS[:ec2].snapshots.get(@snapshot_id).wait_for { ready? }
+      AWS[:ec2].delete_snapshot(@snapshot_id)
     end
 
     it "should return proper attributes" do

data/spec/aws/requests/ec2/delete_snapshot_spec.rb

@@ -13,12 +13,11 @@ describe 'EC2.delete_snapshot' do
     end
 
     it "should return proper attributes" do
-      eventually do
-        actual = AWS[:ec2].delete_snapshot(@snapshot_id)
-        unless actual.body.empty?
-          actual.body['requestId'].should be_a(String)
-          [false, true].should include(actual.body['return'])
-        end
+      AWS[:ec2].snapshots.get(@snapshot_id).wait_for { ready? }
+      actual = AWS[:ec2].delete_snapshot(@snapshot_id)
+      unless actual.body.empty?
+        actual.body['requestId'].should be_a(String)
+        [false, true].should include(actual.body['return'])
       end
     end