fog 1.9.0 → 1.10.0

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

@@ -0,0 +1,94 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/storage/file'
+
+module Fog
+  module Storage
+    class OpenStack
+
+      class Files < Fog::Collection
+
+        attribute :directory
+        attribute :limit
+        attribute :marker
+        attribute :path
+        attribute :prefix
+
+        model Fog::Storage::OpenStack::File
+
+        def all(options = {})
+          requires :directory
+          options = {
+            'limit'   => limit,
+            'marker'  => marker,
+            'path'    => path,
+            'prefix'  => prefix
+          }.merge!(options)
+          merge_attributes(options)
+          parent = directory.collection.get(
+            directory.key,
+            options
+          )
+          if parent
+            load(parent.files.map {|file| file.attributes})
+          else
+            nil
+          end
+        end
+
+        alias :each_file_this_page :each
+        def each
+          if !block_given?
+            self
+          else
+            subset = dup.all
+
+            subset.each_file_this_page {|f| yield f}
+            while subset.length == (subset.limit || 10000)
+              subset = subset.all(:marker => subset.last.key)
+              subset.each_file_this_page {|f| yield f}
+            end
+
+            self
+          end
+        end
+
+        def get(key, &block)
+          requires :directory
+          data = service.get_object(directory.key, key, &block)
+          file_data = data.headers.merge({
+            :body => data.body,
+            :key  => key
+          })
+          new(file_data)
+        rescue Fog::Storage::OpenStack::NotFound
+          nil
+        end
+
+        def get_url(key)
+          requires :directory
+          if self.directory.public_url
+            "#{self.directory.public_url}/#{Fog::OpenStack.escape(key, '/')}"
+          end
+        end
+
+        def head(key, options = {})
+          requires :directory
+          data = service.head_object(directory.key, key)
+          file_data = data.headers.merge({
+            :key => key
+          })
+          new(file_data)
+        rescue Fog::Storage::OpenStack::NotFound
+          nil
+        end
+
+        def new(attributes = {})
+          requires :directory
+          super({ :directory => directory }.merge!(attributes))
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Fog
       end
 
       class Mock
-        def allocate_address
+        def allocate_address(pool = nil)
           response = Excon::Response.new
           response.status = 200
           response.headers = {

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

@@ -0,0 +1,43 @@
+module Fog
+  module Compute
+    class OpenStack
+
+      class Real
+
+        def delete_meta(collection_name, parent_id, key)
+          request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => "#{collection_name}/#{parent_id}/metadata/#{key}"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def delete_meta(collection_name, parent_id, key)
+
+          if collection_name == "images" then
+            if not list_images_detail.body['images'].detect {|_| _['id'] == parent_id}
+              raise Fog::Compute::OpenStack::NotFound
+            end
+          end
+
+          if collection_name == "servers" then
+            if not list_servers_detail.body['servers'].detect {|_| _['id'] == parent_id}
+              raise Fog::Compute::OpenStack::NotFound
+            end
+          end
+
+          response = Excon::Response.new
+          response.status = 204
+          response
+
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -73,7 +73,7 @@ module Fog
             'totalRAMUsed'             => -2048,
             'totalInstancesUsed'       => -1,
             'totalSecurityGroupsUsed'  => 0,
-            'totalKeyPairsUsed'        => 0
+            'totalFloatingIpsUsed'     => 0
           }
 
 

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

@@ -16,7 +16,7 @@ module Fog
 
       class Mock
 
-        def get_snapshot_details(detailed=true)
+        def get_snapshot_details(snapshot_id)
           response = Excon::Response.new
           response.status = 200
           response.body = {

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

@@ -16,7 +16,7 @@ module Fog
 
       class Mock
 
-        def get_volume_details(detailed=true)
+        def get_volume_details(volume_id)
           response = Excon::Response.new
           response.status = 200
           response.body = {

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

@@ -19,7 +19,7 @@ module Fog
 
       class Mock
 
-        def list_servers
+        def list_servers(options = {})
           response = Excon::Response.new
           data = list_servers_detail.body['servers']
           servers = []

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

@@ -21,6 +21,7 @@ module Fog
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = {
+            'tenants_links' => [],
             'tenants' => [
               {'id' => '1',
                'description' => 'Has access to everything',

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

@@ -20,7 +20,7 @@ module Fog
       end # class Real
 
       class Mock
-        def remove_fixed_ip(server_id, network_id)
+        def remove_fixed_ip(server_id, address)
           true
         end # def remove_fixed_ip
       end # class Mock

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

@@ -0,0 +1,46 @@
+module Fog
+  module Compute
+    class OpenStack
+
+      class Real
+
+        def update_meta(collection_name, parent_id, key, value)
+          request(
+            :body     => Fog::JSON.encode({ 'meta' => {key => value}}),
+            :expects  => 200,
+            :method   => 'PUT',
+            :path     => "#{collection_name}/#{parent_id}/metadata/#{key}"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def update_meta(collection_name, parent_id, key, value)
+
+          if collection_name == "images" then
+            if not list_images_detail.body['images'].detect {|_| _['id'] == parent_id}
+              raise Fog::Compute::OpenStack::NotFound
+            end
+          end
+
+          if collection_name == "servers" then
+            if not list_servers_detail.body['servers'].detect {|_| _['id'] == parent_id}
+              raise Fog::Compute::OpenStack::NotFound
+            end
+          end
+
+          #FIXME join w/ existing metadata here
+          response = Excon::Response.new
+          response.body = { "metadata" => {key => value} }
+          response.status = 200
+          response
+
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Fog
 
       class Mock
 
-        def update_server(server_id, options)
+        def update_server(server_id, options = {})
           response = Excon::Response.new
           if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             if options['name']

data/lib/fog/openstack/requests/identity/delete_user_role.rb

@@ -5,7 +5,7 @@ module Fog
 
         def delete_user_role(tenant_id, user_id, role_id)
           request(
-            :expects  => 200,
+            :expects  => 204,
             :method   => 'DELETE',
             :path     => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}"
           )
@@ -16,7 +16,7 @@ module Fog
       class Mock
         def delete_user_role(tenant_id, user_id, role_id)
           response = Excon::Response.new
-          response.status = 200
+          response.status = 204
           response
         end
       end

data/lib/fog/openstack/requests/identity/get_user_by_name.rb

@@ -18,9 +18,9 @@ module Fog
         def get_user_by_name(name)
           response = Excon::Response.new
           response.status = 200
-
+          user = self.data[:users].values.select {|user| user['name'] == name}[0]
           response.body = {
-            'users' => self.data[:users].values
+            'user' => user
           }
           response
         end

data/lib/fog/openstack/requests/image/create_image.rb

@@ -27,7 +27,7 @@ module Fog
 
           unless attributes[:properties].nil?
             attributes[:properties].each do |key,value|
-              data['x-image-meta-property-#{key}'] = value
+              data["x-image-meta-property-#{key}"] = value
             end
           end
 

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

@@ -5,14 +5,14 @@ module Fog
       class Real
         def associate_floating_ip(floating_ip_id, port_id, options = {})
           data = {
-            'floating_ip' => {
+            'floatingip' => {
               'port_id'    => port_id,
             }
           }
 
           vanilla_options = [:fixed_ip_address]
           vanilla_options.reject{ |o| options[o].nil? }.each do |key|
-            data['floating_ip'][key] = options[key]
+            data['floatingip'][key] = options[key]
           end
 
           request(
@@ -39,7 +39,7 @@ module Fog
           }
 
           self.data[:floating_ips][data['floating_ip_id']] = data
-          response.body = { 'floating_ip' => data }
+          response.body = { 'floatingip' => data }
           response
         end
       end

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

@@ -5,7 +5,7 @@ module Fog
       class Real
         def create_floating_ip(floating_network_id, options = {})
           data = {
-            'floating_ip' => {
+            'floatingip' => {
               'floating_network_id' => floating_network_id,
               'port_id' => options[:port_id],
               'tenant_id' => options[:tenant_id],
@@ -15,7 +15,7 @@ module Fog
 
           vanilla_options = [:port_id, :tenant_id, :fixed_ip_address ]
           vanilla_options.reject{ |o| options[o].nil? }.each do |key|
-            data['floating_ip'][key] = options[key]
+            data['floatingip'][key] = options[key]
           end
 
           request(
@@ -40,7 +40,7 @@ module Fog
             'router_id'           => nil,
           }
           self.data[:floating_ips][data['id']] = data
-          response.body = { 'floating_ip' => data }
+          response.body = { 'floatingip' => data }
           response
         end
       end

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

@@ -15,7 +15,7 @@ module Fog
       class Mock
         def delete_floating_ip(floating_ip_id)
           response = Excon::Response.new
-          if list_floating_ips.body['floating_ips'].map { |r| r['id'] }.include? floating_ip_id
+          if list_floating_ips.body['floatingips'].map { |r| r['id'] }.include? floating_ip_id
             self.data[:floating_ips].delete(floating_ip_id)
             response.status = 204
             response

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

@@ -5,14 +5,14 @@ module Fog
       class Real
         def disassociate_floating_ip(floating_ip_id, options = {})
           data = {
-            'floating_ip' => {
+            'floatingip' => {
               'port_id'    => nil,
             }
           }
 
           vanilla_options = [:fixed_ip_address]
           vanilla_options.reject{ |o| options[o].nil? }.each do |key|
-            data['floating_ip'][key] = options[key]
+            data['floatingip'][key] = options[key]
           end
 
           request(
@@ -39,7 +39,7 @@ module Fog
           }
 
           self.data[:floating_ips][data['floating_ip_id']] = data
-          response.body = { 'floating_ip' => data }
+          response.body = { 'floatingip' => data }
           response
         end
       end

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

@@ -18,7 +18,7 @@ module Fog
           if data = self.data[:floating_ips][floating_ip_id]
             response.status = 200
             response.body = {
-              "floating_ip" => {
+              "floatingip" => {
                 "id"                  => "00000000-0000-0000-0000-000000000000",
                 # changed
                 # "floating_ip_id" => floating_ip_id,

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

@@ -16,7 +16,7 @@ module Fog
       class Mock
         def list_floating_ips(filters = {})
           Excon::Response.new(
-            :body   => { 'floating_ips' => self.data[:floating_ips].values },
+            :body   => { 'floatingips' => self.data[:floating_ips].values },
             :status => 200
           )
         end

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

@@ -0,0 +1,27 @@
+module Fog
+  module Storage
+    class OpenStack
+      class Real
+
+        # Copy object
+        #
+        # ==== Parameters
+        # * source_container_name<~String> - Name of source bucket
+        # * source_object_name<~String> - Name of source object
+        # * target_container_name<~String> - Name of bucket to create copy in
+        # * target_object_name<~String> - Name for new copy of object
+        # * options<~Hash> - Additional headers
+        def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options={})
+          headers = { 'X-Copy-From' => "/#{source_container_name}/#{source_object_name}" }.merge(options)
+          request({
+            :expects  => 201,
+            :headers  => headers,
+            :method   => 'PUT',
+            :path     => "#{Fog::OpenStack.escape(target_container_name)}/#{Fog::OpenStack.escape(target_object_name)}"
+          })
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Fog
+  module Storage
+    class OpenStack
+      class Real
+
+        # Delete an existing container
+        #
+        # ==== Parameters
+        # * name<~String> - Name of container to delete
+        #
+        def delete_container(name)
+          request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => Fog::OpenStack.escape(name)
+          )
+        end
+
+      end
+    end
+  end
+end