fog 0.2.18 → 0.2.19

data/fog.gemspec

@@ -7,8 +7,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           = '0.2.18'
-  s.date              = '2010-07-24'
+  s.version           = '0.2.19'
+  s.date              = '2010-07-25'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -104,6 +104,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/ec2/create_key_pair.rb
     lib/fog/aws/parsers/ec2/create_snapshot.rb
     lib/fog/aws/parsers/ec2/create_volume.rb
+    lib/fog/aws/parsers/ec2/deregister_image.rb
     lib/fog/aws/parsers/ec2/describe_addresses.rb
     lib/fog/aws/parsers/ec2/describe_availability_zones.rb
     lib/fog/aws/parsers/ec2/describe_images.rb
@@ -154,6 +155,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/ec2/delete_security_group.rb
     lib/fog/aws/requests/ec2/delete_snapshot.rb
     lib/fog/aws/requests/ec2/delete_volume.rb
+    lib/fog/aws/requests/ec2/deregister_image.rb
     lib/fog/aws/requests/ec2/describe_addresses.rb
     lib/fog/aws/requests/ec2/describe_availability_zones.rb
     lib/fog/aws/requests/ec2/describe_images.rb
@@ -240,6 +242,13 @@ Gem::Specification.new do |s|
     lib/fog/credentials.rb
     lib/fog/deprecation.rb
     lib/fog/errors.rb
+    lib/fog/go_grid.rb
+    lib/fog/go_grid/bin.rb
+    lib/fog/go_grid/requests/common_lookup_list.rb
+    lib/fog/go_grid/requests/grid_image_list.rb
+    lib/fog/go_grid/requests/grid_ip_list.rb
+    lib/fog/go_grid/requests/grid_loadbalancer_list.rb
+    lib/fog/go_grid/requests/grid_server_list.rb
     lib/fog/hmac.rb
     lib/fog/linode.rb
     lib/fog/linode/bin.rb

data/lib/fog.rb

@@ -29,6 +29,7 @@ require 'fog/ssh'
 
 require 'fog/aws'
 require 'fog/bluebox'
+require 'fog/go_grid'
 require 'fog/linode'
 require 'fog/local'
 require 'fog/new_servers'
@@ -40,7 +41,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.18'
+    VERSION = '0.2.19'
   end
 
   module Mock

data/lib/fog/aws.rb

@@ -67,16 +67,19 @@ module Fog
           path << letters(rand(9) + 8)
         end
         {
-          "imageOwnerId"  => letters(rand(5) + 4),
-          "productCodes"  => [],
-          "kernelId"      => kernel_id,
-          "ramdiskId"     => ramdisk_id,
-          "imageState"    => "available",
-          "imageId"       => image_id,
-          "architecture"  => "i386",
-          "isPublic"      => true,
-          "imageLocation" => path.join('/'),
-          "imageType"     => "machine"
+          "imageOwnerId"   => letters(rand(5) + 4),
+          "blockDeviceMapping" => [],
+          "productCodes"   => [],
+          "kernelId"       => kernel_id,
+          "ramdiskId"      => ramdisk_id,
+          "imageState"     => "available",
+          "imageId"        => image_id,
+          "architecture"   => "i386",
+          "isPublic"       => true,
+          "imageLocation"  => path.join('/'),
+          "imageType"      => "machine",
+          "rootDeviceType" => ["ebs","instance-store"][rand(2)],
+          "rootDeviceName" => "/dev/sda1"
         }
       end
 

data/lib/fog/aws/ec2.rb

@@ -39,6 +39,7 @@ module Fog
       request 'delete_security_group'
       request 'delete_snapshot'
       request 'delete_volume'
+      request 'deregister_image'
       request 'describe_addresses'
       request 'describe_availability_zones'
       request 'describe_images'

data/lib/fog/aws/models/ec2/image.rb

@@ -6,21 +6,39 @@ module Fog
 
       class Image < Fog::Model
 
-        identity :id,             'imageId'
+        identity :id,                    'imageId'
 
         attribute :architecture
-        attribute :location,      'imageLocation'
-        attribute :owner_id,      'imageOwnerId'
-        attribute :state,         'imageState'
-        attribute :type,          'imageType'
-        attribute :is_public,     'isPublic'
-        attribute :kernel_id,     'kernelId'
+        attribute :block_device_mapping, 'blockDeviceMapping'
+        attribute :location,             'imageLocation'
+        attribute :owner_id,             'imageOwnerId'
+        attribute :state,                'imageState'
+        attribute :type,                 'imageType'
+        attribute :is_public,            'isPublic'
+        attribute :kernel_id,            'kernelId'
         attribute :platform
-        attribute :product_codes, 'productCodes'
-        attribute :ramdisk_id,    'ramdiskId'
+        attribute :product_codes,        'productCodes'
+        attribute :ramdisk_id,           'ramdiskId'
+        attribute :root_device_type,     'rootDeviceType'
+        attribute :root_device_name,     'rootDeviceName'
+
+        def deregister(delete_snapshot = false)
+          connection.deregister_image(@id)
+
+          if(delete_snapshot && @root_device_type=="ebs")
+            @block_device_mapping.each do |block_device|
+              next if block_device["deviceName"] != @root_device_name
+              snapshot_id = block_device["snapshotId"]
+              snapshot = @connection.snapshots.get(snapshot_id)
+              return snapshot.destroy
+            end
+          end
+
+          return true
+        end
 
       end
 
     end
   end
-end
+end

data/lib/fog/aws/parsers/ec2/deregister_image.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Parsers
+    module AWS
+      module EC2
+
+        class DeregisterImage < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'return', 'requestId', 'imageId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/ec2/describe_images.rb

@@ -6,7 +6,7 @@ module Fog
         class DescribeImages < Fog::Parsers::Base
 
           def reset
-            @image = { 'productCodes' => [] }
+            @image = { 'productCodes' => [], 'blockDeviceMapping' => nil }
             @response = { 'imagesSet' => [] }
           end
 
@@ -14,12 +14,17 @@ module Fog
             super
             if name == 'productCodes'
               @in_product_codes = true
+            elsif name == 'blockDeviceMapping'
+              @in_block_device_mapping = true
+              @image['blockDeviceMapping'] = []
+             elsif name == 'item' && @in_block_device_mapping
+              @image['blockDeviceMapping'] << {}
             end
           end
           
           def end_element(name)
             case name
-            when 'architecture',  'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'platform', 'ramdiskId'
+            when 'architecture',  'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName'
               @image[name] = @value
             when 'isPublic'
               if @value == 'true'
@@ -28,7 +33,8 @@ module Fog
                 @image[name] = false
               end
             when 'item'
-              unless @in_product_codes
+              if @in_block_device_mapping
+              elsif !@in_product_codes
                 @response['imagesSet'] << @image
                 @image = { 'productCodes' => [] }
               end
@@ -36,8 +42,13 @@ module Fog
               @image['productCodes'] << @value
             when 'productCodes'
               @in_product_codes = false
+            when 'blockDeviceMapping'
+              @in_block_device_mapping = false
             when 'requestId'
               @response[name] = @value
+            when 'deviceName','virtualName','snapshotId','volumeSize','deleteOnTermination'
+              l = @image['blockDeviceMapping'].length
+              @image['blockDeviceMapping'][l-1].store(name,@value)
             end
           end
 

data/lib/fog/aws/requests/ec2/deregister_image.rb

@@ -0,0 +1,51 @@
+module Fog
+  module AWS
+    module EC2
+      class Real
+
+        require 'fog/aws/parsers/ec2/deregister_image'
+
+        # deregister an image
+        #
+        # ==== Parameters
+        # * image_id<~String> - Id of image to deregister 
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'return'<~Boolean> - Returns true if deregistration succeeded
+        #     * 'requestId'<~String> - Id of request
+        def deregister_image(image_id)
+          request(
+            'Action'      => 'DeregisterImage',
+            'ImageId'     => image_id,
+            :parser       => Fog::Parsers::AWS::EC2::DeregisterImage.new
+          )
+        end
+
+      end
+
+      class Mock
+
+        def deregister_image(image_id)
+          response = Excon::Response.new
+          if image_id 
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return' => "true"
+            }
+            response
+          else
+            message = 'MissingParameter => '
+            if !instance_id
+              message << 'The request must contain the parameter image_id'
+            end
+            raise Fog::AWS::EC2::Error.new(message)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/describe_images.rb

@@ -20,6 +20,7 @@ module Fog
         #     * 'requestId'<~String> - Id of request
         #     * 'imagesSet'<~Array>:
         #       * 'architecture'<~String> - Architecture of the image
+        #       * 'blockDeviceMapping'<~Array> - An array of mapped block devices
         #       * 'imageId'<~String> - Id of the image
         #       * 'imageLocation'<~String> - Location of the image
         #       * 'imageOwnerId'<~String> - Id of the owner of the image
@@ -30,6 +31,8 @@ module Fog
         #       * 'platform'<~String> - Operating platform of the image
         #       * 'productCodes'<~Array> - Product codes for the image
         #       * 'ramdiskId'<~String> - Ramdisk id associated with image, if any
+        #       * 'rootDeviceName'<~String> - Root device name, e.g. /dev/sda1
+        #       * 'rootDeviceType'<~String> - Root device type, ebs or instance-store
         def describe_images(options = {})
           if image_id = options.delete('ImageId')
             options.merge!(AWS.indexed_param('ImageId', image_id))

data/lib/fog/bin.rb

@@ -1,6 +1,7 @@
 require 'fog/credentials'
 
 require 'fog/aws/bin'
+require 'fog/go_grid/bin'
 require 'fog/linode/bin'
 require 'fog/local/bin'
 require 'fog/new_servers/bin'
@@ -15,7 +16,7 @@ module Fog
 
     def services
       services = []
-      [::AWS, ::Linode, ::Local, ::NewServers, ::Rackspace, ::Slicehost, ::Terremark, ::Vcloud, ::Bluebox].each do |service|
+      [::AWS, ::GoGrid, ::Linode, ::Local, ::NewServers, ::Rackspace, ::Slicehost, ::Terremark, ::Vcloud, ::Bluebox].each do |service|
         if service.initialized?
           services << service
         end

data/lib/fog/go_grid.rb

@@ -0,0 +1,88 @@
+module Fog
+  module GoGrid
+    extend Fog::Service
+
+    requires :go_grid_api_key
+    requires :go_grid_shared_secret
+
+    model_path 'fog/go_grid/models'
+
+    request_path 'fog/go_grid/requests'
+    request 'common_lookup_list'
+    request 'grid_image_list'
+    request 'grid_ip_list'
+    request 'grid_loadbalancer_list'
+    request 'grid_server_list'
+
+    class Mock
+      include Collections
+
+      def self.data
+        @data ||= Hash.new do |hash, key|
+          hash[key] = {}
+        end
+      end
+
+      def self.reset_data(keys=data.keys)
+        for key in [*keys]
+          data.delete(key)
+        end
+      end
+
+      def initialize(options={})
+        @go_grid_api_key = options[:go_grid_api_key]
+        @go_grid_shared_secret = options[:go_grid_shared_secret]
+        @data = self.class.data[@go_grid_api_key]
+      end
+
+    end
+
+    class Real
+      include Collections
+
+      def initialize(options={})
+        @go_grid_api_key = options[:go_grid_api_key]
+        @go_grid_shared_secret = options[:go_grid_shared_secret]
+        @host   = options[:host]    || "api.gogrid.com"
+        @path   = options[:path]    || "/api"
+        @port   = options[:port]    || 443
+        @scheme = options[:scheme]  || 'https'
+        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+      end
+
+      def reload
+        @connection.reset
+      end
+
+      def request(params)
+        params[:query] ||= {}
+        params[:query].merge!({
+          'api_key' => @go_grid_api_key,
+          'format'  => 'json',
+          'sig'     => Digest::MD5.hexdigest("#{@go_grid_api_key}#{@go_grid_shared_secret}#{Time.now.to_i}"),
+          'v'       => '1.4'
+        })
+
+        begin
+          response = @connection.request(
+            params.merge!(:path => "#{@path}/#{params[:path]}")
+          )
+        rescue Excon::Errors::Error => error
+          raise case error
+          when Excon::Errors::NotFound
+            Fog::Go_Grid::NotFound.slurp(error)
+          else
+            error
+          end
+        end
+
+        unless response.body.empty?
+          response.body = JSON.parse(response.body)
+        end
+
+        response
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/bin.rb

@@ -0,0 +1,30 @@
+module GoGrid
+  class << self
+    if Fog.credentials[:go_grid_api_key] && Fog.credentials[:go_grid_shared_secret]
+
+      def initialized?
+        true
+      end
+
+      def [](service)
+        @@connections ||= Hash.new do |hash, key|
+          credentials = Fog.credentials.reject do |k,v|
+            ![:go_grid_api_key, :go_grid_shared_secret].include?(k)
+          end
+          hash[key] = case key
+          when :go_grid
+            Fog::GoGrid.new(credentials)
+          end
+        end
+        @@connections[service]
+      end
+
+    else
+
+      def initialized?
+        false
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/common_lookup_list.rb

@@ -0,0 +1,36 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # List options and lookups
+      #
+      # ==== Parameters
+      # * 'lookup'<~String> - the lookup to be listed
+      # * options<~Hash>:
+      #   * 'sort'<~String> - column to sort result by in ['description', 'id', 'name']
+      #   * 'asc'<~String>  - order to sort in ['true','false']
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def common_lookup_list(lookup, options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :path     => 'common/lookup/list',
+          :query    => {'lookup' => lookup}.merge!(options)
+        )
+      end
+
+    end
+
+    class Mock
+
+      def common_lookup_list(lookup, options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/grid_image_list.rb

@@ -0,0 +1,39 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # List images
+      #
+      # ==== Parameters
+      # * options<~Hash>:
+      #   * 'datacenter'<~String> - datacenter to limit results to
+      #   * 'isPublic'<~String>   - If true only returns public images, in ['false', 'true']
+      #   * 'num_items'<~Integer> - Number of items to return
+      #   * 'page'<~Integer>      - Page index for paginated results
+      #   * 'state'<~String>      - state to limit results to, in ['Saving', 'Available']
+      #   * 'type'<~String>       - image type to limit results to
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def grid_image_list(options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :path     => 'grid/image/list',
+          :query    => options
+        )
+      end
+
+    end
+
+    class Mock
+
+      def grid_image_list(options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/grid_ip_list.rb

@@ -0,0 +1,38 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # List ips
+      #
+      # ==== Parameters
+      # * options<~Hash>:
+      #   * 'datacenter'<~String> - datacenter to limit results to
+      #   * 'ip.state'<~String>      - state to limit results to in ip.state
+      #   * 'ip.type'<~String>       - type to limit results to in ip.type
+      #   * 'num_items'<~Integer> - Number of items to return
+      #   * 'page'<~Integer>      - Page index for paginated results
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def grid_ip_list(options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :path     => 'grid/ip/list',
+          :query    => options
+        )
+      end
+
+    end
+
+    class Mock
+
+      def grid_ip_list(options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/grid_loadbalancer_list.rb

@@ -0,0 +1,36 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # List load balancers
+      #
+      # ==== Parameters
+      # * options<~Hash>:
+      #   * 'datacenter'<~String> - datacenter to limit results to
+      #   * 'num_items'<~Integer> - Number of items to return
+      #   * 'page'<~Integer> - Page index for paginated results
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def grid_loadbalancer_list(options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :path     => 'grid/loadbalancer/list',
+          :query    => options
+        )
+      end
+
+    end
+
+    class Mock
+
+      def grid_loadbalancer_list(options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/grid_server_list.rb

@@ -0,0 +1,38 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # List servers
+      #
+      # ==== Parameters
+      # * options<~Hash>:
+      #   * 'datacenter'<~String> - datacenter to limit results to
+      #   * 'isSandbox'<~String> - If true only  returns Image Sandbox servers, in ['false', 'true']
+      #   * 'num_items'<~Integer> - Number of items to return
+      #   * 'page'<~Integer> - Page index for paginated results
+      #   * 'server.type'<~String> - server type to limit results to
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def grid_server_list(options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :path     => 'grid/server/list',
+          :query    => options
+        )
+      end
+
+    end
+
+    class Mock
+
+      def grid_server_list(options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

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

@@ -17,6 +17,9 @@ describe 'EC2.describe_images' do
       image['kernelId'].should be_a(String) if image['kernelId']
       image['platform'].should be_a(String) if image['platform']
       image['ramdiskId'].should be_a(String) if image['ramdiskId']
+      image['rootDeviceName'].should be_a(String) if image['rootDeviceName']
+      ["ebs","instance-store"].should include(image['rootDeviceType'])
+      image['rootDeviceName'].should be_a(String) if image['rootDeviceName']
     end
   
     it "should return proper attributes with params" do
@@ -33,6 +36,8 @@ describe 'EC2.describe_images' do
       image['kernelId'].should be_a(String) if image['kernelId']
       image['platform'].should be_a(String) if image['platform']
       image['ramdiskId'].should be_a(String) if image['ramdiskId']
+      ["ebs","instance-store"].should include(image['rootDeviceType'])
+      image['rootDeviceName'].should be_a(String) if image['rootDeviceName']
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 18
-  version: 0.2.18
+  - 19
+  version: 0.2.19
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 -07:00
+date: 2010-07-25 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - lib/fog/aws/parsers/ec2/create_key_pair.rb
 - lib/fog/aws/parsers/ec2/create_snapshot.rb
 - lib/fog/aws/parsers/ec2/create_volume.rb
+- lib/fog/aws/parsers/ec2/deregister_image.rb
 - lib/fog/aws/parsers/ec2/describe_addresses.rb
 - lib/fog/aws/parsers/ec2/describe_availability_zones.rb
 - lib/fog/aws/parsers/ec2/describe_images.rb
@@ -243,6 +244,7 @@ files:
 - lib/fog/aws/requests/ec2/delete_security_group.rb
 - lib/fog/aws/requests/ec2/delete_snapshot.rb
 - lib/fog/aws/requests/ec2/delete_volume.rb
+- lib/fog/aws/requests/ec2/deregister_image.rb
 - lib/fog/aws/requests/ec2/describe_addresses.rb
 - lib/fog/aws/requests/ec2/describe_availability_zones.rb
 - lib/fog/aws/requests/ec2/describe_images.rb
@@ -329,6 +331,13 @@ files:
 - lib/fog/credentials.rb
 - lib/fog/deprecation.rb
 - lib/fog/errors.rb
+- lib/fog/go_grid.rb
+- lib/fog/go_grid/bin.rb
+- lib/fog/go_grid/requests/common_lookup_list.rb
+- lib/fog/go_grid/requests/grid_image_list.rb
+- lib/fog/go_grid/requests/grid_ip_list.rb
+- lib/fog/go_grid/requests/grid_loadbalancer_list.rb
+- lib/fog/go_grid/requests/grid_server_list.rb
 - lib/fog/hmac.rb
 - lib/fog/linode.rb
 - lib/fog/linode/bin.rb