fog 0.0.29 → 0.0.30

data/lib/fog/rackspace/servers.rb

@@ -2,6 +2,18 @@ module Fog
   module Rackspace
     class Servers
 
+      if Fog.mocking?
+        def self.data
+          @data
+        end
+        def self.reset_data
+          @data = {
+            :last_modified => [],
+            :servers => {}
+          }
+        end
+      end
+
       def self.reload
         load "fog/rackspace/models/servers/server.rb"
         load "fog/rackspace/models/servers/servers.rb"
@@ -11,13 +23,21 @@ module Fog
         load "fog/rackspace/requests/servers/delete_image.rb"
         load "fog/rackspace/requests/servers/delete_server.rb"
         load "fog/rackspace/requests/servers/get_server_details.rb"
+        load "fog/rackspace/requests/servers/list_addresses.rb"
+        load "fog/rackspace/requests/servers/list_private_addresses.rb"
+        load "fog/rackspace/requests/servers/list_public_addresses.rb"
         load "fog/rackspace/requests/servers/list_flavors.rb"
+        load "fog/rackspace/requests/servers/list_flavors_detail.rb"
         load "fog/rackspace/requests/servers/list_images.rb"
         load "fog/rackspace/requests/servers/list_images_detail.rb"
         load "fog/rackspace/requests/servers/list_servers.rb"
         load "fog/rackspace/requests/servers/list_servers_detail.rb"
         load "fog/rackspace/requests/servers/reboot_server.rb"
         load "fog/rackspace/requests/servers/update_server.rb"
+
+        if Fog.mocking?
+          reset_data
+        end
       end
 
       def initialize(options={})

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

@@ -18,12 +18,12 @@ describe 'Fog::AWS::EC2::Address' do
   describe "#addresses" do
 
     it "should return a Fog::AWS::EC2::Addresses" do
-      ec2.addresses.new.addresses.should be_a(Fog::AWS::EC2::Addresses)
+      ec2.addresses.new.collection.should be_a(Fog::AWS::EC2::Addresses)
     end
 
     it "should be the addresses the address is related to" do
       addresses = ec2.addresses
-      addresses.new.addresses.should == addresses
+      addresses.new.collection.should == addresses
     end
 
   end
@@ -101,12 +101,12 @@ describe 'Fog::AWS::EC2::Address' do
     end
 
     it "should not exist in addresses before save" do
-      @address.addresses.get(@address.public_ip).should be_nil
+      @address.collection.get(@address.public_ip).should be_nil
     end
 
     it "should exist in buckets after save" do
       @address.save
-      @address.addresses.get(@address.public_ip).should_not be_nil
+      @address.collection.get(@address.public_ip).should_not be_nil
       @address.destroy
     end
 

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

@@ -62,15 +62,15 @@ describe 'Fog::AWS::EC2::Instance' do
     end
   end
 
-  describe "#instances" do
+  describe "#collection" do
 
     it "should return a Fog::AWS::EC2::Instances" do
-      ec2.instances.new.instances.should be_a(Fog::AWS::EC2::Instances)
+      ec2.instances.new.collection.should be_a(Fog::AWS::EC2::Instances)
     end
 
     it "should be the instances the instance is related to" do
       instances = ec2.instances
-      instances.new.instances.should == instances
+      instances.new.collection.should == instances
     end
 
   end
@@ -127,7 +127,7 @@ describe 'Fog::AWS::EC2::Instance' do
   describe "#save" do
 
     before(:each) do
-      @instance = ec2.instances.new
+      @instance = ec2.instances.new(:image_id => GENTOO_AMI)
     end
 
     it "should return true when it succeeds" do
@@ -136,12 +136,12 @@ describe 'Fog::AWS::EC2::Instance' do
     end
 
     it "should not exist in instances before save" do
-      @instance.instances.get(@instance.instance_id).should be_nil
+      ec2.instances.get(@instance.instance_id).should be_nil
     end
 
     it "should exist in buckets after save" do
       @instance.save
-      @instance.instances.get(@instance.instance_id).should_not be_nil
+      ec2.instances.get(@instance.instance_id).should_not be_nil
       @instance.destroy
     end
 

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

@@ -17,15 +17,15 @@ describe 'Fog::AWS::EC2::KeyPair' do
 
   end
 
-  describe "#key_pairs" do
+  describe "#collection" do
 
     it "should return a Fog::AWS::EC2::KeyPairs" do
-      ec2.key_pairs.new.key_pairs.should be_a(Fog::AWS::EC2::KeyPairs)
+      ec2.key_pairs.new.collection.should be_a(Fog::AWS::EC2::KeyPairs)
     end
 
     it "should be the key_pairs the keypair is related to" do
       key_pairs = ec2.key_pairs
-      key_pairs.new.key_pairs.should == key_pairs
+      key_pairs.new.collection.should == key_pairs
     end
 
   end
@@ -72,12 +72,12 @@ describe 'Fog::AWS::EC2::KeyPair' do
     end
 
     it "should not exist in key_pairs before save" do
-      @key_pair.key_pairs.get(@key_pair.name).should be_nil
+      ec2.key_pairs.get(@key_pair.name).should be_nil
     end
 
     it "should exist in buckets after save" do
       @key_pair.save
-      @key_pair.key_pairs.get(@key_pair.name).should_not be_nil
+      ec2.key_pairs.get(@key_pair.name).should_not be_nil
       @key_pair.destroy
     end
 

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

@@ -19,15 +19,15 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
 
   end
 
-  describe "#security_groups" do
+  describe "#collection" do
 
     it "should return a Fog::AWS::EC2::SecurityGroups" do
-      ec2.security_groups.new.security_groups.should be_a(Fog::AWS::EC2::SecurityGroups)
+      ec2.security_groups.new.collection.should be_a(Fog::AWS::EC2::SecurityGroups)
     end
 
     it "should be the security_groups the keypair is related to" do
       security_groups = ec2.security_groups
-      security_groups.new.security_groups.should == security_groups
+      security_groups.new.collection.should == security_groups
     end
 
   end
@@ -74,12 +74,12 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
     end
 
     it "should not exist in security_groups before save" do
-      @security_group.security_groups.get(@security_group.group_name).should be_nil
+      ec2.security_groups.get(@security_group.group_name).should be_nil
     end
 
     it "should exist in buckets after save" do
       @security_group.save
-      @security_group.security_groups.get(@security_group.group_name).should_not be_nil
+      ec2.security_groups.get(@security_group.group_name).should_not be_nil
       @security_group.destroy
     end
 

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

@@ -17,15 +17,15 @@ describe 'Fog::AWS::EC2::Snapshots' do
 
   end
 
-  describe "#snapshots" do
+  describe "#collection" do
 
     it "should return a Fog::AWS::EC2::Snapshots" do
-      ec2.snapshots.new.snapshots.should be_a(Fog::AWS::EC2::Snapshots)
+      ec2.snapshots.new.collection.should be_a(Fog::AWS::EC2::Snapshots)
     end
 
     it "should be the snapshots the snapshot is related to" do
       snapshots = ec2.snapshots
-      snapshots.new.snapshots.should == snapshots
+      snapshots.new.collection.should == snapshots
     end
 
   end
@@ -33,7 +33,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#destroy" do
 
     it "should return true if the snapshot is deleted" do
-      volume = ec2.volumes.create
+      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       snapshot = volume.snapshots.create
       snapshot.destroy.should be_true
       volume.destroy
@@ -44,7 +44,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#reload" do
 
     before(:each) do
-      @volume   = ec2.volumes.create
+      @volume   = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       @snapshot = @volume.snapshots.create
       @reloaded = @snapshot.reload
     end
@@ -67,7 +67,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#save" do
 
     before(:each) do
-      @volume   = ec2.volumes.create
+      @volume   = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       @snapshot = @volume.snapshots.new
     end
 
@@ -81,12 +81,12 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should not exist in addresses before save" do
-      @snapshot.snapshots.get(@snapshot.snapshot_id).should be_nil
+      ec2.snapshots.get(@snapshot.snapshot_id).should be_nil
     end
 
     it "should exist in buckets after save" do
       @snapshot.save
-      @snapshot.snapshots.get(@snapshot.snapshot_id).should_not be_nil
+      ec2.snapshots.get(@snapshot.snapshot_id).should_not be_nil
       @snapshot.destroy
     end
 

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

@@ -9,7 +9,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should include persisted snapshots" do
-      volume = ec2.volumes.create
+      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       snapshot = volume.snapshots.create
       ec2.snapshots.all.map {|snapshot| snapshot.snapshot_id}.should include(snapshot.snapshot_id)
       snapshot.destroy
@@ -17,8 +17,8 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should limit snapshots by volume_id if present" do
-      volume = ec2.volumes.create
-      other_volume = ec2.volumes.create
+      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      other_volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       snapshot = volume.snapshots.create
       other_volume.snapshots.all.map {|snapshot| snapshot.snapshot_id}.should_not include(snapshot.snapshot_id)
       snapshot.destroy
@@ -31,7 +31,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
   describe "#create" do
 
     before(:each) do
-      @volume = ec2.volumes.create
+      @volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       @snapshot = @volume.snapshots.create
     end
 
@@ -53,10 +53,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 = ec2.volumes.create
+      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       snapshot = volume.snapshots.create
       get = ec2.snapshots.get(snapshot.snapshot_id)
-      snapshot.attributes.should == get.attributes
+      snapshot.attributes.reject {|key, value| ['progress', 'status'].include?(key)}.should == get.attributes.reject {|key, value| ['progress', 'status'].include?(key)}
       snapshot.destroy
     end
 

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

@@ -23,15 +23,15 @@ describe 'Fog::AWS::EC2::Volume' do
 
   end
 
-  describe "#volumes" do
+  describe "#collection" do
 
     it "should return a Fog::AWS::EC2::Volumes" do
-      ec2.volumes.new.volumes.should be_a(Fog::AWS::EC2::Volumes)
+      ec2.volumes.new.collection.should be_a(Fog::AWS::EC2::Volumes)
     end
 
     it "should be the volumes the volume is related to" do
       volumes = ec2.volumes
-      volumes.new.volumes.should == volumes
+      volumes.new.collection.should == volumes
     end
 
   end
@@ -60,6 +60,7 @@ describe 'Fog::AWS::EC2::Volume' do
     after(:each) do
       @instance.destroy
       if @volume.volume_id
+        @volume.instance = nil
         @volume.destroy
       end
     end
@@ -126,12 +127,12 @@ describe 'Fog::AWS::EC2::Volume' do
     end
 
     it "should not exist in volumes before save" do
-      @volume.volumes.get(@volume.volume_id).should be_nil
+      ec2.volumes.get(@volume.volume_id).should be_nil
     end
 
     it "should exist in buckets after save" do
       @volume.save
-      @volume.volumes.get(@volume.volume_id).should_not be_nil
+      ec2.volumes.get(@volume.volume_id).should_not be_nil
       @volume.destroy
     end
 

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

@@ -9,7 +9,7 @@ describe 'Fog::AWS::EC2::Volumes' do
     end
 
     it "should include persisted volumes" do
-      volume = ec2.volumes.create
+      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       ec2.volumes.get(volume.volume_id).should_not be_nil
       volume.destroy
     end
@@ -19,7 +19,7 @@ describe 'Fog::AWS::EC2::Volumes' do
   describe "#create" do
 
     before(:each) do
-      @volume = ec2.volumes.create
+      @volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
     end
 
     after(:each) do
@@ -39,9 +39,9 @@ describe 'Fog::AWS::EC2::Volumes' do
   describe "#get" do
 
     it "should return a Fog::AWS::EC2::Volume if a matching volume exists" do
-      volume = ec2.volumes.create
+      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       get = ec2.volumes.get(volume.volume_id)
-      volume.attributes.should == get.attributes
+      volume.attributes.reject { |key, value| key == :device }.should == get.attributes.reject { |key, value| key == :device }
       volume.destroy
     end
 

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

@@ -26,7 +26,7 @@ describe 'EC2.associate_address' do
       @public_ip = ec2.allocate_address.body['publicIp']
       lambda {
         ec2.associate_address('i-00000000', @public_ip)
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
       ec2.release_address(@public_ip)
     end
 
@@ -34,7 +34,7 @@ describe 'EC2.associate_address' do
       @instance_id = ec2.run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
       lambda {
         ec2.associate_address(@instance_id, '127.0.0.1')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
       ec2.terminate_instances(@instance_id)
     end
 

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

@@ -37,7 +37,7 @@ describe 'EC2.attach_volume' do
       @volume_id = ec2.create_volume('us-east-1a', 1).body['volumeId']
       lambda {
         ec2.attach_volume('i-00000000', @volume_id, '/dev/sdh')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
       ec2.delete_volume(@volume_id)
     end
 
@@ -45,7 +45,7 @@ describe 'EC2.attach_volume' do
       @instance_id = ec2.run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
       lambda {
         ec2.attach_volume(@instance_id, 'vol-00000000', '/dev/sdh')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
       ec2.terminate_instances(@instance_id)
     end
 

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

@@ -29,7 +29,7 @@ describe 'EC2.create_key_pair' do
     it "should raise a BadRequest when the key pair already exists" do
       lambda {
         ec2.create_key_pair('fog_key_pair')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

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

@@ -27,7 +27,7 @@ describe 'EC2.create_security_group' do
     it "should raise a BadRequest error when the security group already exists" do
       lambda {
         ec2.create_security_group('fog_security_group', 'a security group for testing fog')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

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

@@ -30,7 +30,7 @@ describe 'EC2.create_snapshot' do
     it "should raise a BadRequest error if the volume does not exist" do
       lambda {
         ec2.create_snapshot('vol-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

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

@@ -19,7 +19,7 @@ describe 'EC2.delete_security_group' do
     it "should raise a BadRequest error if the security group does not exist" do
       lambda {
         ec2.delete_security_group('fog_not_a_security_group')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

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

@@ -28,7 +28,7 @@ describe 'EC2.delete_snapshot' do
     it "should raise a BadRequest error if snapshot does not exist" do
       lambda {
         ec2.release_address('snap-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end

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

@@ -18,8 +18,8 @@ describe 'EC2.create_volume' do
 
     it "should raise a BadRequest error if volume does not exist" do
       lambda {
-        ec2.release_address('vol-00000000')
-      }.should raise_error(Fog::Errors::BadRequest)
+        ec2.delete_volume('vol-00000000')
+      }.should raise_error(Excon::Errors::BadRequest)
     end
 
   end