fog 0.0.39 → 0.0.40

data/lib/fog/rackspace/models/servers/server.rb

@@ -6,33 +6,44 @@ module Fog
 
         identity :id
 
-        attribute :admin_pass,  'adminPass'
-        attribute :name
-        attribute :image_id,    'imageId'
+        attribute :addresses
+        attribute :password,    'adminPass'
         attribute :flavor_id,   'flavorId'
         attribute :host_id,     'hostId'
-        attribute :status
+        attribute :image_id,    'imageId'
+        attribute :metadata
+        attribute :name
         attribute :personality
         attribute :progress
-        attribute :addresses
-        attribute :metadata
+        attribute :status
 
         def destroy
           requires :id
-
           connection.delete_server(@id)
           true
         end
 
+        def flavor
+          requires :flavor_id
+          connection.flavors.get(@flavor_id)
+        end
+
+        def image
+          requires :image_id
+          connection.images.get(@image_id)
+        end
+
         def images
           requires :id
-
           connection.images(:server => self)
         end
 
+        def ready?
+          @status == 'ACTIVE'
+        end
+
         def reboot(type = 'SOFT')
           requires :id
-
           connection.reboot_server(@id, type)
           true
         end

data/lib/fog/rackspace/models/servers/servers.rb

@@ -23,7 +23,9 @@ module Fog
         end
 
         def get(server_id)
-          connection.get_server_details(server_id)
+          if server = connection.get_server_details(server_id).body['server']
+            new(server)
+          end
         rescue Excon::Errors::NotFound
           nil
         end

data/lib/fog/rackspace/servers.rb

@@ -57,14 +57,15 @@ module Fog
         @path   = uri.path
         @port   = uri.port
         @scheme = uri.scheme
-        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
       end
 
       def request(params)
+        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
         response = @connection.request({
           :body     => params[:body],
           :expects  => params[:expects],
           :headers  => {
+            'Content-Type' => 'application/json',
             'X-Auth-Token' => @auth_token
           }.merge!(params[:headers] || {}),
           :host     => @host,

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

@@ -9,7 +9,7 @@ describe 'Fog::AWS::EC2::Address' do
         'instanceId'  => 'i-00000000',
         'publicIp'    => '0.0.0.0'
       )
-      address.instance_id.should == 'i-00000000'
+      address.server_id.should == 'i-00000000'
       address.public_ip.should == '0.0.0.0'
     end
 
@@ -37,24 +37,24 @@ describe 'Fog::AWS::EC2::Address' do
 
   end
 
-  describe "#instance=" do
+  describe "#server=" do
     before(:each) do
       @address = ec2.addresses.new
-      @instance = ec2.instances.create(:image_id => GENTOO_AMI)
+      @server = ec2.servers.create(:image_id => GENTOO_AMI)
     end
 
     after(:each) do
       if @address.public_ip
         @address.destroy
       end
-      @instance.destroy
+      @server.destroy
     end
 
-    it "should associate with instance to an already saved address" do
+    it "should associate with server to an already saved address" do
       @address.save.should be_true
-      @instance.wait_for { state == 'running' }
-      @address.instance = @instance
-      @address.instance_id.should == @instance.id
+      @server.wait_for { state == 'running' }
+      @address.server = @server
+      @address.server_id.should == @server.id
     end
   end
 

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

@@ -0,0 +1,109 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/server_examples'
+
+describe 'Fog::AWS::EC2::Server' do
+
+  it_should_behave_like "Server"
+
+  subject { @server = @servers.new(:image_id => GENTOO_AMI) }
+
+  before(:each) do
+    @servers = ec2.servers
+  end
+
+  after(:each) do
+    if @server && !@server.new_record?
+      @server.wait_for { ready? }
+      @server.destroy.should be_true
+    end
+  end
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" do
+      server = @servers.new({
+        'amiLaunchIndex'    => 'ami_launch_index',
+        'dnsName'           => 'dns_name',
+        'groupId'           => 'group_id',
+        'imageId'           => 'image_id',
+        'instanceId'        => 'instance_id',
+        'instanceType'      => 'instance_type',
+        'kernelId'          => 'kernel_id',
+        'keyName'           => 'key_name',
+        'launchTime'        => 'launch_time',
+        'productCodes'      => 'product_codes',
+        'privateDnsName'    => 'private_dns_name',
+        'ramdiskId'         => 'ramdisk_id'
+      })
+      server.ami_launch_index.should == 'ami_launch_index'
+      server.dns_name.should == 'dns_name'
+      server.group_id.should == 'group_id'
+      server.image_id.should == 'image_id'
+      server.id.should == 'instance_id'
+      server.flavor.should == 'instance_type'
+      server.kernel_id.should == 'kernel_id'
+      server.key_name.should == 'key_name'
+      server.created_at.should == 'launch_time'
+      server.product_codes.should == 'product_codes'
+      server.private_dns_name.should == 'private_dns_name'
+      server.ramdisk_id.should == 'ramdisk_id'
+    end
+
+  end
+
+  describe "#addresses" do
+
+    it "should return a Fog::AWS::EC2::Addresses" do
+      subject.save
+      subject.addresses.should be_a(Fog::AWS::EC2::Addresses)
+    end
+
+  end
+
+  describe "#state" do
+    it "should remap values out of hash" do
+      server = Fog::AWS::EC2::Server.new({
+        'instanceState' => { 'name' => 'instance_state' },
+      })
+      server.state.should == 'instance_state'
+    end
+  end
+
+  describe "#key_pair" do
+    it "should have tests"
+  end
+
+  describe "#key_pair=" do
+    it "should have tests"
+  end
+
+  describe "#monitoring=" do
+    it "should remap values out of hash" do
+      server = Fog::AWS::EC2::Server.new({
+        'monitoring' => { 'state' => true }
+      })
+      server.monitoring.should == true
+    end
+  end
+
+  describe "#placement=" do
+
+    it "should remap values into availability_zone" do
+      server = Fog::AWS::EC2::Server.new({
+        'placement' => { 'availabilityZone' => 'availability_zone' }
+      })
+      server.availability_zone.should == 'availability_zone'
+    end
+
+  end
+
+  describe "#volumes" do
+
+    it "should return a Fog::AWS::EC2::Volumes" do
+      subject.save
+      subject.volumes.should be_a(Fog::AWS::EC2::Volumes)
+    end
+
+  end
+
+end

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

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::EC2::Servers' do
+
+  subject { @server = @servers.create(:image_id => GENTOO_AMI) }
+
+  before(:each) do
+    @servers = ec2.servers
+  end
+
+  after(:each) do
+    if @server && !@server.new_record?
+      @server.destroy
+    end
+  end
+
+  describe "#all" do
+
+    it "should include persisted servers" do
+      eventually do
+        @servers.all.map {|server| server.id}.should include(subject.id)
+      end
+    end
+
+  end
+
+  describe "#get" do
+
+    it "should return a matching server if one exists" do
+      eventually do
+        get = @servers.get(subject.id)
+        subject.attributes.should == get.attributes
+      end
+    end
+
+    it "should return nil if no matching server exists" do
+      @servers.get('i-00000000').should be_nil
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should reset attributes to remote state" do
+      servers = @servers.all
+      reloaded = servers.reload
+      servers.attributes.should == reloaded.attributes
+    end
+
+  end
+
+end

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

@@ -11,7 +11,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
         'volumeId'    => 'vol-00000000'
       )
       snapshot.id.should == 'snap-00000000'
-      snapshot.start_time.should == 'now'
+      snapshot.created_at.should == 'now'
       snapshot.volume_id.should == 'vol-00000000'
     end
 
@@ -35,6 +35,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
     it "should return true if the snapshot is deleted" do
       volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       snapshot = volume.snapshots.create
+      snapshot.wait_for { status == "completed" }
       snapshot.destroy.should be_true
       volume.destroy
     end

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

@@ -13,10 +13,10 @@ describe 'Fog::AWS::EC2::Volume' do
         'snapshotId'        => 'snap-00000000',
         'volumeId'          => 'vol-00000000'
       )
-      volume.attach_time.should == 'now'
+      volume.attached_at.should == 'now'
       volume.availability_zone.should == 'us-east-1a'
-      volume.create_time.should == 'recently'
-      volume.instance_id.should == 'i-00000000'
+      volume.created_at.should == 'recently'
+      volume.server_id.should == 'i-00000000'
       volume.snapshot_id.should == 'snap-00000000'
       volume.id.should == 'vol-00000000'
     end
@@ -45,49 +45,49 @@ describe 'Fog::AWS::EC2::Volume' do
 
   end
 
-  describe "#instance=" do
+  describe "#server=" do
     before(:each) do
-      @instance = ec2.instances.create(:image_id => GENTOO_AMI)
-      @volume = ec2.volumes.new(:availability_zone => @instance.availability_zone, :size => 1, :device => '/dev/sdz1')
-      @instance.wait_for { state == 'running' }
+      @server = ec2.servers.create(:image_id => GENTOO_AMI)
+      @volume = ec2.volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
+      @server.wait_for { state == 'running' }
     end
 
     after(:each) do
-      @instance.destroy
+      @server.destroy
       if @volume.id
         @volume.wait_for { status == 'attached' }
-        @volume.instance = nil
+        @volume.server = nil
         @volume.wait_for { status == 'available' }
         @volume.destroy
       end
     end
 
-    it "should not attach to instance if the volume has not been saved" do
-      @volume.instance = @instance
-      @volume.instance_id.should_not == @instance.id
+    it "should not attach to server if the volume has not been saved" do
+      @volume.server = @server
+      @volume.server_id.should_not == @server.id
     end
 
     it "should change the availability_zone if the volume has not been saved" do
-      @volume.instance = @instance
-      @volume.availability_zone.should == @instance.availability_zone
+      @volume.server = @server
+      @volume.availability_zone.should == @server.availability_zone
     end
 
-    it "should attach to instance when the volume is saved" do
-      @volume.instance = @instance
+    it "should attach to server when the volume is saved" do
+      @volume.server = @server
       @volume.save.should be_true
-      @volume.instance_id.should == @instance.id
+      @volume.server_id.should == @server.id
     end
 
-    it "should attach to instance to an already saved volume" do
+    it "should attach to server to an already saved volume" do
       @volume.save.should be_true
-      @volume.instance = @instance
-      @volume.instance_id.should == @instance.id
+      @volume.server = @server
+      @volume.server_id.should == @server.id
     end
 
     it "should not change the availability_zone if the volume has been saved" do
       @volume.save.should be_true
-      @volume.instance = @instance
-      @volume.availability_zone.should == @instance.availability_zone
+      @volume.server = @server
+      @volume.availability_zone.should == @server.availability_zone
     end
   end
 

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

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::S3::Directories' do
+
+  describe "#all" do
+
+    it "should include persisted directories" do
+      @directory = s3.directories.create(:name => 'fogdirectoryname')
+      s3.directories.all.map {|directory| @directory.name}.should include('fogdirectoryname')
+      @directory.destroy
+    end
+
+  end
+
+  describe "#create" do
+
+    it "should exist on s3" do
+      directory = s3.directories.create(:name => 'fogdirectoryname')
+      s3.directories.get(directory.name).should_not be_nil
+      directory.destroy
+    end
+
+  end
+
+  describe "#get" do
+
+    it "should return a Fog::AWS::S3::Directory if a matching directory exists" do
+      directory = s3.directories.create(:name => 'fogdirectoryname')
+      get = s3.directories.get('fogdirectoryname')
+      directory.attributes.should == get.attributes
+      directory.destroy
+    end
+
+    it "should return nil if no matching directory exists" do
+      s3.directories.get('fogdirectoryname').should be_nil
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should reload data" do
+      directories = s3.directories
+      directories.should == directories.reload
+    end
+
+  end
+
+end

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

@@ -0,0 +1,112 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::S3::Directory' do
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" do
+      now = Time.now
+      directory = Fog::AWS::S3::Directory.new(
+        'CreationDate' => now,
+        'Name'         => 'directoryname'
+      )
+      directory.creation_date.should == now
+      directory.name.should == 'directoryname'
+    end
+
+  end
+
+  describe "#collection" do
+
+    it "should be the directories the directory is related to" do
+      directories = s3.directories
+      directories.new.collection.should == directories
+    end
+
+  end
+
+  describe "#destroy" do
+
+    it "should return true if the directory is deleted" do
+      directory = s3.directories.create(:name => 'fogmodeldirectory')
+      directory.destroy.should be_true
+    end
+
+    it "should return false if the directory does not exist" do
+      directory = s3.directories.new(:name => 'fogmodeldirectory')
+      directory.destroy.should be_false
+    end
+
+  end
+
+  describe "#location" do
+
+    it "should return the location constraint" do
+      directory = s3.directories.create(:name => 'fogmodeleudirectory', :location => 'EU')
+      directory.location.should == 'EU'
+      eu_s3.directories.get('fogmodeleudirectory').destroy
+    end
+
+  end
+
+  describe "#payer" do
+
+    it "should return the request payment value" do
+      directory = s3.directories.create(:name => 'fogmodeldirectory')
+      directory.payer.should == 'BucketOwner'
+      directory.destroy.should be_true
+    end
+
+  end
+
+  describe "#payer=" do
+
+    it "should set the request payment value" do
+      directory = s3.directories.create(:name => 'fogmodeldirectory')
+      (directory.payer = 'Requester').should == 'Requester'
+      directory.destroy.should
+    end
+
+  end
+
+  describe "#reload" do
+
+    before(:each) do
+      @directory = s3.directories.create(:name => 'fogmodeldirectory')
+      @reloaded = @directory.reload
+    end
+
+    after(:each) do
+      @directory.destroy
+    end
+
+    it "should reset attributes to remote state" do
+      @directory.attributes.should == @reloaded.attributes
+    end
+
+  end
+
+  describe "#save" do
+
+    before(:each) do
+      @directory = s3.directories.new(:name => 'fogmodeldirectory')
+    end
+
+    it "should return true when it succeeds" do
+      @directory.save.should be_true
+      @directory.destroy
+    end
+
+    it "should not exist in directories before save" do
+      s3.directories.all.map {|directory| directory.name}.include?(@directory.name).should be_false
+    end
+
+    it "should exist in directories after save" do
+      @directory.save
+      s3.directories.all.map {|directory| directory.name}.include?(@directory.name).should be_true
+      @directory.destroy
+    end
+
+  end
+
+end