fog 1.3.0 → 1.3.1

data/Rakefile

@@ -230,6 +230,7 @@ task :changelog do
         'Aaron Suggs',
         'Brian Hartsock',
         'Christopher Oliver',
+        'Decklin Foster',
         'Dylan Egan',
         'geemus',
         'Henry Addison',

data/changelog.txt

@@ -1,3 +1,35 @@
+1.3.1 03/27/2012 f0f692456956fe2e414ef8205d0268259901644a
+=========================================================
+
+Stats! { 'collaborators' => 32, 'downloads' => 527366, 'forks' => 392, 'open_issues' => 27, 'watchers' => 1901 }
+
+MVP! George Scott
+
+[aws|dns]
+  Preserves change_id.  Support for checking sync status via reload. thanks George Scott
+  Changed #insync? to #ready?. thanks George Scott
+
+[ibm]
+  avoid using constants (Rails loads files multiple times, issue #807). thanks Decklin Foster
+  Make usage of #state rather than #status consistent. thanks Decklin Foster
+
+[ibm|compute]
+  Add clone/destroy methods and tests to Image. thanks Decklin Foster
+  Add request test for list_vlans and fix mock. thanks Decklin Foster
+
+[ibm|storage]
+  Restore storage_area, platform_version, clone_status Volume attributes. thanks Decklin Foster
+
+[misc]
+  Allow custom headers in Storage#put_object_url. thanks Jacob Mattingley
+  Use https_url instead of deprecated url for put_object_url. thanks Jacob Mattingley
+  Adding Vlan class to IBM SmartCloud. thanks Joe Kinsella
+  bump excon dep to get jruby openssl fixes. thanks geemus
+
+[storage]
+  properly update content-type at save time for file models. thanks geemus
+
+
 1.3.0 03/21/2012 f78afe98242a60ae4dbbfcd8c5ab67ba71c6d773
 =========================================================
 

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.3.0'
-  s.date              = '2012-03-21'
+  s.version           = '1.3.1'
+  s.date              = '2012-03-27'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.12.0')
+  s.add_dependency('excon', '~>0.13.0')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('multi_json', '~>1.0')
   s.add_dependency('mime-types')

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 
 end

data/lib/fog/aws/models/dns/record.rb

@@ -17,6 +17,7 @@ module Fog
         attribute :status,        :aliases => ['Status']
         attribute :created_at,    :aliases => ['SubmittedAt']
         attribute :alias_target,  :aliases => ['AliasTarget']
+        attribute :change_id,     :aliases => ['Id']
 
         def initialize(attributes={})
           self.ttl ||= 3600
@@ -55,6 +56,24 @@ module Fog
           true
         end
 
+        # Returns true if record is insync.  May only be called for newly created or modified records that
+        # have a change_id and status set.
+        def ready?
+          requires :change_id, :status
+          status == 'INSYNC'
+        end
+
+        def reload
+          # If we have a change_id (newly created or modified), then reload performs a get_change to update status.
+          if change_id
+            data = connection.get_change(change_id).body
+            merge_attributes(data)
+            self
+          else
+            super
+          end
+        end
+
         private
 
         def zone=(new_zone)

data/lib/fog/aws/models/storage/file.rb

@@ -131,10 +131,11 @@ module Fog
             merge_attributes(data.body)
           else
             data = connection.put_object(directory.key, key, body, options)
-            merge_attributes(data.headers)
+            merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
           end
           self.etag.gsub!('"','')
           self.content_length = Fog::Storage.get_body_size(body)
+          self.content_type ||= Fog::Storage.get_content_type(body)
           true
         end
 

data/lib/fog/aws/requests/storage/put_object.rb

@@ -32,9 +32,9 @@ module Fog
         def put_object(bucket_name, object_name, data, options = {})
           data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)
-          request({            :body       => data[:body],
-                      :expects    => 200,
-
+          request({
+            :body       => data[:body],
+            :expects    => 200,
             :headers    => headers,
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,

data/lib/fog/aws/requests/storage/put_object_url.rb

@@ -17,15 +17,15 @@ module Fog
         # ==== See Also
         # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
-        def put_object_url(bucket_name, object_name, expires)
+        def put_object_url(bucket_name, object_name, expires, headers = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          url({
-            :headers  => {},
+          https_url({
+            :headers  => headers,
             :host     => @host,
             :method   => 'PUT',
             :path     => "#{bucket_name}/#{object_name}"
@@ -36,15 +36,15 @@ module Fog
 
       class Mock # :nodoc:all
 
-        def put_object_url(bucket_name, object_name, expires)
+        def put_object_url(bucket_name, object_name, expires, headers = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          url({
-            :headers  => {},
+          https_url({
+            :headers  => headers,
             :host     => @host,
             :method   => 'PUT',
             :path     => "#{bucket_name}/#{object_name}"

data/lib/fog/google/models/storage/file.rb

@@ -118,8 +118,9 @@ module Fog
           options.merge(metadata)
 
           data = connection.put_object(directory.key, key, body, options)
-          merge_attributes(data.headers)
+          merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
           self.content_length = Fog::Storage.get_body_size(body)
+          self.content_type ||= Fog::Storage.get_content_type(body)
           true
         end
 

data/lib/fog/google/requests/storage/put_object_url.rb

@@ -14,15 +14,15 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         #
-        def put_object_url(bucket_name, object_name, expires)
+        def put_object_url(bucket_name, object_name, expires, headers = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          url({
-            :headers  => {},
+          https_url({
+            :headers  => headers,
             :host     => @host,
             :method   => 'PUT',
             :path     => "#{bucket_name}/#{object_name}"
@@ -33,15 +33,15 @@ module Fog
 
       class Mock
 
-        def put_object_url(bucket_name, object_name, expires)
+        def put_object_url(bucket_name, object_name, expires, headers = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          url({
-            :headers  => {},
+          https_url({
+            :headers  => headers,
             :host     => @host,
             :method   => 'PUT',
             :path     => "#{bucket_name}/#{object_name}"

data/lib/fog/ibm.rb

@@ -10,17 +10,18 @@ module Fog
 
     # Provisioning is very slow. We'll pass this arg explicitly until there's a way
     # to set the default timeout on a per-provider basis.
-    TIMEOUT = 1800
 
-    class Connection < Fog::Connection
+    def self.timeout
+      1800
+    end
 
-      ENDPOINT = 'https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331'
+    class Connection < Fog::Connection
 
       def initialize(user, password)
         require 'multi_json'
         @user = user
         @password = password
-        @endpoint = URI.parse(ENDPOINT)
+        @endpoint = URI.parse('https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331')
         @base_path = @endpoint.path
         super("#{@endpoint.scheme}://#{@endpoint.host}:#{@endpoint.port}")
       end

data/lib/fog/ibm/compute.rb

@@ -20,6 +20,8 @@ module Fog
       collection :keys
       model :location
       collection :locations
+      model :vlan
+      collection :vlans
 
       request_path 'fog/ibm/requests/compute'
 

data/lib/fog/ibm/models/compute/image.rb

@@ -55,6 +55,15 @@ module Fog
           state == 'Available'
         end
 
+        def clone(name, description)
+          connection.clone_image(id, name, description).body['ImageID']
+        end
+
+        def destroy
+          requires :id
+          connection.delete_image(id).body['success']
+        end
+
       end
     end
   end

data/lib/fog/ibm/models/compute/server.rb

@@ -6,24 +6,24 @@ module Fog
 
       class Server < Fog::Compute::Server
 
-        STATES = [
-          "New",            # => 0
-          "Provisioning",   # => 1
-          "Failed",         # => 2
-          "Removed",        # => 3
-          "Rejected",       # => 4
-          "Active",         # => 5
-          "Unknown",        # => 6
-          "Deprovisioning", # => 7
-          "Restarting",     # => 8
-          "Starting",       # => 9
-          "Stopping",       # => 10
-          "Stopped",        # => 11
-          "Deprovisioning pending", # => 12
-          "Restart pending",# => 13
-          "Attaching",      # => 14
-          "Detaching"       # => 15
-        ]
+        STATES = {
+          0  => 'New',
+          1  => 'Provisioning',
+          2  => 'Failed',
+          3  => 'Removed',
+          4  => 'Rejected',
+          5  => 'Active',
+          6  => 'Unknown',
+          7  => 'Deprovisioning',
+          8  => 'Restarting',
+          9  => 'Starting',
+          10 => 'Stopping',
+          11 => 'Stopped',
+          12 => 'Deprovisioning pending',
+          13 => 'Restart pending',
+          14 => 'Attaching',
+          15 => 'Detaching'
+        }
 
         identity :id
 
@@ -73,7 +73,7 @@ module Fog
         end
 
         def state
-          STATES[attributes[:state].to_i]
+          STATES[attributes[:state]]
         end
 
         def ready?
@@ -104,7 +104,7 @@ module Fog
           requires :location_id
           new_ip = connection.addresses.new(:location => location_id)
           new_ip.save
-          new_ip.wait_for(Fog::IBM::TIMEOUT) { ready? } if wait_for_ready
+          new_ip.wait_for(Fog::IBM.timeout) { ready? } if wait_for_ready
           secondary_ip << new_ip
           new_ip
         end

data/lib/fog/ibm/models/compute/vlan.rb

@@ -0,0 +1,15 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class IBM
+      class Vlan < Fog::Model
+
+        identity :id
+        attribute :name
+        attribute :location
+
+      end
+    end
+  end
+end

data/lib/fog/ibm/models/compute/vlans.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/ibm/models/compute/vlan'
+
+module Fog
+  module Compute
+    class IBM
+
+      class Vlans < Fog::Collection
+
+        model Fog::Compute::IBM::Vlan
+
+        def all
+          load(connection.list_vlans.body['vlan'])
+        end
+
+        def get(vlan_id)
+          begin
+            vlan = connection.list_vlans.body
+            new(vlan['vlan'].find{|vlan| vlan['id'] == vlan_id.to_s })
+          rescue Fog::Compute::IBM::NotFound
+            nil
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/ibm/models/storage/volume.rb

@@ -5,23 +5,23 @@ module Fog
     class IBM
       class Volume < Fog::Model
 
-        STATUS = [
-          "New",              # => 0
-          "Creating",         # => 1
-          "Deleting",         # => 2
-          "Deleted",          # => 3
-          "Detached",         # => 4
-          "Attached",         # => 5
-          "Failed",           # => 6
-          "Deletion pending", # => 7
-          "Being cloned",     # => 8
-          "Cloning",          # => 9
-          "Attaching",        # => 10
-          "Detaching",        # => 11
-          "Copying",          # => 12
-          "Importing",        # => 13
-          "Transfer retrying" # => 14
-        ]
+        STATES = {
+          0  => 'New',
+          1  => 'Creating',
+          2  => 'Deleting',
+          3  => 'Deleted',
+          4  => 'Detached',
+          5  => 'Attached',
+          6  => 'Failed',
+          7  => 'Deletion pending',
+          8  => 'Being cloned',
+          9  => 'Cloning',
+          10 => 'Attaching',
+          11 => 'Detaching',
+          12 => 'Copying',
+          13 => 'Importing',
+          14 => 'Transfer retrying',
+        }
 
         identity :id
 
@@ -36,9 +36,12 @@ module Fog
         attribute :location_id,   :aliases => "location"
         attribute :product_codes, :aliases => "productCodes"
         attribute :format
+        attribute :storage_area,     :aliases => 'storageArea'
+        attribute :platform_version, :aliases => 'platformVersion'
+        attribute :clone_status,     :aliases => 'cloneStatus'
 
         def attached?
-          status == "Attached"
+          state == "Attached"
         end
 
         def attach(instance_id)
@@ -73,8 +76,8 @@ module Fog
 
         # Are we ready to be attached to an instance?
         def ready?
-          # TODO: Not sure if this is the only status we should be matching.
-          status == "Detached"
+          # TODO: Not sure if this is the only state we should be matching.
+          state == "Detached"
         end
 
         def save
@@ -85,8 +88,8 @@ module Fog
           true
         end
 
-        def status
-          STATUS[attributes[:state].to_i]
+        def state
+          STATES[attributes[:state]]
         end
 
       end

data/lib/fog/ibm/requests/compute/clone_image.rb

@@ -33,7 +33,7 @@ module Fog
           response = Excon::Response.new
           if image_exists? image_id
             id = Fog::IBM::Mock.instance_id
-            self.data[:images][id] = self.data[:images][image_id].dup
+            self.data[:images][id] = self.data[:images][image_id].merge('id' => id, 'name' => name, 'description' => description)
             response.status = 200
             response.body   = { "ImageID" => id }
           else

data/lib/fog/ibm/requests/compute/list_vlans.rb

@@ -34,15 +34,10 @@ module Fog
         def list_vlans
           response = Excon::Response.new
           response.status = 200
-          response.body = {"addresses"=>
+          response.body = {"vlan"=>
               [{"location"=>"101",
-                "mode"=>0,
-                "offeringId"=>"20001223",
                 "id"=>"75321",
-                "type"=>1,
-                "ip"=>"170.224.192.210 ",
-                "hostname"=>"170.224.192.210 ",
-                "state"=>2}]},
+                "name"=>"FOG-VLAN1"}]}
           response
         end
 

data/lib/fog/rackspace/models/storage/file.rb

@@ -64,8 +64,9 @@ module Fog
           requires :body, :directory, :key
           options['Content-Type'] = content_type if content_type
           data = connection.put_object(directory.key, key, body, options)
-          merge_attributes(data.headers)
+          merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
           self.content_length = Fog::Storage.get_body_size(body)
+          self.content_type ||= Fog::Storage.get_content_type(body)
           true
         end
 

data/lib/fog/storage.rb

@@ -57,23 +57,24 @@ module Fog
       end
     end
 
-    def self.parse_data(data)
-      metadata = {
-        :body => nil,
-        :headers => {}
-      }
-
-      metadata[:body] = data
-      metadata[:headers]['Content-Length'] = get_body_size(data)
-
+    def self.get_content_type(data)
       if data.respond_to?(:path) and !data.path.nil?
         filename = ::File.basename(data.path)
         unless (mime_types = MIME::Types.of(filename)).empty?
-          metadata[:headers]['Content-Type'] = mime_types.first.content_type
+          mime_types.first.content_type
         end
       end
-      # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
-      metadata
+    end
+
+    def self.parse_data(data)
+      {
+        :body     => data,
+        :headers  => {
+          'Content-Length'  => get_body_size(data),
+          'Content-Type'    => get_content_type(data)
+          #'Content-MD5' => Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
+        }
+      }
     end
 
     def self.providers

data/tests/aws/models/dns/record_tests.rb

@@ -8,11 +8,23 @@ Shindo.tests("Fog::Dns[:aws] | record", ['aws', 'dns']) do
   params = { :name => @zone.domain, :type => 'A', :ttl => 3600, :value => ['1.2.3.4'] }
 
   model_tests(@zone.records, params, false) do
+
+    # Newly created records should have a change id
+    tests("#change_id") do
+      returns(true) { @instance.change_id != nil }
+    end
+
+    # Waits for changes to sync to all Route 53 DNS servers.  Usually takes ~30 seconds to complete.
+    tests("#ready? - may take a minute to complete...").succeeds do
+      @instance.wait_for { ready? }
+    end
+
     tests("#modify") do
       new_value = ['5.5.5.5']
       returns(true) { @instance.modify(:value => new_value) }
       returns(new_value) { @instance.value }
     end
+
   end
 
   tests("zones#destroy").succeeds do

data/tests/ibm/models/compute/image_tests.rb

@@ -1,10 +1,25 @@
 Shindo.tests('Fog::Compute[:ibm] | image', ['ibm']) do
 
   @image_id = '20010001'
-  @image    = Fog::Compute[:ibm].images.get(@image_id)
+  @clone_name = 'fog-test-clone-image-' + Time.now.to_i.to_s(32)
 
   tests('success') do
 
+    tests("Fog::Compute[:ibm].images.get('#{@image_id}')") do
+      @image = Fog::Compute[:ibm].images.get(@image_id)
+      returns(@image_id) { @image.id }
+    end
+
+    tests("Fog::Compute::Image#clone") do
+      clone_id = @image.clone(@clone_name, @clone_name)
+      @clone = Fog::Compute[:ibm].images.get(clone_id)
+      returns(@clone_name) { @clone.name }
+    end
+
+    tests("Fog::Compute::Image#destroy") do
+      returns(true) { @clone.destroy }
+    end
+
   end
 
 end

data/tests/ibm/models/compute/server_tests.rb

@@ -32,7 +32,7 @@ Shindo.tests('Fog::Compute[:ibm] | server', ['ibm']) do
 
     tests('Fog::Compute::IBM::Server#wait_for { ready? }') do
       @server = Fog::Compute[:ibm].servers.get(@instance_id)
-      @server.wait_for(Fog::IBM::TIMEOUT) { ready? }
+      @server.wait_for(Fog::IBM.timeout) { ready? }
     end
 
     tests('Fog::Compute::IBM::Server#id') do
@@ -43,7 +43,7 @@ Shindo.tests('Fog::Compute[:ibm] | server', ['ibm']) do
       returns(true) { @server.ready? }
     end
 
-    tests('Fog::Compute::IBM::Server#status') do
+    tests('Fog::Compute::IBM::Server#state') do
       returns("Active") { @server.state }
     end
 
@@ -66,7 +66,7 @@ Shindo.tests('Fog::Compute[:ibm] | server', ['ibm']) do
       body = @server.to_image(:name => @server.name)
       returns(@server.name) { body['name'] }
       image = Fog::Compute[:ibm].images.get(body['id'])
-      image.wait_for(Fog::IBM::TIMEOUT) { ready? || state == 'New' }
+      image.wait_for(Fog::IBM.timeout) { ready? || state == 'New' }
       unless image.state == 'Capturing'
         returns(true) { Fog::Compute[:ibm].delete_image(image.id).body['success'] }
       end
@@ -80,7 +80,7 @@ Shindo.tests('Fog::Compute[:ibm] | server', ['ibm']) do
       returns(true) { @server.destroy }
     end
 
-    @key.wait_for(Fog::IBM::TIMEOUT) { instance_ids.empty? }
+    @key.wait_for(Fog::IBM.timeout) { instance_ids.empty? }
     @key.destroy
 
   end

data/tests/ibm/models/compute/servers_tests.rb

@@ -21,12 +21,12 @@ Shindo.tests('Fog::Compute[:ibm] | servers', ['ibm']) do
       returns(@instance_id) { @server.id }
     end
 
-    if @server.wait_for(Fog::IBM::TIMEOUT) { ready? }
+    if @server.wait_for(Fog::IBM.timeout) { ready? }
       @server.destroy
     else
       pending
     end
-    if @key.wait_for(Fog::IBM::TIMEOUT) { instance_ids.empty? }
+    if @key.wait_for(Fog::IBM.timeout) { instance_ids.empty? }
       @key.destroy
     else
       pending

data/tests/ibm/models/storage/volume_tests.rb

@@ -24,7 +24,7 @@ Shindo.tests('Fog::Storage[:ibm] | volume', ['ibm']) do
     tests('Fog::Storage::IBM::Volume#save') do
       returns(true)   { @volume.save }
       returns(String) { @volume.id.class }
-      @volume.wait_for(Fog::IBM::TIMEOUT) { ready? }
+      @volume.wait_for(Fog::IBM.timeout) { ready? }
       @volume_id = @volume.id
     end
 
@@ -47,8 +47,8 @@ Shindo.tests('Fog::Storage[:ibm] | volume', ['ibm']) do
       returns(true) { @volume.ready? }
     end
 
-    tests('Fog::Storage::IBM::Volume#status') do
-      returns("Detached") { @volume.status }
+    tests('Fog::Storage::IBM::Volume#state') do
+      returns("Detached") { @volume.state }
     end
 
     tests('Fog::Storage::IBM::Volume#destroy') do

data/tests/ibm/requests/compute/address_tests.rb

@@ -35,7 +35,7 @@ Shindo.tests('Fog::Compute[:ibm] | address requests', ['ibm']) do
     end
 
     tests("#delete_address('#{@address_id}')") do
-      Fog::Compute[:ibm].addresses.get(@address_id).wait_for(Fog::IBM::TIMEOUT) { ready? }
+      Fog::Compute[:ibm].addresses.get(@address_id).wait_for(Fog::IBM.timeout) { ready? }
       returns(true) { Fog::Compute[:ibm].delete_address(@address_id).body['success'] }
     end
 

data/tests/ibm/requests/compute/image_tests.rb

@@ -80,7 +80,7 @@ Shindo.tests('Fog::Compute[:ibm] | image requests', ['ibm']) do
         :key_name => @key_name
       ).body
       @instance_id  = response['instances'][0]['id']
-      Fog::Compute[:ibm].servers.get(@instance_id).wait_for(Fog::IBM::TIMEOUT) { ready? }
+      Fog::Compute[:ibm].servers.get(@instance_id).wait_for(Fog::IBM.timeout) { ready? }
       data          = Fog::Compute[:ibm].create_image(@instance_id, @image_name, "").body
       @id           = data['id']
       data
@@ -100,9 +100,9 @@ Shindo.tests('Fog::Compute[:ibm] | image requests', ['ibm']) do
     end
 
     @server = Fog::Compute[:ibm].servers.get(@instance_id)
-    @server.wait_for(Fog::IBM::TIMEOUT) { ready? }
+    @server.wait_for(Fog::IBM.timeout) { ready? }
     @server.destroy
-    @key.wait_for(Fog::IBM::TIMEOUT) { instance_ids.empty? }
+    @key.wait_for(Fog::IBM.timeout) { instance_ids.empty? }
     @key.destroy
 
   end

data/tests/ibm/requests/compute/instance_tests.rb

@@ -53,7 +53,7 @@ Shindo.tests('Fog::Compute[:ibm] | instance requests', ['ibm']) do
       response = Fog::Compute[:ibm].get_instance(@instance_id).body
     end
 
-    Fog::Compute[:ibm].servers.get(@instance_id).wait_for(Fog::IBM::TIMEOUT) { ready? }
+    Fog::Compute[:ibm].servers.get(@instance_id).wait_for(Fog::IBM.timeout) { ready? }
 
     tests("#list_instances").formats(@instances_format) do
       instances = Fog::Compute[:ibm].list_instances.body
@@ -74,14 +74,14 @@ Shindo.tests('Fog::Compute[:ibm] | instance requests', ['ibm']) do
     end
 
     tests("#delete_instance('#{@instance_id}')") do
-      if Fog::Compute[:ibm].servers.get(@instance_id).wait_for(Fog::IBM::TIMEOUT) { ready? }
+      if Fog::Compute[:ibm].servers.get(@instance_id).wait_for(Fog::IBM.timeout) { ready? }
         data = Fog::Compute[:ibm].delete_instance(@instance_id)
       else
         pending
       end
     end
 
-    if @key.wait_for(Fog::IBM::TIMEOUT) { instance_ids.empty? }
+    if @key.wait_for(Fog::IBM.timeout) { instance_ids.empty? }
       @key.destroy
     else
       pending

data/tests/ibm/requests/compute/vlan_tests.rb

@@ -0,0 +1,21 @@
+Shindo.tests('Fog::Compute[:ibm] | location requests', ['ibm']) do
+
+  @vlan_format  = {
+    'id'       => String,
+    'name'     => String,
+    'location' => String,
+  }
+
+  @vlans_format = {
+    'vlan' => [ @vlan_format ]
+  }
+
+  tests('success') do
+
+    tests("#list_vlans").formats(@vlans_format) do
+      Fog::Compute[:ibm].list_vlans.body
+    end
+
+  end
+
+end

data/tests/ibm/requests/storage/volume_tests.rb

@@ -82,7 +82,7 @@ Shindo.tests('Fog::Storage[:ibm] | volume requests', ['ibm']) do
       Fog::Compute[:ibm].delete_instance(@instance_id)
     end
 
-    Fog::Storage[:ibm].volumes.get(@volume_id).wait_for(Fog::IBM::TIMEOUT) { ready? }
+    Fog::Storage[:ibm].volumes.get(@volume_id).wait_for(Fog::IBM.timeout) { ready? }
 
     tests("#delete_volume('#{@volume_id}')") do
       returns(true) { Fog::Storage[:ibm].delete_volume(@volume_id).body['success'] }
@@ -90,9 +90,9 @@ Shindo.tests('Fog::Storage[:ibm] | volume requests', ['ibm']) do
 
     # See above
     # @server = Fog::Compute[:ibm].servers.get(@instance_id)
-    # @server.wait_for(Fog::IBM::TIMEOUT) { ready? }
+    # @server.wait_for(Fog::IBM.timeout) { ready? }
     # @server.destroy
-    # @key.wait_for(Fog::IBM::TIMEOUT) { instance_ids.empty? }
+    # @key.wait_for(Fog::IBM.timeout) { instance_ids.empty? }
     # @key.destroy
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000Z
+date: 2012-03-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70269642732020 !ruby/object:Gem::Requirement
+  requirement: &70243822052300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70269642732020
+  version_requirements: *70243822052300
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70269642730220 !ruby/object:Gem::Requirement
+  requirement: &70243822051380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70269642730220
+  version_requirements: *70243822051380
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &70269642625560 !ruby/object:Gem::Requirement
+  requirement: &70243822050700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70269642625560
+  version_requirements: *70243822050700
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70269642623060 !ruby/object:Gem::Requirement
+  requirement: &70243822049900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70269642623060
+  version_requirements: *70243822049900
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70269642621220 !ruby/object:Gem::Requirement
+  requirement: &70243822049140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70269642621220
+  version_requirements: *70243822049140
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70269642619920 !ruby/object:Gem::Requirement
+  requirement: &70243822047940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70269642619920
+  version_requirements: *70243822047940
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70269642617060 !ruby/object:Gem::Requirement
+  requirement: &70243822046380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70269642617060
+  version_requirements: *70243822046380
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70269642616460 !ruby/object:Gem::Requirement
+  requirement: &70243822044460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70269642616460
+  version_requirements: *70243822044460
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70269642615820 !ruby/object:Gem::Requirement
+  requirement: &70243822043860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70269642615820
+  version_requirements: *70243822043860
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70269642615080 !ruby/object:Gem::Requirement
+  requirement: &70243822042580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269642615080
+  version_requirements: *70243822042580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70269642614300 !ruby/object:Gem::Requirement
+  requirement: &70243822040880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269642614300
+  version_requirements: *70243822040880
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &70269642608640 !ruby/object:Gem::Requirement
+  requirement: &70243822039140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269642608640
+  version_requirements: *70243822039140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70269642607440 !ruby/object:Gem::Requirement
+  requirement: &70243822038080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269642607440
+  version_requirements: *70243822038080
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70269642606600 !ruby/object:Gem::Requirement
+  requirement: &70243822034360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269642606600
+  version_requirements: *70243822034360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70269642605120 !ruby/object:Gem::Requirement
+  requirement: &70243822033720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70269642605120
+  version_requirements: *70243822033720
 - !ruby/object:Gem::Dependency
   name: rbovirt
-  requirement: &70269642603900 !ruby/object:Gem::Requirement
+  requirement: &70243822032760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 0.0.9
   type: :development
   prerelease: false
-  version_requirements: *70269642603900
+  version_requirements: *70243822032760
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70269642602560 !ruby/object:Gem::Requirement
+  requirement: &70243822031720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70269642602560
+  version_requirements: *70243822031720
 - !ruby/object:Gem::Dependency
   name: virtualbox
-  requirement: &70269642600780 !ruby/object:Gem::Requirement
+  requirement: &70243822030620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70269642600780
+  version_requirements: *70243822030620
 - !ruby/object:Gem::Dependency
   name: fission
-  requirement: &70269642580840 !ruby/object:Gem::Requirement
+  requirement: &70243822026740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269642580840
+  version_requirements: *70243822026740
 description: The Ruby cloud services library. Supports all major cloud providers including
   AWS, Rackspace, Linode, Blue Box, StormOnDemand, and many others. Full support for
   most AWS services including EC2, S3, CloudWatch, SimpleDB, ELB, and RDS.
@@ -1498,6 +1498,8 @@ files:
 - lib/fog/ibm/models/compute/locations.rb
 - lib/fog/ibm/models/compute/server.rb
 - lib/fog/ibm/models/compute/servers.rb
+- lib/fog/ibm/models/compute/vlan.rb
+- lib/fog/ibm/models/compute/vlans.rb
 - lib/fog/ibm/models/storage/offering.rb
 - lib/fog/ibm/models/storage/offerings.rb
 - lib/fog/ibm/models/storage/volume.rb
@@ -2439,6 +2441,7 @@ files:
 - tests/ibm/requests/compute/instance_tests.rb
 - tests/ibm/requests/compute/key_tests.rb
 - tests/ibm/requests/compute/location_tests.rb
+- tests/ibm/requests/compute/vlan_tests.rb
 - tests/ibm/requests/storage/volume_tests.rb
 - tests/joyent/requests/compute/datasets_tests.rb
 - tests/joyent/requests/compute/keys_tests.rb
@@ -2595,7 +2598,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3710907370766994265
+      hash: 3422083743033756770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -2865,6 +2868,7 @@ test_files:
 - tests/ibm/requests/compute/instance_tests.rb
 - tests/ibm/requests/compute/key_tests.rb
 - tests/ibm/requests/compute/location_tests.rb
+- tests/ibm/requests/compute/vlan_tests.rb
 - tests/ibm/requests/storage/volume_tests.rb
 - tests/joyent/requests/compute/datasets_tests.rb
 - tests/joyent/requests/compute/keys_tests.rb