fog 1.5.0 → 1.6.0

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

@@ -22,6 +22,8 @@ module Fog
         attribute :interface_id, :aliases => "interface", :squash => "id"
         attribute :server_id, :aliases => "server", :squash => "id"
         attribute :load_balancer, :alias => "load_balancer", :squash => "id"
+        attribute :port_translators
+        attribute :name
 
         def map(destination)
           requires :identity

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

@@ -20,6 +20,7 @@ module Fog
         attribute :arch
         attribute :virtual_size
         attribute :disk_size
+        attribute :licence_name
 
         # Boolean flags
         attribute :public

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

@@ -17,6 +17,7 @@ module Fog
         attribute :fqdn
         attribute :user_data
         attribute :console_url
+        attribute :fqdn
         attribute :console_token
 
         # Times
@@ -37,7 +38,7 @@ module Fog
         attribute :server_type
 
         def initialize(attributes={})
-          self.image_id   ||= 'img-wwgbb' # Ubuntu Lucid 10.04 server (i686)
+          self.image_id ||= Fog::Compute[:brightbox].default_image
           super
         end
 
@@ -70,8 +71,26 @@ module Fog
           connection.snapshot_server(identity)
         end
 
-        def reboot
-          false
+        # Directly requesting a server reboot is not supported in the API
+        # so needs to attempt a shutdown/stop, wait and start again.
+        #
+        # Default behaviour is a hard reboot because it is more reliable
+        # because the state of the server's OS is irrelevant.
+        #
+        # @param [Boolean] use_hard_reboot
+        # @return [Boolean]
+        def reboot(use_hard_reboot = true)
+          requires :identity
+          if ready?
+            unless use_hard_reboot
+              soft_reboot
+            else
+              hard_reboot
+            end
+          else
+            # Not able to reboot if not ready in the first place
+            false
+          end
         end
 
         def start
@@ -151,7 +170,31 @@ module Fog
           merge_attributes(data)
           true
         end
+
+      private
+        # Hard reboots are fast, avoiding the OS by doing a "power off"
+        def hard_reboot
+          stop
+          wait_for { ! ready? }
+          start
+        end
+
+        # Soft reboots often timeout if the OS missed the request so we do more
+        # error checking trying to detect the timeout
+        #
+        # @fixme - Using side effect of wait_for's (evaluated block) to detect timeouts
+        def soft_reboot
+          shutdown
+          if wait_for(20) { ! ready? }
+            # Server is now down, start it up again
+            start
+          else
+            # We timed out
+            false
+          end
+        end
       end
+
     end
   end
 end

data/lib/fog/brightbox/requests/compute/create_cloud_ip.rb

@@ -3,11 +3,11 @@ module Fog
     class Brightbox
       class Real
 
-        def create_cloud_ip
-          request("post", "/1.0/cloud_ips", [201])
+        def create_cloud_ip(options = nil)
+          request("post", "/1.0/cloud_ips", [201],options)
         end
 
       end
     end
   end
-end
+end

data/lib/fog/cloudstack/compute.rb

@@ -120,6 +120,7 @@ module Fog
       request :recover_virtual_machine
       request :register_ssh_key_pair
       request :register_user_keys
+      request :register_template
       request :remove_from_load_balancer_rule
       request :reset_password_for_virtual_machine
       request :revoke_security_group_ingress
@@ -364,7 +365,9 @@ module Fog
                 "domain"          => "ROOT",
                 "domainid"        => "6023b6fe-5bef-4358-bc76-9f4e75afa52f",
                 "isextractable"   => true,
-                "checksum"        => "905cec879afd9c9d22ecc8036131a180"}},
+                "checksum"        => "905cec879afd9c9d22ecc8036131a180",
+                "hypervisor"      => "Xen"
+              }},
               :flavors => { flavor_id => {
                 "id"          => flavor_id,
                 "name"        => "Medium Instance",

data/lib/fog/cloudstack/models/compute/images.rb

@@ -10,23 +10,32 @@ module Fog
         model Fog::Compute::Cloudstack::Image
 
         def all(filters={})
-          options = {
-            'templatefilter' => 'self'
-          }.merge(filters)
+          options = get_filter_options(filters)
 
           data = connection.list_templates(options)["listtemplatesresponse"]["template"] || []
           load(data)
         end
 
-        def get(template_id)
-          if template = connection.list_templates('id' => template_id)["listtemplatesresponse"]["template"].first
+        def get(template_id, filters={})
+          filter_option = get_filter_options(filters)
+          options = filter_option.merge('id' => template_id)
+
+          if template = connection.list_templates(options)["listtemplatesresponse"]["template"].first
             new(template)
           end
         rescue Fog::Compute::Cloudstack::BadRequest
           nil
         end
-      end
 
+        private
+
+        def get_filter_options(filters)
+          default_filter = {
+              'templatefilter' => 'self'
+          }
+          default_filter.merge(filters)
+        end
+      end
     end
   end
 end

data/lib/fog/cloudstack/models/compute/job.rb

@@ -31,7 +31,7 @@ module Fog
         # so dirty
         def result
           if successful? && model = Fog::Compute::Cloudstack.constants.find{|c| c.to_s.downcase == self.job_result.keys.first.to_s}.to_s
-            collection = model.gsub(/.[A-Z]/){|w| "#{w[0]}_#{w[1].downcase}"}.downcase + "s" # cheap underscorize, assume simple pluralization
+            collection = model.gsub(/.[A-Z]/){|w| "#{w[0,1]}_#{w[1,1].downcase}"}.downcase + "s" # cheap underscorize, assume simple pluralization
             connection.send(collection).new(self.job_result.values.first)
           else self.job_result
           end

data/lib/fog/cloudstack/requests/compute/attach_volume.rb

@@ -8,7 +8,7 @@ module Fog
         # {CloudStack API Reference}[http://http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/attachVolume.html]
         def attach_volume(options={})
           options.merge!(
-            'command' => 'attachVolume',
+            'command' => 'attachVolume'
           )
 
           request(options)

data/lib/fog/cloudstack/requests/compute/register_template.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Registers an existing template into the cloud.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/3.0.0/api_3.0.0/user/registerTemplate.html]
+        def register_template(options={})
+          options.merge!(
+              'command' => 'registerTemplate'
+          )
+
+          request(options)
+        end
+
+      end # Real
+
+      class Mock
+        def register_template(options={})
+          mock_template_id = self.data[:images].keys.first
+          registered_template = self.data[:images][mock_template_id]
+
+          {
+              'registertemplateresponse' =>
+              {
+                  'count' => 1,
+                  'template' => [registered_template]
+              }
+          }
+        end
+      end # Mock
+    end # Cloudstack
+  end # Compute
+end #Fog

data/lib/fog/compute.rb

@@ -7,7 +7,9 @@ module Fog
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
-      case provider = attributes.delete(:provider).to_s.downcase.to_sym
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+
+      case provider
       when :aws
         require 'fog/aws/compute'
         Fog::Compute::AWS.new(attributes)
@@ -64,8 +66,18 @@ module Fog
         require 'fog/ovirt/compute'
         Fog::Compute::Ovirt.new(attributes)
       when :rackspace
-        require 'fog/rackspace/compute'
-        Fog::Compute::Rackspace.new(attributes)
+        version = attributes.delete(:version) 
+        version = version.to_s.downcase.to_sym unless version.nil?
+        if version == :v2
+          require 'fog/rackspace/compute_v2'
+          Fog::Compute::RackspaceV2.new(attributes)
+        else
+          require 'fog/rackspace/compute'
+          Fog::Compute::Rackspace.new(attributes)
+        end
+      when :serverlove
+        require 'fog/serverlove/compute'
+        Fog::Compute::Serverlove.new(attributes)
       when :stormondemand
         require 'fog/storm_on_demand/compute'
         Fog::Compute::StormOnDemand.new(attributes)

data/lib/fog/core/errors.rb

@@ -57,6 +57,7 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :openstack_username:
   :openstack_auth_url:
   :openstack_tenant:
+  :openstack_region:
   :ovirt_username:
   :ovirt_password:
   :ovirt_url:

data/lib/fog/core/time.rb

@@ -22,5 +22,9 @@ module Fog
       self.utc.strftime("#{DAYS[self.utc.wday]}, %d #{MONTHS[self.utc.month - 1]} %Y %H:%M:%S +0000")
     end
 
+    def to_iso8601_basic
+      self.utc.strftime('%Y%m%dT%H%M%SZ')
+    end
+
   end
 end

data/lib/fog/dynect/dns.rb

@@ -65,7 +65,7 @@ module Fog
           @dynect_password = options[:dynect_password]
 
           @connection_options = options[:connection_options] || {}
-          @host       = 'api2.dynect.net'
+          @host       = 'api-v4.dynect.net'
           @port       = options[:port]        || 443
           @path       = options[:path]        || '/REST'
           @persistent = options[:persistent]  || false
@@ -93,7 +93,7 @@ module Fog
 
             if response.body.empty?
               response.body = {}
-            else
+            elsif response.headers['Content-Type'] == 'application/json'
               response.body = Fog::JSON.decode(response.body)
             end
 
@@ -102,7 +102,7 @@ module Fog
             end
 
             if response.status == 307 && params[:path] !~ %r{^/REST/Job/}
-              response = poll_job(response)
+              response = poll_job(response, params[:expects])
             end
 
             response
@@ -118,11 +118,11 @@ module Fog
           response
         end
 
-        def poll_job(response, time_to_wait = 10)
+        def poll_job(response, original_expects, time_to_wait = 10)
           job_location = response.headers['Location']
 
           Fog.wait_for(time_to_wait) do
-            response = request(:expects => 200, :method => :get, :path => job_location)
+            response = request(:expects => original_expects, :method => :get, :path => job_location)
             response.body['status'] != 'incomplete'
           end
 

data/lib/fog/ecloud.rb

@@ -9,3 +9,9 @@ module Fog
 
   end
 end
+
+module Fog
+  module Ecloud
+    ECLOUD_OPTIONS = [:ecloud_authentication_method]
+  end
+end

data/lib/fog/ecloud/compute.rb

@@ -212,8 +212,10 @@ module Fog
       request :virtual_machine_copy
       request :virtual_machine_copy_identical
       request :virtual_machine_edit
+      request :virtual_machine_add_ip
       request :virtual_machine_edit_hardware_configuration
       request :virtual_machine_delete
+      request :virtual_machine_upload_file
       request :internet_service_create
       request :internet_service_edit
       request :internet_service_delete
@@ -455,7 +457,7 @@ module Fog
          }
          params[:headers].merge!(maor_headers)
          if params[:method]=="POST" || params[:method]=="PUT"
-           params[:headers].merge!({"Content-Type" => 'application/xml'})
+           params[:headers].merge!({"Content-Type" => 'application/xml'}) unless params[:headers]['Content-Type']
            params[:headers].merge!({"Accept" => 'application/xml'})
          end
          unless params[:body].empty?

data/lib/fog/ecloud/models/compute/ip_addresses.rb

@@ -11,6 +11,7 @@ module Fog
 
         def all
           data = connection.get_ip_addresses(href).body[:IpAddresses][:IpAddress]
+          data = data.nil? ? [] : data
           load(data)
         end
 

data/lib/fog/ecloud/models/compute/networks.rb

@@ -12,6 +12,7 @@ module Fog
         def all
           data = connection.get_networks(href).body
           data = data[:Networks] ? data[:Networks][:Network] : data[:Network]
+          data = data.nil? ? [] : data
           load(data)
         end
 

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

@@ -37,7 +37,7 @@ module Fog
 
 
         def ips
-          network_hash = ip_addresses[:AssignedIpAddresses][:Networks]
+          network_hash = ip_addresses[:AssignedIpAddresses][:Networks] || []
           network_hash[:Network] = network_hash[:Network].is_a?(Hash) ? [network_hash[:Network]] : network_hash[:Network]
           network_hash[:Network].each do |network|
             network[:IpAddresses][:IpAddress] = network[:IpAddresses][:IpAddress].is_a?(String) ? [network[:IpAddresses][:IpAddress]] : network[:IpAddresses][:IpAddress]
@@ -190,6 +190,36 @@ module Fog
           task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
         end
 
+        def add_ip(options)
+          begin
+            slice_ips = ips
+          rescue
+            slice_ips = []
+          end
+          begin
+            slice_networks = networks
+          rescue
+            slice_networks = []
+          end
+          slice_networks = slice_networks.map { |n| {:href => n.href, :name => n.name.split(' ')[0], :type => 'application/vnd.tmrk.cloud.network'} }.push({:href => options[:href], :name => options[:network_name], :type => 'application/vnd.tmrk.cloud.network'}).uniq
+          slice_ips = slice_ips.map { |i| {:name => i.name, :network_name => i.other_links[:Link][:name]} }.push({:name => options[:ip], :network_name => options[:network_name]})
+          slice_ips.each do |ip|
+            slice_networks.each do |network|
+              if network[:name] == ip[:network_name]
+                network[:ips] ||= []
+                network[:ips].push(ip[:name])
+              end
+            end
+          end
+          data = connection.virtual_machine_add_ip(href + "/assignedIps", slice_networks).body
+          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+        end
+
+        def upload_file(options)
+          connection.virtual_machine_upload_file(href + "/guest/action/files", options)
+          true
+        end
+
         def storage_size
           vm_disks = disks
           disks.map! { |d| d[:Size][:Value].to_i }.inject(0){|sum,item| sum + item} * 1024 * 1024        

data/lib/fog/ecloud/requests/compute/virtual_machine_add_ip.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Compute
+    class Ecloud
+      module Shared
+
+        def build_request_body_add_ip(networks)
+          xml = Builder::XmlMarkup.new
+          xml.AssignedIpAddresses do
+            xml.Networks do
+              networks.each do |network|
+                xml.Network(:href => network[:href], :type => network[:type]) do
+                  xml.IpAddresses do
+                    network[:ips].each do |ip|
+                      xml.IpAddress ip
+                    end
+                  end
+                end
+              end
+            end
+          end    
+        end
+      end
+
+      class Real
+
+        def virtual_machine_add_ip(href, options)
+          body = build_request_body_add_ip(options)
+          request(
+            :expects => 202,
+            :method => 'PUT',
+            :headers => {},
+            :body => body,
+            :uri => href,
+            :parse => true
+          )
+        end
+      end
+    end
+  end
+end