fog 1.1.1 → 1.2.0

data/lib/fog/bin/clodo.rb

@@ -0,0 +1,31 @@
+class Clodo < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Clodo
+      else 
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Formatador.display_line("[yellow][WARN] Clodo[:compute] is deprecated, use Compute[:clodo] instead[/]")
+          Fog::Compute.new(:provider => 'Clodo')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Clodo.services
+    end
+
+  end
+end

data/lib/fog/bin/cloudstack.rb

@@ -0,0 +1,30 @@
+class Cloudstack < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Cloudstack
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Compute.new(:provider => 'Cloudstack')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Cloudstack.services
+    end
+
+  end
+end

data/lib/fog/bin/joyent.rb

@@ -0,0 +1,31 @@
+class Joyent < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Joyent
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Logger.warning("Joyent[:compute] is not recommended, use Compute[:joyent] for portability")
+          Fog::Compute.new(:provider => 'Joyent')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Joyent.services
+    end
+
+  end
+end

data/lib/fog/bin/ovirt.rb

@@ -0,0 +1,30 @@
+class Ovirt < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Ovirt
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+                    when :compute
+                      Fog::Compute.new(:provider => 'Ovirt')
+                    else
+                      raise ArgumentError, "Unrecognized service: #{key.inspect}"
+                    end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Ovirt.services
+    end
+
+  end
+end

data/lib/fog/bin/voxel.rb

@@ -14,7 +14,7 @@ class Voxel < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Voxel[:comupte] is not recommended, use Compute[:voxel]] for portability")
+          Fog::Logger.warning("Voxel[:compute] is not recommended, use Compute[:voxel] for portability")
           Fog::Compute.new(:provider => 'Voxel')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin.rb

@@ -55,6 +55,8 @@ end
 require 'fog/bin/aws'
 require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
+require 'fog/bin/cloudstack'
+require 'fog/bin/clodo'
 require 'fog/bin/dnsimple'
 require 'fog/bin/dnsmadeeasy'
 require 'fog/bin/dynect'
@@ -62,13 +64,15 @@ require 'fog/bin/ecloud'
 require 'fog/bin/glesys'
 require 'fog/bin/go_grid'
 require 'fog/bin/google'
+require 'fog/bin/joyent'
 require 'fog/bin/libvirt'
 require 'fog/bin/linode'
 require 'fog/bin/local'
-require 'fog/bin/new_servers'
+require 'fog/bin/bare_metal_cloud'
 require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
 require 'fog/bin/openstack'
+require 'fog/bin/ovirt'
 require 'fog/bin/slicehost'
 require 'fog/bin/stormondemand'
 require 'fog/bin/terremark'

data/lib/fog/bluebox/compute.rb

@@ -15,12 +15,16 @@ module Fog
       collection  :images
       model       :server
       collection  :servers
+      model       :location
+      collection  :locations
 
       request_path 'fog/bluebox/requests/compute'
       request :create_block
       request :destroy_block
       request :get_block
       request :get_blocks
+      request :get_location
+      request :get_locations
       request :get_product
       request :get_products
       request :get_template

data/lib/fog/bluebox/models/compute/location.rb

@@ -0,0 +1,17 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Bluebox
+
+      class Location < Fog::Model
+
+        identity :id
+        
+        attribute :description
+
+      end
+
+    end
+  end
+end

data/lib/fog/bluebox/models/compute/locations.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/bluebox/models/compute/location'
+
+module Fog
+  module Compute
+    class Bluebox
+
+      class Locations < Fog::Collection
+
+        model Fog::Compute::Bluebox::Location
+
+        def all
+          data = connection.get_locations.body
+          load(data)
+        end
+
+        def get(location_id)
+          response = connection.get_location(location_id)
+          new(response.body)
+        rescue Fog::Compute::Bluebox::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -15,6 +15,7 @@ module Fog
         attribute :flavor_id,   :aliases => :product, :squash => 'id'
         attribute :hostname
         attribute :image_id
+        attribute :location_id
         attribute :ips
         attribute :memory
         attribute :state,       :aliases => "status"
@@ -25,8 +26,9 @@ module Fog
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          self.flavor_id  ||= '94fd37a7-2606-47f7-84d5-9000deda52ae' # Block 1GB Virtual Server
-          self.image_id   ||= '03807e08-a13d-44e4-b011-ebec7ef2c928' # Ubuntu LTS 10.04 64bit
+          self.flavor_id    ||= '94fd37a7-2606-47f7-84d5-9000deda52ae' # Block 1GB Virtual Server
+          self.image_id     ||= 'a8f05200-7638-47d1-8282-2474ef57c4c3' # Scientific Linux 6
+          self.location_id  ||= '37c2bd9a-3e81-46c9-b6e2-db44a25cc675' # Seattle, WA
           super
         end
 
@@ -45,6 +47,11 @@ module Fog
           requires :image_id
           connection.images.get(image_id)
         end
+        
+        def location
+          requires :location_id
+          connection.locations.get(location_id)
+        end
 
         def private_ip_address
           nil
@@ -84,7 +91,7 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          requires :flavor_id, :image_id
+          requires :flavor_id, :image_id, :location_id
           options = {}
 
           if identity.nil?  # new record
@@ -100,10 +107,10 @@ module Fog
           elsif @lb_applications
             options['lb_applications'] = lb_applications
           end
-
+          
           options['username'] = username
           options['hostname'] = hostname if @hostname
-          data = connection.create_block(flavor_id, image_id, options)
+          data = connection.create_block(flavor_id, image_id, location_id, options)
           merge_attributes(data.body)
           true
         end

data/lib/fog/bluebox/requests/compute/create_block.rb

@@ -18,12 +18,12 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         # TODO
-        def create_block(product_id, template_id, options = {})
+        def create_block(product_id, template_id, location_id, options = {})
           request(
             :expects  => 200,
             :method   => 'POST',
             :path     => '/api/blocks.json',
-            :query    => {'product' => product_id, 'template' => template_id}.merge!(options)
+            :query    => {'product' => product_id, 'template' => template_id, 'location' => location_id}.merge!(options)
           )
         end
 

data/lib/fog/bluebox/requests/compute/get_location.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class Bluebox
+      class Real
+
+        # Get details of a location
+        #
+        # ==== Parameters
+        # * location_id<~Integer> - Id of location to lookup
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        # TODO
+        def get_location(location_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "api/locations/#{location_id}.json"
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/bluebox/requests/compute/get_locations.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Bluebox
+      class Real
+
+        # Get list of locations
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * 'id'<~String> - UUID of the location
+        #     * 'description'<~String> - Description of the location
+        def get_locations
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'api/locations.json'
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/compute.rb

@@ -16,6 +16,10 @@ module Fog
       model       :server
       collection  :server_groups
       model       :server_group
+      collection  :firewall_policies
+      model       :firewall_policy
+      collection  :firewall_rules
+      model       :firewall_rule
       collection  :flavors
       model       :flavor
       collection  :images
@@ -35,6 +39,7 @@ module Fog
       request :add_nodes_load_balancer
       request :add_servers_server_group
       request :apply_to_firewall_policy
+      request :remove_firewall_policy
       request :create_api_client
       request :create_cloud_ip
       request :create_firewall_policy
@@ -80,6 +85,7 @@ module Fog
       request :remove_nodes_load_balancer
       request :remove_servers_server_group
       request :reset_ftp_password_account
+      request :reset_secret_api_client
       request :resize_server
       request :shutdown_server
       request :snapshot_server
@@ -88,6 +94,8 @@ module Fog
       request :unmap_cloud_ip
       request :update_account
       request :update_api_client
+      request :update_cloud_ip
+      request :update_firewall_rule
       request :update_image
       request :update_load_balancer
       request :update_server

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

@@ -23,9 +23,17 @@ module Fog
         attribute :server_id, :aliases => "server", :squash => "id"
         attribute :load_balancer, :alias => "load_balancer", :squash => "id"
 
-        def map(interface_to_map)
+        def map(destination)
           requires :identity
-          connection.map_cloud_ip(identity, :interface => interface_to_map)
+          case destination
+          when Fog::Compute::Brightbox::Server
+            final_destination = destination.interfaces.first["id"]
+          when Fog::Compute::Brightbox::LoadBalancer
+            final_destination = destination.id
+          else
+            final_destination = destination
+          end
+          connection.map_cloud_ip(identity, :destination => final_destination)
         end
 
         def mapped?

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

@@ -0,0 +1,29 @@
+require 'fog/core/collection'
+require 'fog/brightbox/models/compute/firewall_policy'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallPolicies < Fog::Collection
+
+        model Fog::Compute::Brightbox::FirewallPolicy
+
+        def all
+          data = connection.list_firewall_policies
+          load(data)
+        end
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = connection.get_firewall_policy(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallPolicy < Fog::Model
+
+        identity :id
+        attribute :url
+        attribute :resource_type
+
+        attribute :name
+        attribute :description
+
+        attribute :default
+
+        attribute :server_group_id, :aliases => "server_group", :squash => "id"
+        attribute :created_at, :type => :time
+        attribute :rules
+
+        # Sticking with existing Fog behaviour, save does not update but creates a new resource
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          options = {
+            :server_group => server_group_id,
+            :name => name,
+            :description => description
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_firewall_policy(options)
+          merge_attributes(data)
+          true
+        end
+
+        def apply_to(server_group_id)
+          requires :identity
+          options = {
+            :server_group => server_group_id
+          }
+          data = connection.apply_to_firewall_policy(identity, options)
+          merge_attributes(data)
+          true
+        end
+
+        def remove(server_group_id)
+          requires :identity
+          options = {
+            :server_group => server_group_id
+          }
+          data = connection.remove_firewall_policy(identity, options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          data = connection.destroy_firewall_policy(identity)
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallRule < Fog::Model
+
+        identity :id
+        attribute :url
+        attribute :resource_type
+
+        attribute :description
+
+        attribute :source
+        attribute :source_port
+        attribute :destination
+        attribute :destination_port
+        attribute :protocol
+        attribute :icmp_type_name
+        attribute :created_at, :type => :time
+
+        attribute :firewall_policy_id, :aliases => "firewall_policy", :squash => "id"
+
+        # Sticking with existing Fog behaviour, save does not update but creates a new resource
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          requires :firewall_policy_id
+          options = {
+            :firewall_policy => firewall_policy_id,
+            :protocol => protocol,
+            :description => description,
+            :source => source,
+            :source_port => source_port,
+            :destination => destination,
+            :destination_port => destination_port,
+            :icmp_type_name => icmp_type_name
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_firewall_rule(options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          connection.destroy_firewall_rule(identity)
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'fog/core/collection'
+require 'fog/brightbox/models/compute/firewall_rule'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallRules < Fog::Collection
+
+        model Fog::Compute::Brightbox::FirewallRule
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = connection.get_firewall_rule(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module Fog
         attribute :resource_type
 
         attribute :name
+        attribute :username
         attribute :status
         attribute :description
 
@@ -43,6 +44,7 @@ module Fog
             :source => source,
             :arch => arch,
             :name => name,
+            :username => username,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
           data = connection.create_image(options)

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

@@ -27,17 +27,43 @@ module Fog
         # Links - to be replaced
         attribute :account_id,  :aliases => "account",      :squash => "id"
         attribute :image_id,    :aliases => "image",        :squash => "id"
-        attribute :flavor_id,   :aliases => "server_type",  :squash => "id"
-        attribute :zone_id,     :aliases => "zone",         :squash => "id"
+
         attribute :snapshots
         attribute :cloud_ips
         attribute :interfaces
+        attribute :server_groups
+        attribute :zone
+        attribute :server_type
 
         def initialize(attributes={})
-          self.image_id   ||= 'img-2ab98' # Ubuntu Lucid 10.04 server (i686)
+          self.image_id   ||= 'img-4gqhs' # Ubuntu Lucid 10.04 server (i686)
           super
         end
 
+        def zone_id
+          if t_zone_id = attributes[:zone_id]
+            t_zone_id
+          elsif zone
+            zone[:id] || zone['id']
+          end
+        end
+
+        def flavor_id
+          if t_flavour_id = attributes[:flavor_id]
+            t_flavour_id
+          elsif server_type
+            server_type[:id] || server_type['id']
+          end
+        end
+
+        def zone_id=(incoming_zone_id)
+          attributes[:zone_id] = incoming_zone_id
+        end
+
+        def flavor_id=(incoming_flavour_id)
+          attributes[:flavor_id] = incoming_flavour_id
+        end
+
         def snapshot
           requires :identity
           connection.snapshot_server(identity)
@@ -82,11 +108,19 @@ module Fog
         end
 
         def private_ip_address
-          interfaces.first
+          unless interfaces.empty?
+            interfaces.first["ipv4_address"]
+          else
+            nil
+          end
         end
 
         def public_ip_address
-          cloud_ips.first
+          unless cloud_ips.empty?
+            cloud_ips.first["public_ip"]
+          else
+            nil
+          end
         end
 
         def ready?
@@ -106,7 +140,8 @@ module Fog
             :image => image_id,
             :name => name,
             :zone => zone_id,
-            :user_data => user_data
+            :user_data => user_data,
+            :server_groups => server_groups
           }.delete_if {|k,v| v.nil? || v == "" }
           unless flavor_id.nil? || flavor_id == ""
             options.merge!(:server_type => flavor_id)