fog 0.3.25 → 0.3.26

data/lib/fog/rackspace/requests/compute/reboot_server.rb

@@ -10,12 +10,8 @@ module Fog
         # * type<~String> - Type of reboot, must be in ['HARD', 'SOFT']
         #
         def reboot_server(server_id, type = 'SOFT')
-          request(
-            :body     => { 'reboot' => { 'type' => type }}.to_json,
-            :expects  => 202,
-            :method   => 'POST',
-            :path     => "servers/#{server_id}/action.json"
-          )
+          body = { 'reboot' => { 'type' => type }}
+          server_action(server_id, body)
         end
 
       end
@@ -23,7 +19,9 @@ module Fog
       class Mock
 
         def reboot_server(server_id, type = 'SOFT')
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          response.status = 202
+          response
         end
 
       end

data/lib/fog/rackspace/requests/compute/resize_server.rb

@@ -0,0 +1,39 @@
+module Fog
+  module Rackspace
+    class Compute
+      class Real
+
+        # Reboot an existing server
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to resize
+        # * size<~String> - new size. call list_flavors to get available flavors
+        #
+        def resize_server(server_id, flavor_id)
+          body = { 'resize' => { 'flavorId' => flavor_id }}
+          server_action(server_id, body)
+        end
+
+      end
+
+      class Mock
+
+        # FIXME: should probably transition instead of skipping to VERIFY_RESIZE
+        def resize_server(server_id, flavor_id)
+          response = Excon::Response.new
+          response.status = 202
+
+          # keep track of this for reverts
+          @data[:servers][server_id]['old_flavorId'] = @data[:servers][server_id]['flavorId']
+
+          @data[:servers][server_id]['flavorId'] = flavor_id
+          @data[:last_modified][:servers][server_id] = Time.now
+          @data[:servers][server_id]['status'] = 'VERIFY_RESIZE'
+
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/compute/revert_resized_server.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Rackspace
+    class Compute
+      class Real
+
+        # Revert resizing
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to revert
+        #
+        def revert_resized_server(server_id)
+          body = { 'revertResize' => nil }
+          server_action(server_id, body)
+        end
+
+      end
+
+      class Mock
+
+        def revert_resized_server(server_id)
+          response = Excon::Response.new
+          response.status = 202
+
+          @data[:servers][server_id]['flavorId'] = @data[:servers][server_id]['old_flavorId']
+          @data[:servers][server_id].delete('old_flavorId')
+          @data[:last_modified][:servers][server_id] = Time.now
+          @data[:servers][server_id]['status'] = 'ACTIVE'
+
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/compute/server_action.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Rackspace
+    class Compute
+      class Real
+
+        # Reboot an existing server
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to reboot
+        # * body<~.to_json object> - Body of the request, describes the action (see reboot_server as an example)
+        # * expect<~Integer> - expected return, 202 except for confirm resize (204)
+        #
+        def server_action(server_id, body, expects=202)
+          request(
+            :body     => body.to_json,
+            :expects  => expects,
+            :method   => 'POST',
+            :path     => "servers/#{server_id}/action.json"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def server_action(server_id, body)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/storage.rb

@@ -111,7 +111,7 @@ module Fog
               :host     => @host,
               :path     => "#{@path}/#{params[:path]}",
             }), &block)
-          rescue Excon::Errors::Error => error
+          rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
               Fog::Rackspace::Storage::NotFound.slurp(error)

data/lib/fog/slicehost/compute.rb

@@ -73,7 +73,7 @@ module Fog
 
           begin
             response = @connection.request(params.merge!({:host => @host}))
-          rescue Excon::Errors::Error => error
+          rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
               Fog::Slicehost::Compute::NotFound.slurp(error)

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

@@ -67,42 +67,64 @@ describe 'Fog::AWS::Compute::Volume' do
       @volume = AWS[:compute].volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
     end
 
-    after(:each) do
-      if @volume.id
-        @volume.wait_for { state == 'in-use' }
-        @volume.server = nil
-        @volume.wait_for { ready? }
-        @volume.destroy
+    describe "when set to a server" do
+      after(:each) do
+        if @volume.id
+          @volume.wait_for { state == 'in-use' }
+          @volume.server = nil
+          @volume.wait_for { ready? }
+          @volume.destroy
+        end
       end
-    end
 
-    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 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.server = @server
-      @volume.availability_zone.should == @server.availability_zone
-    end
+      it "should change the availability_zone if the volume has not been saved" do
+        @volume.server = @server
+        @volume.availability_zone.should == @server.availability_zone
+      end
 
-    it "should attach to server when the volume is saved" do
-      @volume.server = @server
-      @volume.save.should be_true
-      @volume.server_id.should == @server.id
-    end
+      it "should attach to server when the volume is saved" do
+        @volume.server = @server
+        @volume.save.should be_true
+        @volume.server_id.should == @server.id
+      end
+
+      it "should attach to server to an already saved volume" do
+        @volume.save.should be_true
+        @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.server = @server
+        @volume.availability_zone.should == @server.availability_zone
+      end
 
-    it "should attach to server to an already saved volume" do
-      @volume.save.should be_true
-      @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.server = @server
-      @volume.availability_zone.should == @server.availability_zone
+    describe "when set to nil" do
+      after(:each) do
+        @volume.destroy
+      end
+
+      it "should detach from server if the volume has been saved" do
+        @volume.server = @server
+        @volume.save.should be_true
+        @server.reload.volumes.map(&:id).should include(@volume.id)
+
+        @volume.server = nil
+        @volume.wait_for { ready? }
+        @volume.server_id.should be_nil
+        @server.reload.volumes.map(&:id).should_not include(@volume.id)
+      end
+
     end
+
   end
 
   describe "#reload" do

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

@@ -39,7 +39,7 @@ describe 'Fog::AWS::Compute::Volumes' do
   describe "#get" do
 
     it "should return a Fog::AWS::Compute::Volume if a matching volume exists" do
-      volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
       volume.wait_for { ready? }
       get = AWS[:compute].volumes.get(volume.id)
       volume.attributes.should == get.attributes

data/tests/aws/requests/storage/bucket_tests.rb

@@ -3,11 +3,12 @@ Shindo.tests('AWS::Storage | bucket requests', ['aws']) do
   tests('success') do
 
     @bucket_format = {
-      'IsTruncated' => Fog::Boolean,
-      'Marker'      => NilClass,
-      'MaxKeys'     => Integer,
-      'Name'        => String,
-      'Prefix'      => NilClass,
+      'CommonPrefixes'  => [],
+      'IsTruncated'     => Fog::Boolean,
+      'Marker'          => NilClass,
+      'MaxKeys'         => Integer,
+      'Name'            => String,
+      'Prefix'          => NilClass,
       'Contents'    => [{
         'ETag'          => String,
         'Key'           => String,

data/tests/helper.rb

@@ -24,6 +24,10 @@ require 'tests/helpers/storage/directories_tests'
 require 'tests/helpers/storage/file_tests'
 require 'tests/helpers/storage/files_tests'
 
+# Use so you can run in mock mode from the command line:
+#
+# FOG_MOCK=true fog
+
 if ENV["FOG_MOCK"] == "true"
   Fog.mock!
 end

data/tests/rackspace/requests/compute/resize_tests.rb

@@ -0,0 +1,47 @@
+Shindo.tests('Rackspace::Compute | resize request', ['rackspace']) do
+
+  tests('confirm') do
+
+    @server = Rackspace[:compute].servers.create(:flavor_id => 1, :image_id => 19)
+
+    @server.wait_for { ready? }
+
+    tests("#resize_server(#{@server.id}, 2)").succeeds do
+      Rackspace[:compute].resize_server(@server.id, 2)
+    end
+
+    @server.wait_for { status == 'VERIFY_RESIZE' }
+
+    tests("#confirm_resized_server(#{@server.id})").succeeds do
+      Rackspace[:compute].confirm_resized_server(@server.id)
+    end
+
+    @server.wait_for { ready? }
+
+    @server.destroy
+
+  end
+
+  tests('revert') do
+
+    @server = Rackspace[:compute].servers.create(:flavor_id => 1, :image_id => 19)
+
+    @server.wait_for { ready? }
+
+    tests("#resize_server(#{@server.id}, 2)").succeeds do
+      Rackspace[:compute].resize_server(@server.id, 2)
+    end
+
+    @server.wait_for { status == 'VERIFY_RESIZE' }
+
+    tests("#revert_resized_server(#{@server.id})").succeeds do
+      Rackspace[:compute].revert_resized_server(@server.id)
+    end
+
+    @server.wait_for { ready? }
+
+    @server.destroy
+
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 25
-  version: 0.3.25
+  - 26
+  version: 0.3.26
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -08:00
+date: 2010-12-01 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,8 +39,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 4
-        version: 0.2.4
+        - 8
+        version: 0.2.8
   requirement: *id002
   name: excon
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,7 @@ dependencies:
   type: :runtime
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
@@ -100,14 +100,13 @@ dependencies:
   type: :runtime
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 4
-        - 3
-        - 1
-        version: 1.4.3.1
+        - 4
+        version: 1.4.4
   requirement: *id007
   name: nokogiri
 - !ruby/object:Gem::Dependency 
@@ -571,6 +570,7 @@ files:
 - lib/fog/rackspace/requests/cdn/get_containers.rb
 - lib/fog/rackspace/requests/cdn/head_container.rb
 - lib/fog/rackspace/requests/cdn/put_container.rb
+- lib/fog/rackspace/requests/compute/confirm_resized_server.rb
 - lib/fog/rackspace/requests/compute/create_image.rb
 - lib/fog/rackspace/requests/compute/create_server.rb
 - lib/fog/rackspace/requests/compute/delete_image.rb
@@ -588,6 +588,9 @@ files:
 - lib/fog/rackspace/requests/compute/list_servers.rb
 - lib/fog/rackspace/requests/compute/list_servers_detail.rb
 - lib/fog/rackspace/requests/compute/reboot_server.rb
+- lib/fog/rackspace/requests/compute/resize_server.rb
+- lib/fog/rackspace/requests/compute/revert_resized_server.rb
+- lib/fog/rackspace/requests/compute/server_action.rb
 - lib/fog/rackspace/requests/compute/update_server.rb
 - lib/fog/rackspace/requests/storage/delete_container.rb
 - lib/fog/rackspace/requests/storage/delete_object.rb
@@ -910,6 +913,7 @@ files:
 - tests/rackspace/requests/compute/address_tests.rb
 - tests/rackspace/requests/compute/flavor_tests.rb
 - tests/rackspace/requests/compute/image_tests.rb
+- tests/rackspace/requests/compute/resize_tests.rb
 - tests/rackspace/requests/compute/server_tests.rb
 - tests/rackspace/requests/storage/container_tests.rb
 - tests/rackspace/requests/storage/object_tests.rb