fog 0.6.0 → 0.7.0

data/lib/fog/cdn/aws.rb

@@ -28,12 +28,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -43,13 +37,20 @@ module Fog
           end
 
           require 'mime/types'
-          @aws_access_key_id = options[:aws_access_key_id]
-          @data = self.class.data[options[:region]][@aws_access_key_id]
+          @aws_access_key_id  = options[:aws_access_key_id]
+          @region             = options[:region]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)
           "foo"
         end
+
       end
 
       class Real

data/lib/fog/cdn/rackspace.rb

@@ -11,6 +11,7 @@ module Fog
       request_path 'fog/cdn/requests/rackspace'
       request :get_containers
       request :head_container
+      request :post_container
       request :put_container
 
       class Mock
@@ -21,12 +22,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -36,6 +31,11 @@ module Fog
           end
 
           @rackspace_username = options[:rackspace_username]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@rackspace_username)
           @data = self.class.data[@rackspace_username]
         end
 

data/lib/fog/cdn/requests/rackspace/post_container.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Rackspace
+    class CDN
+      class Real
+
+        # modify CDN properties for a container
+        #
+        # ==== Parameters
+        # * name<~String> - Name for container, should be < 256 bytes and must not contain '/'
+        # # options<~Hash>:
+        #   * 'X-CDN-Enabled'<~Boolean> - cdn status for container
+        #   * 'X-CDN-URI'<~String> - cdn url for this container
+        #   * 'X-TTL'<~String> - integer seconds before data expires, defaults to 86400 (1 day), in 3600..259200
+        #   * 'X-Log-Retention'<~Boolean> - ?
+        #   * 'X-User-Agent-ACL'<~String> - ?
+        #   * 'X-Referrer-ACL'<~String> - ?
+        def post_container(name, options = {})
+          response = request(
+            :expects  => [201, 202],
+            :headers  => options,
+            :method   => 'POST',
+            :path     => CGI.escape(name)
+          )
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cdn/requests/rackspace/put_container.rb

@@ -3,7 +3,7 @@ module Fog
     class CDN
       class Real
 
-        # modify CDN properties for a container
+        # enable CDN for a container
         #
         # ==== Parameters
         # * name<~String> - Name for container, should be < 256 bytes and must not contain '/'

data/lib/fog/compute.rb

@@ -28,12 +28,15 @@ module Fog
       when 'Rackspace'
         require 'fog/compute/rackspace'
         Fog::Rackspace::Compute.new(attributes)
-      when 'Voxel'
-        require 'fog/compute/voxel'
-        Fog::Voxel::Compute.new(attributes)
       when 'Slicehost'
         require 'fog/compute/slicehost'
         Fog::Slicehost::Compute.new(attributes)
+      when 'VirtualBox'
+        require 'fog/compute/virtual_box'
+        Fog::VirtualBox::Compute.new(attributes)
+      when 'Voxel'
+        require 'fog/compute/voxel'
+        Fog::Voxel::Compute.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized compute provider")
       end

data/lib/fog/compute/aws.rb

@@ -69,6 +69,8 @@ module Fog
       request :terminate_instances
       request :start_instances
       request :stop_instances
+      request :monitor_instances
+      request :unmonitor_instances
 
       class Mock
 
@@ -122,12 +124,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -140,10 +136,16 @@ module Fog
 
           @aws_access_key_id = options[:aws_access_key_id]
           @region = options[:region] || 'us-east-1'
-          @data = self.class.data[@region][@aws_access_key_id]
+
+          reset_data
           @owner_id = @data[:owner_id]
         end
 
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+          @data = self.class.data[@region][@aws_access_key_id]
+        end
+
       end
 
       class Real
@@ -188,6 +190,8 @@ module Fog
           else
             options[:region] ||= 'us-east-1'
             @host = options[:host] || case options[:region]
+            when 'ap-northeast-1'
+              'ec2.ap-northeast-1.amazonaws.com'
             when 'ap-southeast-1'
               'ec2.ap-southeast-1.amazonaws.com'
             when 'eu-west-1'

data/lib/fog/compute/bluebox.rb

@@ -33,12 +33,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -48,6 +42,11 @@ module Fog
           end
 
           @bluebox_api_key = options[:bluebox_api_key]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@bluebox_api_key)
           @data = self.class.data[@bluebox_api_key]
         end
 

data/lib/fog/compute/brightbox.rb

@@ -26,6 +26,8 @@ module Fog
       model       :user
 
       request_path 'fog/compute/requests/brightbox'
+      request :activate_console_server
+      request :add_listeners_load_balancer
       request :add_nodes_load_balancer
       request :create_api_client
       request :create_cloud_ip
@@ -56,6 +58,7 @@ module Fog
       request :list_users
       request :list_zones
       request :map_cloud_ip
+      request :remove_listeners_load_balancer
       request :remove_nodes_load_balancer
       request :reset_ftp_password_account
       request :resize_server

data/lib/fog/compute/go_grid.rb

@@ -36,12 +36,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -52,6 +46,11 @@ module Fog
 
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@go_grid_api_key)
           @data = self.class.data[@go_grid_api_key]
         end
 

data/lib/fog/compute/linode.rb

@@ -31,12 +31,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -46,6 +40,11 @@ module Fog
           end
 
           @linode_api_key = options[:linode_api_key]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@linode_api_key)
           @data = self.class.data[@linode_api_key]
         end
 

data/lib/fog/compute/models/aws/flavors.rb

@@ -5,6 +5,24 @@ module Fog
   module AWS
     class Compute
 
+      FLAVORS = [
+        { :bits => 0,  :cores =>   2,  :disk => 0,    :id =>  't1.micro',   :name => 'Micro Instance',       :ram => 613},
+
+        { :bits => 32, :cores =>   1,  :disk => 160,  :id =>  'm1.small',   :name => 'Small Instance',       :ram => 1740.8},
+        { :bits => 64, :cores =>   4,  :disk => 850,  :id =>  'm1.large',   :name => 'Large Instance',       :ram => 7680},
+        { :bits => 64, :cores =>   8,  :disk => 1690, :id =>  'm1.xlarge',  :name => 'Extra Large Instance', :ram => 15360},
+
+        { :bits => 32, :cores =>   5,  :disk => 350,  :id =>  'c1.medium',  :name => 'High-CPU Medium',      :ram => 1740.8},
+        { :bits => 64, :cores =>  20,  :disk => 1690, :id =>  'c1.xlarge',  :name => 'High-CPU Extra Large', :ram => 7168},
+
+        { :bits => 64, :cores =>  6.5, :disk => 420,  :id =>  'm2.xlarge',  :name => 'High-Memory Extra Large',           :ram => 17510.4},
+        { :bits => 64, :cores =>   13, :disk => 850,  :id =>  'm2.2xlarge', :name => 'High Memory Double Extra Large',    :ram => 35020.8},
+        { :bits => 64, :cores =>   26, :disk => 1690, :id =>  'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
+
+        { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552},
+        { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cg1.4xlarge', :name => 'Cluster GPU Quadruple Extra Large',     :ram => 22528}
+      ]
+
       class Flavors < Fog::Collection
 
         model Fog::AWS::Compute::Flavor
@@ -113,24 +131,7 @@ module Fog
         #
 
         def all
-          data = [
-            { :bits => 0,  :cores =>   2,  :disk => 0,    :id =>  't1.micro',   :name => 'Micro Instance',       :ram => 613},
-
-            { :bits => 32, :cores =>   1,  :disk => 160,  :id =>  'm1.small',   :name => 'Small Instance',       :ram => 1740.8},
-            { :bits => 64, :cores =>   4,  :disk => 850,  :id =>  'm1.large',   :name => 'Large Instance',       :ram => 7680},
-            { :bits => 64, :cores =>   8,  :disk => 1690, :id =>  'm1.xlarge',  :name => 'Extra Large Instance', :ram => 15360},
-
-            { :bits => 32, :cores =>   5,  :disk => 350,  :id =>  'c1.medium',  :name => 'High-CPU Medium',      :ram => 1740.8},
-            { :bits => 64, :cores =>  20,  :disk => 1690, :id =>  'c1.xlarge',  :name => 'High-CPU Extra Large', :ram => 7168},
-
-            { :bits => 64, :cores =>  6.5, :disk => 420,  :id =>  'm2.xlarge',  :name => 'High-Memory Extra Large',           :ram => 17510.4},
-            { :bits => 64, :cores =>   13, :disk => 850,  :id =>  'm2.2xlarge', :name => 'High Memory Double Extra Large',    :ram => 35020.8},
-            { :bits => 64, :cores =>   26, :disk => 1690, :id =>  'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
-
-            { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552},
-            { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cg1.4xlarge', :name => 'Cluster GPU Quadruple Extra Large',     :ram => 22528}
-          ]
-          load(data)
+          load(Fog::AWS::Compute::FLAVORS)
           self
         end
 

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

@@ -215,6 +215,29 @@ module Fog
           connection.volumes(:server => self)
         end
 
+        #I tried to call it monitoring= and be smart with attributes[]
+        #but in #save a merge_attribute is called after run_instance
+        #thus making an un-necessary request. Use this until finding a clever solution
+        def monitor=(boolean)
+
+          #we don't have a server yet. the status silently goes in the attributes for run_instances
+          if !identity
+            self.monitoring=boolean
+          end
+
+          case boolean
+            when true
+              response = connection.monitor_instances(identity)
+            when false
+              response = connection.unmonitor_instances(identity)
+            else
+              raise ArgumentError.new("only Boolean allowed here")
+          end
+
+          #set the attribute, there is only one instance_id here
+          response.body['instancesSet'][0]['monitoring'] == 'enabled' ? self.monitoring=true : self.monitoring=false
+        end
+
       end
 
     end

data/lib/fog/compute/models/aws/tag.rb

@@ -18,7 +18,7 @@ module Fog
 
         def destroy
           requires :key, :resource_id
-          connection.delete_tags(resource_id, key)
+          connection.delete_tags(resource_id, key => value)
           true
         end
 

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

@@ -72,7 +72,7 @@ module Fog
         end
 
         def private_ip_address
-          nil
+          interfaces.first
         end
 
         def public_ip_address
@@ -83,6 +83,12 @@ module Fog
           status == 'active'
         end
 
+        def activate_console
+          requires :identity
+          response = connection.activate_console_server(identity)
+          [response["console_url"], response["console_token"], response["console_token_expires"]]
+        end
+
         def save
           requires :image_id
           options = {

data/lib/fog/compute/models/virtual_box/medium.rb

@@ -0,0 +1,87 @@
+require 'fog/core/model'
+require 'fog/compute/models/virtual_box/medium_format'
+
+module Fog
+  module VirtualBox
+    class Compute
+
+      class Medium < Fog::Model
+
+        identity :id
+
+        attribute :auto_reset
+        attribute :base
+        attribute :children
+        attribute :description
+        attribute :device_type
+        attribute :format
+        attribute :host_drive
+        attribute :id
+        attribute :last_access_error
+        attribute :location
+        attribute :logical_size
+        attribute :machine_ids
+        attribute :medium_format
+        attribute :name
+        attribute :parent
+        attribute :read_only
+        attribute :size
+        attribute :state
+        attribute :type
+        attribute :variant
+
+        def destroy
+          requires :raw
+          raw.close
+          true
+        end
+
+        undef_method :medium_format
+        def medium_format
+          Fog::VirtualBox::Compute::MediumFormat.new(
+            :connection => connection,
+            :raw        => raw.medium_format
+          )
+        end
+
+        def save
+          requires :device_type, :location, :read_only
+
+          if File.exists?(location)
+
+            access_mode = if read_only
+              :access_mode_read_only
+            else
+              :access_mode_read_write
+            end
+
+            self.raw = connection.open_medium(location, device_type, access_mode)
+
+          else
+
+            raise Fog::Errors::Error.new('Creating a new medium is not yet implemented. Contributions welcome!')
+
+          end
+        end
+
+        private
+
+        def raw
+          @raw
+        end
+
+        def raw=(new_raw)
+          @raw = new_raw
+          raw_attributes = {}
+          for key in [:auto_reset, :base, :children, :description, :device_type, :format, :host_drive, :id, :last_access_error, :location, :logical_size, :machine_ids, :medium_format, :name, :parent, :read_only, :size, :state, :type, :variant]
+            raw_attributes[key] = @raw.send(key)
+          end
+          merge_attributes(raw_attributes)
+        end
+
+      end
+
+    end
+  end
+
+end