fog 1.24.0 → 1.25.0

data/lib/fog/rackspace/models/networking/virtual_interfaces.rb

@@ -0,0 +1,45 @@
+require 'fog/core/collection'
+require 'fog/rackspace/models/networking/virtual_interface'
+require 'fog/rackspace/models/compute_v2/server'
+
+module Fog
+  module Rackspace
+    class Networking
+      class VirtualInterfaces < Fog::Collection
+        model Fog::Rackspace::Networking::VirtualInterface
+
+        # Returns list of virtual interfaces for a server
+        # @return [Fog::Rackspace::Networking::Servers] Retrieves a list virtual interfaces for server.
+        # @raise [Fog::Rackspace::Networking::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Networking::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Networking::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Networking::ServiceError]
+        # @note Fog's current implementation only returns 1000 servers
+        # @note The filter parameter on the method is just to maintain compatability with other providers that support filtering.
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html
+        # @see Fog::Rackspace::Networking::Server#virtual_interfaces
+        def all(options={})
+          server  = server(options[:server])
+          data    = service.list_virtual_interfaces(server.id).body['virtual_interfaces']
+          objects = load(data)
+          objects.each{ |obj| obj.attributes[:server] = server }
+          objects
+        end
+
+        private
+
+        def server(obj)
+          server = case obj.class.to_s
+            when "Fog::Compute::RackspaceV2::Server" then obj
+            when "String" then Fog::Compute::RackspaceV2::Server.new(:id => obj, :service => service)
+            else raise "Please pass in :server (either id or Fog::Compute::RackspaceV2::Server)"
+          end
+
+          raise "Server (#{server}) not found" unless server.present?
+
+          server
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/models/queues/queue.rb

@@ -91,7 +91,7 @@ module Fog
 
           if claim
             message = claim.messages.first
-            yield message
+            yield message if block_given?
             message.destroy
             true
           else

data/lib/fog/rackspace/networking.rb

@@ -0,0 +1,192 @@
+require 'fog/rackspace/core'
+
+module Fog
+  module Rackspace
+    class Networking < Fog::Service
+      include Fog::Rackspace::Errors
+
+      class ServiceError < Fog::Rackspace::Errors::ServiceError; end
+      class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
+      class BadRequest < Fog::Rackspace::Errors::BadRequest; end
+
+      class InvalidStateException < ::RuntimeError
+        attr_reader :desired_state
+        attr_reader :current_state
+
+        def initialize(desired_state, current_state)
+          @desired_state = desired_state
+          @current_state = current_state
+        end
+      end
+
+      class InvalidServerStateException < InvalidStateException
+        def to_s
+          "Server should have transitioned to '#{desired_state}' not '#{current_state}'"
+        end
+      end
+
+      class InvalidImageStateException < InvalidStateException
+         def to_s
+           "Image should have transitioned to '#{desired_state}' not '#{current_state}'"
+         end
+      end
+
+      DFW_ENDPOINT = 'https://dfw.servers.api.rackspacecloud.com/v2'
+      ORD_ENDPOINT = 'https://ord.servers.api.rackspacecloud.com/v2'
+      LON_ENDPOINT = 'https://lon.servers.api.rackspacecloud.com/v2'
+
+      requires :rackspace_username, :rackspace_api_key
+      recognizes :rackspace_endpoint
+      recognizes :rackspace_auth_url
+      recognizes :rackspace_auth_token
+      recognizes :rackspace_region
+      recognizes :rackspace_compute_url
+
+      model_path 'fog/rackspace/models/networking'
+
+      model :network
+      collection :networks
+
+      model :virtual_interface
+      collection :virtual_interfaces
+
+      request_path 'fog/rackspace/requests/networking'
+      request :list_networks
+      request :get_network
+      request :create_network
+      request :delete_network
+
+      request :list_virtual_interfaces
+      request :create_virtual_interface
+      request :delete_virtual_interface
+
+      class Mock < Fog::Rackspace::Service
+        include Fog::Rackspace::MockData
+
+        def initialize(options)
+          @rackspace_api_key = options[:rackspace_api_key]
+        end
+
+        def request(params)
+          Fog::Mock.not_implemented
+        end
+
+        def response(params={})
+          body    = params[:body] || {}
+          status  = params[:status] || 200
+          headers = params[:headers] || {}
+
+          response = Excon::Response.new(:body => body, :headers => headers, :status => status)
+          if params.key?(:expects) && ![*params[:expects]].include?(response.status)
+            raise(Excon::Errors.status_error(params, response))
+          else response
+          end
+        end
+      end
+
+      class Real < Fog::Rackspace::Service
+        def initialize(options = {})
+          @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_username = options[:rackspace_username]
+          @rackspace_auth_url = options[:rackspace_auth_url]
+          setup_custom_endpoint(options)
+          @rackspace_must_reauthenticate = false
+          @connection_options = options[:connection_options] || {}
+
+          authenticate
+
+          deprecation_warnings(options)
+
+          @persistent = options[:persistent] || false
+          @connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
+        end
+
+        def request(params, parse_json = true)
+          super
+        rescue Excon::Errors::NotFound => error
+          raise NotFound.slurp(error, self)
+        rescue Excon::Errors::BadRequest => error
+          raise BadRequest.slurp(error, self)
+        rescue Excon::Errors::InternalServerError => error
+          raise InternalServerError.slurp(error, self)
+        rescue Excon::Errors::HTTPStatusError => error
+          raise ServiceError.slurp(error, self)
+        end
+
+        def authenticate(options={})
+          super({
+            :rackspace_api_key => @rackspace_api_key,
+            :rackspace_username => @rackspace_username,
+            :rackspace_auth_url => @rackspace_auth_url,
+            :connection_options => @connection_options
+          })
+        end
+
+        def service_name
+          :cloudServersOpenStack
+        end
+
+        def request_id_header
+          "x-compute-request-id"
+        end
+
+        def region
+          @rackspace_region
+        end
+
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_url)
+        end
+
+        private
+
+        def setup_custom_endpoint(options)
+          @rackspace_endpoint = Fog::Rackspace.normalize_url(options[:rackspace_compute_url] || options[:rackspace_endpoint])
+
+          if v2_authentication?
+            case @rackspace_endpoint
+            when DFW_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :dfw
+            when ORD_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :ord
+            when LON_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :lon
+            else
+              # we are actually using a custom endpoint
+              @rackspace_region = options[:rackspace_region]
+            end
+          else
+            #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
+            @rackspace_endpoint ||= DFW_ENDPOINT
+          end
+        end
+
+        def deprecation_warnings(options)
+          Fog::Logger.deprecation("The :rackspace_endpoint option is deprecated. Please use :rackspace_compute_url for custom endpoints") if options[:rackspace_endpoint]
+
+          if [DFW_ENDPOINT, ORD_ENDPOINT, LON_ENDPOINT].include?(@rackspace_endpoint) && v2_authentication?
+            regions = @identity_service.service_catalog.display_service_regions(service_name)
+            Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid regions for :rackspace_region are #{regions}.")
+          end
+        end
+
+        def append_tenant_v1(credentials)
+          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
+
+          endpoint = @rackspace_endpoint || credentials['X-Server-Management-Url'] || DFW_ENDPOINT
+          @uri = URI.parse(endpoint)
+          @uri.path = "#{@uri.path}/#{account_id}"
+        end
+
+        def authenticate_v1(options)
+          credentials = Fog::Rackspace.authenticate(options, @connection_options)
+          append_tenant_v1 credentials
+          @auth_token = credentials['X-Auth-Token']
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/create_node.rb

@@ -14,6 +14,9 @@ module Fog
           if options.key?(:weight)
             data['nodes'][0]['weight'] = options[:weight]
           end
+          if options.key? :type
+            data['node']['type'] = options[:type]
+          end
           request(
             :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],

data/lib/fog/rackspace/requests/load_balancers/update_node.rb

@@ -12,6 +12,9 @@ module Fog
           if options.key? :condition
             data['node']['condition'] = options[:condition]
           end
+          if options.key? :type
+            data['node']['type'] = options[:type]
+          end
           #TODO - Do anything if no valid options are passed in?
           request(
             :body     => Fog::JSON.encode(data),

data/lib/fog/rackspace/requests/networking/create_network.rb

@@ -0,0 +1,36 @@
+module Fog
+  module Rackspace
+    class Networking
+      class Real
+        def create_network(label, cidr)
+          data = {
+            'network' => {
+              'label' => label,
+              'cidr' => cidr
+            }
+          }
+
+          request(
+            :method => 'POST',
+            :body => Fog::JSON.encode(data),
+            :path => "os-networksv2",
+            :expects => 200
+          )
+        end
+      end
+
+      class Mock
+        def create_network(label, cidr)
+          network_id = Fog::Rackspace::MockData.uuid
+
+          self.data[:networks][network_id] = {
+            'id' => network_id,
+            'label' => label,
+            'cidr' => cidr
+          }
+          response(:body => { 'network' => self.data[:networks][network_id] })
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/networking/create_virtual_interface.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Rackspace
+    class Networking
+      class Real
+        # Creates virtual interface for a server
+        # @param [String] server_id The server id to create the virtual interface on
+        # @param [String] network_id The network id to attach the virtual interface to
+        # @raise [Fog::Rackspace::Networking::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Networking::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Networking::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Networking::ServiceError]
+        # @see http://docs.rackspace.com/servers/api/v2/cn-devguide/content/api_create_virtual_interface.html
+        def create_virtual_interface(server_id, network_id)
+          data = {
+            :virtual_interface => {
+              :network_id => network_id
+            }
+          }
+
+          request(
+            :expects => [200],
+            :method => 'POST',
+            :path => "servers/#{server_id}/os-virtual-interfacesv2",
+            :body => Fog::JSON.encode(data)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/networking/delete_network.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Rackspace
+    class Networking
+      class Real
+        def delete_network(id)
+          request(:method => 'DELETE', :path => "os-networksv2/#{id}", :expects => 202)
+        end
+      end
+
+      class Mock
+        def delete_network(id)
+          unless self.data[:networks].key?(id)
+            raise Fog::Rackspace::Networking::NotFound
+          end
+
+          response(:body => '', :status => 202)
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/networking/delete_virtual_interface.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Rackspace
+    class Networking
+      class Real
+        # Deletes virtual interface from server
+        # @param [String] server_id The server id that contains the virtual interface
+        # @param [String] interface_id The id of the virtual interface
+        # @raise [Fog::Rackspace::Networking::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Networking::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Networking::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Networking::ServiceError]
+        # @see http://docs.rackspace.com/servers/api/v2/cn-devguide/content/delete_virt_interface_api.html
+        def delete_virtual_interface(server_id, interface_id)
+          request(
+            :expects => [200],
+            :method => 'DELETE',
+            :path => "servers/#{server_id}/os-virtual-interfacesv2/#{interface_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/networking/get_network.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Rackspace
+    class Networking
+      class Real
+        def get_network(id)
+          request(:method => 'GET', :path => "os-networksv2/#{id}", :expects => 200)
+        end
+      end
+
+      class Mock
+        def get_network(id)
+          unless self.data[:networks].key?(id)
+            raise Fog::Rackspace::Networking::NotFound
+          end
+
+          response(:body => { 'network' => self.data[:networks][id] })
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/networking/list_networks.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Rackspace
+    class Networking
+      class Real
+        def list_networks
+          request(:method => 'GET', :path => 'os-networksv2', :expects => 200)
+        end
+      end
+
+      class Mock
+        def list_networks
+          networks = self.data[:networks].values
+          response(:body => { 'networks' => networks })
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/networking/list_virtual_interfaces.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Rackspace
+    class Networking
+      class Real
+        # Lists virtual interfaces for a server
+        # @param [String] server_id
+        # @raise [Fog::Rackspace::Networking::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Networking::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Networking::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Networking::ServiceError]
+        # @see http://docs.rackspace.com/servers/api/v2/cn-devguide/content/list_virt_interfaces.html
+        def list_virtual_interfaces(server_id)
+          request(
+            :expects => [200],
+            :method => 'GET',
+            :path => "servers/#{server_id}/os-virtual-interfacesv2"
+          )
+        end
+      end
+    end
+  end
+end