fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/openstack/examples/compute/basics.rb

@@ -0,0 +1,74 @@
+# OpenStack Compute (Nova) Example
+
+require 'fog'
+
+auth_url = "https://example.net/v2.0/tokens"
+username = 'admin@example.net'
+password = 'secret'
+tenant   = 'My Compute Tenant' # String
+
+compute_client ||= ::Fog::Compute.new(:provider           => :openstack,
+                                      :openstack_api_key  => password  ,
+                                      :openstack_username => username  ,
+                                      :openstack_auth_url => auth_url  ,
+                                      :openstack_tenant   => tenant)
+
+# Create VM
+# Options include metadata, availability zone, etc...
+
+begin
+  vm = compute_client.servers.create(name, image, flavor, options = {})
+rescue => e
+  puts JSON.parse(e.response.body)['badRequest']['message']
+end
+
+# Destroy VM
+
+vm = compute_client.servers.get(vm.id) # Retrieve previously created vm by UUID
+floating_ips = vm.all_addresses # fetch and release its floating IPs
+floating_ips.each do |address|
+  compute_client.disassociate_address(uuid, address['ip'])
+  compute_client.release_address(address['id'])
+end
+vm.destroy
+
+# Power operations helper
+
+# vm.start / vm.stop / vm.pause should work after this
+class Server < Fog::Compute::Server
+  def start
+    if state.downcase == 'paused'
+      service.unpause_server(id) # resumes from frozen VM state
+    else
+      service.resume_server(id)  # resumes from hibernation
+    end
+  end
+
+  def stop
+    service.suspend_server(id) # hibernates the VM at hypervisor-level
+  end
+
+  def pause
+    service.pause_server(id)   # stores VM state in RAM
+  end
+end
+
+# Images available at tenant
+image_names = compute_client.images.map { |image| image['name'] }
+
+
+# Floating IP address pools available at tenant
+compute_client.addresses.get_address_pools
+# response.body #=> { 'name' => 'pool1' }, { 'name' => 'pool2' }
+
+# VNC console
+vm.console.body # returns VNC url
+
+# "console" => {
+#                "url"  => "http://vmvncserver:6080/vnc_auto.html?token=231",
+#                "type" => "novnc"
+#              }
+
+
+
+

data/lib/fog/openstack/identity.rb

@@ -192,7 +192,7 @@ module Fog
           @connection_options = options[:connection_options] || {}
 
           @openstack_current_user_id = options[:openstack_current_user_id]
-          
+
           @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
 
           @current_user = options[:current_user]
@@ -227,7 +227,6 @@ module Fog
                 'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/#{params[:path]}"#,
             }))
           rescue Excon::Errors::Unauthorized => error
@@ -293,4 +292,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/image.rb

@@ -148,7 +148,6 @@ module Fog
                 'Content-Type' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/#{params[:path]}"#,
             }))
           rescue Excon::Errors::Unauthorized => error
@@ -186,7 +185,7 @@ module Fog
               :openstack_auth_token => @openstack_auth_token,
               :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
-              :openstack_endpoint_type => @openstack_endpoint_type 
+              :openstack_endpoint_type => @openstack_endpoint_type
             }
 
             credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)

data/lib/fog/openstack/metering.rb

@@ -144,7 +144,6 @@ module Fog
                 'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/v2/#{params[:path]}"#,
               # Causes errors for some requests like tenants?limit=1
               # :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)

data/lib/fog/openstack/models/compute/host.rb

@@ -8,10 +8,11 @@ module Fog
       class Host < Fog::Model
 
         attribute :host_name
-        attribute :service
+        attribute :service_name
         attribute :details
 
         def initialize(attributes)
+          attributes["service_name"] = attributes.delete "service"
           # Old 'connection' is renamed as service and should be used instead
           prepare_service_value(attributes)
           super
@@ -19,6 +20,8 @@ module Fog
 
         def details
           service.get_host_details(self.host_name).body['host']
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
         end
 
       end

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

@@ -21,7 +21,7 @@ module Fog
         attribute :progress
         attribute :accessIPv4
         attribute :accessIPv6
-        attribute :availability_zone
+        attribute :availability_zone, :aliases => 'OS-EXT-AZ:availability_zone'
         attribute :user_data_encoded
         attribute :state,       :aliases => 'status'
         attribute :created,     :type => :time

data/lib/fog/openstack/models/network/floating_ip.rb

@@ -10,7 +10,7 @@ module Fog
         attribute :port_id
         attribute :tenant_id
         attribute :fixed_ip_address
-
+        attribute :floating_ip_address
 
 
 

data/lib/fog/openstack/models/storage/file.rb

@@ -65,11 +65,25 @@ module Fog
           new_public
         end
 
+        # Get a url for file.
+        # 
+        #     required attributes: key
+        # 
+        # @param expires [String] number of seconds (since 1970-01-01 00:00) before url expires
+        # @param options [Hash]
+        # @return [String] url
+        # 
+        def url(expires, options = {})
+          requires :directory, :key
+          self.service.create_temp_url(directory.key, key, expires, "GET", options)
+        end
+
         def public_url
           requires :key
           self.collection.get_url(self.key)
         end
 
+
         def save(options = {})
           requires :body, :directory, :key
           options['Content-Type'] = content_type if content_type

data/lib/fog/openstack/models/storage/files.rb

@@ -71,6 +71,16 @@ module Fog
           end
         end
 
+        def get_http_url(key, expires, options = {})
+          requires :directory
+          service.get_object_http_url(directory.key, key, expires, options)
+        end
+
+        def get_https_url(key, expires, options = {})
+          requires :directory
+          service.get_object_https_url(directory.key, key, expires, options)
+        end
+
         def head(key, options = {})
           requires :directory
           data = service.head_object(directory.key, key)

data/lib/fog/openstack/models/volume/volume_type.rb

@@ -0,0 +1,20 @@
+require 'fog/core/model'
+
+module Fog
+  module Volume
+    class OpenStack
+      class VolumeType < Fog::Model
+        identity :id
+
+        attribute :name
+        attribute :volume_backend_name
+
+        def initialize(attributes)
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume/volume_types.rb

@@ -0,0 +1,26 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/volume/volume_type'
+
+module Fog
+  module Volume
+    class OpenStack
+      class VolumeTypes < Fog::Collection
+        model Fog::Volume::OpenStack::VolumeType
+
+        def all(options = {})
+          response = service.list_volume_types(options)
+          load(response.body['volume_types'])
+        end
+
+        def get(volume_type_id)
+          if volume_type = service.get_volume_type_details(volume_type_id).body['volume_type']
+            new(volume_type)
+          end
+        rescue Fog::Volume::OpenStack::NotFound
+          nil
+        end
+        alias_method :find_by_id, :get
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume/volumes.rb

@@ -8,8 +8,11 @@ module Fog
       class Volumes < Fog::Collection
         model Fog::Volume::OpenStack::Volume
 
-        def all(detailed=true)
-          load(service.list_volumes(detailed).body['volumes'])
+        def all(options = {:detailed => true})
+          # the parameter has been "detailed = true" before. Make sure we are
+          # backwards compatible
+          detailed = options.is_a?(Hash) ? options.delete(:detailed) : options
+          load(service.list_volumes(detailed, options).body['volumes'])
         end
 
         def get(volume_id)

data/lib/fog/openstack/network.rb

@@ -235,7 +235,6 @@ module Fog
                 'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/#{params[:path]}"#,
             }))
           rescue Excon::Errors::Unauthorized => error

data/lib/fog/openstack/orchestration.rb

@@ -138,9 +138,10 @@ module Fog
               :headers  => {
                 'Content-Type' => 'application/json',
                 'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
+                'X-Auth-Token' => @auth_token,
+                'X-Auth-User'  => @openstack_username,
+                'X-Auth-Key'   => @openstack_api_key
               }.merge!(params[:headers] || {}),
-              :host     => @host,
               :path     => "#{@path}/#{@tenant_id}/#{params[:path]}",
               :query    => params[:query]
             }))
@@ -161,7 +162,7 @@ module Fog
               end
           end
 
-          if response.status == 200 && !response.body.empty?
+          if !response.body.empty? and response.get_header('Content-Type') =~ /application\/json/ then
             response.body = Fog::JSON.decode(response.body)
           end
 

data/lib/fog/openstack/requests/compute/create_server.rb

@@ -47,11 +47,10 @@ module Fog
           if options['nics']
             data['server']['networks'] =
             Array(options['nics']).map do |nic|
-              {
-                'uuid' => nic['net_id'],
-                'fixed_ip' => nic['v4_fixed_ip'],
-                'port' => nic['port_id']
-              }
+              neti = { 'uuid' => nic['net_id'] }
+              neti['fixed_ip'] = nic['v4_fixed_ip'] unless nic['v4_fixed_ip'].nil?
+              neti['port'] = nic['port_id'] unless nic['port_id'].nil?
+              neti
             end
           end
 
@@ -94,7 +93,7 @@ module Fog
           response.status = 202
 
           server_id = Fog::Mock.random_numbers(6).to_s
-          identity = Fog::Identity[:openstack]
+          identity = Fog::Identity::OpenStack.new :openstack_auth_url => credentials[:openstack_auth_url]
           user = identity.users.find { |u|
             u.name == @openstack_username
           }

data/lib/fog/openstack/requests/network/create_floating_ip.rb

@@ -6,10 +6,7 @@ module Fog
         def create_floating_ip(floating_network_id, options = {})
           data = {
             'floatingip' => {
-              'floating_network_id' => floating_network_id,
-              'port_id' => options[:port_id],
-              'tenant_id' => options[:tenant_id],
-              'fixed_ip_address' => options[:fixed_ip_address],
+              'floating_network_id' => floating_network_id
             }
           }
 

data/lib/fog/openstack/requests/orchestration/create_stack.rb

@@ -22,6 +22,7 @@ module Fog
           }.merge(options)
 
           request(
+            :expects  => 201,
             :path => 'stacks',
             :method => 'POST',
             :body => MultiJson.encode(params)
@@ -45,8 +46,10 @@ module Fog
           }
 
           response = Excon::Response.new
-          response.status = 202
-          response.body = {}
+          response.status = 201
+          response.body = {
+            'id' => stack_id,
+            'links'=>[{"href"=>"http://localhost:8004/v1/fake_tenant_id/stacks/#{stack_name}/#{stack_id}", "rel"=>"self"}]}
           response
         end
       end

data/lib/fog/openstack/requests/orchestration/delete_stack.rb

@@ -14,6 +14,7 @@ module Fog
 
         def delete_stack(stack_name, stack_id)
           request(
+            :expects  => 204,
             :path => "stacks/#{stack_name}/#{stack_id}",
             :method => 'DELETE'
           )
@@ -26,7 +27,7 @@ module Fog
           self.data[:stacks].delete(stack_id)
 
           response = Excon::Response.new
-          response.status = 202
+          response.status = 204
           response.body = {}
           response
         end

data/lib/fog/openstack/requests/orchestration/list_stacks.rb

@@ -25,6 +25,7 @@ module Fog
 
         def list_stacks(options = {})
           request(
+            :expects  => 200,
             :path => 'stacks',
             :method => 'GET',
             :query => options

data/lib/fog/openstack/requests/orchestration/update_stack.rb

@@ -5,22 +5,22 @@ module Fog
 
         # Update a stack.
         #
+        # @param [String] stack_id ID of the stack to update.
         # @param [String] stack_name Name of the stack to update.
         # @param [Hash] options
-        #   * :template_body [String] Structure containing the template body.
+        #   * :template [String] Structure containing the template body.
         #   or (one of the two Template parameters is required)
         #   * :template_url [String] URL of file containing the template body.
         #   * :parameters [Hash] Hash of providers to supply to template.
         #
-        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_UpdateStack.html
-        #
-        def update_stack(stack_name, options = {})
+        def update_stack(stack_id, stack_name, options = {})
           params = {
             :stack_name => stack_name
           }.merge(options)
 
           request(
-            :path => 'stacks',
+            :expects  => 202,
+            :path => "stacks/#{stack_name}/#{stack_id}",
             :method => 'PUT',
             :body => MultiJson.encode(params)
           )

data/lib/fog/openstack/requests/storage/delete_multiple_objects.rb

@@ -0,0 +1,67 @@
+module Fog
+  module Storage
+    class OpenStack
+      class Real
+
+        # Deletes multiple objects or containers with a single request.
+        #
+        # To delete objects from a single container, +container+ may be provided
+        # and +object_names+ should be an Array of object names within the container.
+        #
+        # To delete objects from multiple containers or delete containers,
+        # +container+ should be +nil+ and all +object_names+ should be prefixed with a container name.
+        #
+        # Containers must be empty when deleted. +object_names+ are processed in the order given,
+        # so objects within a container should be listed first to empty the container.
+        #
+        # Up to 10,000 objects may be deleted in a single request.
+        # The server will respond with +200 OK+ for all requests.
+        # +response.body+ must be inspected for actual results.
+        #
+        # @example Delete objects from a container
+        #   object_names = ['object', 'another/object']
+        #   conn.delete_multiple_objects('my_container', object_names)
+        #
+        # @example Delete objects from multiple containers
+        #   object_names = ['container_a/object', 'container_b/object']
+        #   conn.delete_multiple_objects(nil, object_names)
+        #
+        # @example Delete a container and all it's objects
+        #   object_names = ['my_container/object_a', 'my_container/object_b', 'my_container']
+        #   conn.delete_multiple_objects(nil, object_names)
+        #
+        # @param container [String,nil] Name of container.
+        # @param object_names [Array<String>] Object names to be deleted.
+        # @param options [Hash] Additional request headers.
+        #
+        # @return [Excon::Response]
+        #   * body [Hash] - Results of the operation.
+        #     * "Number Not Found" [Integer] - Number of missing objects or containers.
+        #     * "Response Status" [String] - Response code for the subrequest of the last failed operation.
+        #     * "Errors" [Array<object_name, response_status>]
+        #       * object_name [String] - Object that generated an error when the delete was attempted.
+        #       * response_status [String] - Response status from the subrequest for object_name.
+        #     * "Number Deleted" [Integer] - Number of objects or containers deleted.
+        #     * "Response Body" [String] - Response body for "Response Status".
+        def delete_multiple_objects(container, object_names, options = {})
+          body = object_names.map do |name|
+            object_name = container ? "#{ container }/#{ name }" : name
+            URI.encode(object_name)
+          end.join("\n")
+
+          response = request({
+            :expects  => 200,
+            :method   => 'DELETE',
+            :headers  => options.merge('Content-Type' => 'text/plain',
+                                       'Accept' => 'application/json'),
+            :body     => body,
+            :query    => { 'bulk-delete' => true }
+          }, false)
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/storage/delete_static_large_object.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Storage
+    class OpenStack
+      class Real
+
+        # Delete a static large object.
+        #
+        # Deletes the SLO manifest +object+ and all segments that it references.
+        # The server will respond with +200 OK+ for all requests.
+        # +response.body+ must be inspected for actual results.
+        #
+        # @param container [String] Name of container.
+        # @param object [String] Name of the SLO manifest object.
+        # @param options [Hash] Additional request headers.
+        #
+        # @return [Excon::Response]
+        #   * body [Hash] - Results of the operation.
+        #     * "Number Not Found" [Integer] - Number of missing segments.
+        #     * "Response Status" [String] - Response code for the subrequest of the last failed operation.
+        #     * "Errors" [Array<object_name, response_status>]
+        #       * object_name [String] - Object that generated an error when the delete was attempted.
+        #       * response_status [String] - Response status from the subrequest for object_name.
+        #     * "Number Deleted" [Integer] - Number of segments deleted.
+        #     * "Response Body" [String] - Response body for Response Status.
+        #
+        # @see http://docs.openstack.org/api/openstack-object-storage/1.0/content/static-large-objects.html
+        def delete_static_large_object(container, object, options = {})
+          response = request({
+            :expects  => 200,
+            :method   => 'DELETE',
+            :headers  => options.merge('Content-Type' => 'text/plain',
+                                       'Accept' => 'application/json'),
+            :path     => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}",
+            :query    => { 'multipart-manifest' => 'delete' }
+          }, false)
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/storage/get_object_https_url.rb

@@ -14,15 +14,53 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
+        def get_object_https_url(container, object, expires, options = {})
+          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "https"))
+        end
+        
+        # Get an expiring object http url
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container containing object
+        # * object<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        def get_object_http_url(container, object, expires, options = {})
+          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "http"))
+        end
+        
+        # creates a temporary url 
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container containing object
+        # * object<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        # * method<~String> - The method to use for accessing the object (GET, PUT, HEAD)
+        # * scheme<~String> - The scheme to use (http, https)
+        # * options<~Hash> - An optional options hash
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
         #
         # ==== See Also
         # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
-        def get_object_https_url(container, object, expires, options = {})
-          if @openstack_temp_url_key.nil?
-            raise ArgumentError, "Storage must my instantiated with the :openstack_temp_url_key option"
+        def create_temp_url(container, object, expires, method, options = {})
+          raise ArgumentError, "Insufficient parameters specified." unless (container && object && expires && method)
+          raise ArgumentError, "Storage must my instantiated with the :openstack_temp_url_key option" if @openstack_temp_url_key.nil?
+          
+          scheme = options[:scheme] || @scheme
+          
+          # POST not allowed
+          allowed_methods = %w{GET PUT HEAD}
+          unless allowed_methods.include?(method)
+            raise ArgumentError.new("Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(', ')}")
           end
+          
 
-          method         = 'GET'
           expires        = expires.to_i
           object_path_escaped   = "#{@path}/#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object,"/")}"
           object_path_unescaped = "#{@path}/#{Fog::OpenStack.escape(container)}/#{object}"
@@ -31,9 +69,9 @@ module Fog
           hmac = Fog::HMAC.new('sha1', @openstack_temp_url_key)
           sig  = sig_to_hex(hmac.sign(string_to_sign))
 
-          "https://#{@host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
+          "#{scheme}://#{@host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
         end
-
+        
         private
 
         def sig_to_hex(str)

data/lib/fog/openstack/requests/storage/put_dynamic_obj_manifest.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Storage
+    class OpenStack
+      class Real
+
+        # Create a new dynamic large object manifest
+        #
+        # Creates an object with a +X-Object-Manifest+ header that specifies the common prefix ("<container>/<prefix>")
+        # for all uploaded segments. Retrieving the manifest object streams all segments matching this prefix.
+        # Segments must sort in the order they should be concatenated. Note that any future objects stored in the container
+        # along with the segments that match the prefix will be included when retrieving the manifest object.
+        #
+        # All segments must be stored in the same container, but may be in a different container than the manifest object.
+        # The default +X-Object-Manifest+ header is set to "+container+/+object+", but may be overridden in +options+
+        # to specify the prefix and/or the container where segments were stored.
+        # If overridden, names should be CGI escaped (excluding spaces) if needed (see {Fog::OpenStack.escape}).
+        #
+        # @param container [String] Name for container where +object+ will be stored. Should be < 256 bytes and must not contain '/'
+        # @param object [String] Name for manifest object.
+        # @param options [Hash] Config headers for +object+.
+        # @option options [String] 'X-Object-Manifest' ("container/object") "<container>/<prefix>" for segment objects.
+        #
+        # @raise [Fog::Storage::OpenStack::NotFound] HTTP 404
+        # @raise [Excon::Errors::BadRequest] HTTP 400
+        # @raise [Excon::Errors::Unauthorized] HTTP 401
+        # @raise [Excon::Errors::HTTPStatusError]
+        #
+        # @see http://docs.openstack.org/api/openstack-object-storage/1.0/content/dynamic-large-object-creation.html
+        def put_dynamic_obj_manifest(container, object, options = {})
+          path = "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}"
+          headers = {'X-Object-Manifest' => path}.merge(options)
+          request(
+            :expects  => 201,
+            :headers  => headers,
+            :method   => 'PUT',
+            :path     => path
+          )
+        end
+
+      end
+    end
+  end
+end