fog 1.15.0 → 1.16.0

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

@@ -13,7 +13,10 @@ module Fog
           }
 
           vanilla_options = ['metadata', 'accessIPv4', 'accessIPv6',
-                             'availability_zone', 'user_data', 'key_name', 'adminPass']
+                             'availability_zone', 'user_data', 'key_name', 
+                             'adminPass', 'config_drive', 'min_count', 'max_count',
+                             'return_reservation_id'
+                            ]
           vanilla_options.select{|o| options[o]}.each do |key|
             data['server'][key] = options[key]
           end
@@ -44,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
 
@@ -91,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
           }
@@ -107,32 +109,37 @@ module Fog
 
 
           mock_data = {
-            'addresses'  => {},
-            'flavor'     => {"id" => flavor_ref, "links"=>[{"href"=>"http://nova1:8774/admin/flavors/1", "rel"=>"bookmark"}]},
-            'id'         => server_id,
-            'image'      => {"id" => image_ref, "links"=>[{"href"=>"http://nova1:8774/admin/images/#{image_ref}", "rel"=>"bookmark"}]},
-            'links'      => [{"href"=>"http://nova1:8774/v1.1/admin/servers/5", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/servers/5", "rel"=>"bookmark"}],
-            'hostId'     => "123456789ABCDEF01234567890ABCDEF",
-            'metadata'   => options['metadata'] || {},
-            'name'       => name || "server_#{rand(999)}",
-            'accessIPv4' => options['accessIPv4'] || "",
-            'accessIPv6' => options['accessIPv6'] || "",
-            'progress'   => 0,
-            'status'     => 'BUILD',
-            'created'    => '2012-09-27T00:04:18Z',
-            'updated'    => '2012-09-27T00:04:27Z',
-            'user_id'    => @openstack_username,
+            'addresses'    => {},
+            'flavor'       => {"id" => flavor_ref, "links"=>[{"href"=>"http://nova1:8774/admin/flavors/1", "rel"=>"bookmark"}]},
+            'id'           => server_id,
+            'image'        => {"id" => image_ref, "links"=>[{"href"=>"http://nova1:8774/admin/images/#{image_ref}", "rel"=>"bookmark"}]},
+            'links'        => [{"href"=>"http://nova1:8774/v1.1/admin/servers/5", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/servers/5", "rel"=>"bookmark"}],
+            'hostId'       => "123456789ABCDEF01234567890ABCDEF",
+            'metadata'     => options['metadata'] || {},
+            'name'         => name || "server_#{rand(999)}",
+            'accessIPv4'   => options['accessIPv4'] || "",
+            'accessIPv6'   => options['accessIPv6'] || "",
+            'progress'     => 0,
+            'status'       => 'BUILD',
+            'created'      => '2012-09-27T00:04:18Z',
+            'updated'      => '2012-09-27T00:04:27Z',
+            'user_id'      => @openstack_username,
+            'config_drive' => options['config_drive'] || '',
           }
 
-          response_data = {
-            'adminPass'       => 'password',
-            'id'              => server_id,
-            'links'           => mock_data['links'],
-          }
+          response_data = {}
+          if options['return_reservation_id'] == 'True' then
+            response_data = { 'reservation_id' => "r-#{Fog::Mock.random_numbers(6).to_s}" }
+          else   
+            response_data = {
+              'adminPass'       => 'password',
+              'id'              => server_id,
+              'links'           => mock_data['links'],
+            }
+          end
 
           self.data[:last_modified][:servers][server_id] = Time.now
           self.data[:servers][server_id] = mock_data
-
           if security_groups = options['security_groups'] then
             groups = Array(options['security_groups']).map do |sg|
               if sg.is_a?(Fog::Compute::OpenStack::SecurityGroup) then
@@ -148,10 +155,13 @@ module Fog
 
           self.data[:last_modified][:servers][server_id] = Time.now
           self.data[:servers][server_id] = mock_data
-          response.body = { 'server' => response_data }
+          if options['return_reservation_id'] == 'True' then
+            response.body = response_data 
+          else
+            response.body = { 'server' => response_data }
+          end
           response
-        end
-
+        end      
       end
     end
   end

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

@@ -3,11 +3,12 @@ module Fog
     class OpenStack
       class Real
 
-        def list_images_detail
+        def list_images_detail(filters = {})
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => 'images/detail.json'
+            :path     => 'images/detail.json',
+            :query    => filters
           )
         end
 
@@ -15,7 +16,7 @@ module Fog
 
       class Mock
 
-        def list_images_detail
+        def list_images_detail(filters = {})
           response = Excon::Response.new
 
           images = self.data[:images].values

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

@@ -0,0 +1,58 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+
+        # Create a stack.
+        #
+        # * stack_name [String] Name of the stack to create.
+        # * options [Hash]:
+        #   * :template_body [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.
+        #   * :disable_rollback [Boolean] Controls rollback on stack creation failure, defaults to false.
+        #   * :parameters [Hash] Hash of providers to supply to template
+        #   * :timeout_in_minutes [Integer] Minutes to wait before status is set to CREATE_FAILED
+        #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html
+
+        def create_stack(stack_name, options = {})
+          params = {
+            :stack_name => stack_name
+          }.merge(options)
+
+          request(
+            :expects  => 201,
+            :path => 'stacks',
+            :method => 'POST',
+            :body => MultiJson.encode(params)
+          )
+        end
+
+      end
+      
+      class Mock
+        def create_stack(stack_name, options = {})
+          stack_id = Fog::Mock.random_hex(32)
+          stack = self.data[:stacks][stack_id] = {
+            'id' => stack_id,
+            'stack_name' => stack_name,
+            'links' => [],
+            'description' => options[:description],
+            'stack_status' => 'CREATE_COMPLETE',
+            'stack_status_reason' => 'Stack successfully created',
+            'creation_time' => Time.now,
+            'updated_time' => Time.now
+          }
+
+          response = Excon::Response.new
+          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
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+
+        # Delete a stack.
+        #
+        # @param stack_name [String] Name of the stack to delete.
+        # @param stack_id [String] ID of the stack to delete.
+        #
+        # @return [Excon::Response]
+        #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DeleteStack.html
+
+        def delete_stack(stack_name, stack_id)
+          request(
+            :expects  => 204,
+            :path => "stacks/#{stack_name}/#{stack_id}",
+            :method => 'DELETE'
+          )
+        end
+
+      end
+
+      class Mock
+        def delete_stack(stack_name, stack_id)
+          self.data[:stacks].delete(stack_id)
+
+          response = Excon::Response.new
+          response.status = 204
+          response.body = {}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+
+        # List stacks.
+        #
+        # @param options [Hash]
+        #
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * stacks [Array] - Matching stacks
+        #       * stack [Hash]:
+        #         * id [String] -
+        #         * stack_name [String] -
+        #         * description [String]
+        #         * links [Array]
+        #         * stack_status [String] -
+        #         * stack_status_reason [String]
+        #         * creation_time [Time] -
+        #         * updated_time [Time] -
+        #
+        #
+        # @see http://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ListStacks.html
+
+        def list_stacks(options = {})
+          request(
+            :expects  => 200,
+            :path => 'stacks',
+            :method => 'GET',
+            :query => options
+          )
+        end
+
+      end
+
+      class Mock
+        def list_stacks(options = {})
+          stacks = self.data[:stacks].values
+
+          Excon::Response.new(
+            :body   => { 'stacks' => stacks },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+
+        # 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 [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.
+        #
+        def update_stack(stack_id, stack_name, options = {})
+          params = {
+            :stack_name => stack_name
+          }.merge(options)
+
+          request(
+            :expects  => 202,
+            :path => "stacks/#{stack_name}/#{stack_id}",
+            :method => 'PUT',
+            :body => MultiJson.encode(params)
+          )
+        end
+
+      end
+
+      class Mock
+        def update_stack(stack_name, options = {})
+          response = Excon::Response.new
+          response.status = 202
+          response.body = {}
+          response
+        end
+      end
+    end
+  end
+end

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