fog 1.4.0 → 1.5.0

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

@@ -19,18 +19,7 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           response.body = {
-            'quota_set' => {
-              'metadata_items' => 128,
-              'injected_file_content_bytes' => 10240,
-              'injected_files' => 5,
-              'gigabytes' => 1000,
-              'ram' => 51200,
-              'floating_ips' => 10,
-              'instances' => 10,
-              'volumes' => 10,
-              'cores' => 20,
-              'id' => tenant_id
-            }
+            'quota_set' => self.data[:quota].merge({'id' => tenant_id})
           }
           response
         end

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

@@ -30,7 +30,7 @@ module Fog
               'status'             => 'online',
               'availabilityZone'   => 'nova',
               'createdAt'          => Time.now,
-              'attchments'         => []
+              'attachments'         => []
             }
           }
           response

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

@@ -20,13 +20,13 @@ module Fog
           response.status = 200
           response.body = {
             'flavors' => [
-              { 'name' => '256 server', 'id' => '1', 'links' => [] },
-              { 'name' => '512 server', 'id' => '2', 'links' => [] },
-              { 'name' => '1GB server', 'id' => '3', 'links' => [] },
-              { 'name' => '2GB server', 'id' => '4', 'links' => [] },
-              { 'name' => '4GB server', 'id' => '5', 'links' => [] },
-              { 'name' => '8GB server', 'id' => '6', 'links' => [] },
-              { 'name' => '15.5GB server', 'id' => '7', 'links' => [] }
+              { 'name' => '256 server', 'id' => '1', 'links' => ['https://itdoesntmatterwhatshere.heh'] },
+              { 'name' => '512 server', 'id' => '2', 'links' => ['https://itdoesntmatterwhatshere.heh'] },
+              { 'name' => '1GB server', 'id' => '3', 'links' => ['https://itdoesntmatterwhatshere.heh'] },
+              { 'name' => '2GB server', 'id' => '4', 'links' => ['https://itdoesntmatterwhatshere.heh'] },
+              { 'name' => '4GB server', 'id' => '5', 'links' => ['https://itdoesntmatterwhatshere.heh'] },
+              { 'name' => '8GB server', 'id' => '6', 'links' => ['https://itdoesntmatterwhatshere.heh'] },
+              { 'name' => '15.5GB server', 'id' => '7', 'links' => ['https://itdoesntmatterwhatshere.heh'] }
             ]
           }
           response

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

@@ -20,13 +20,13 @@ module Fog
           response.status = 200
           response.body = {
             'flavors' => [
-              { 'name' => '256 server', 'id' => '1', 'ram' => 256, 'disk' => 10, 'links' => [] },
-              { 'name' => '512 server', 'id' => '2', 'ram' => 512, 'disk' => 20, 'links' => [] },
-              { 'name' => '1GB server', 'id' => '3', 'ram' => 1024, 'disk' => 40, 'links' => [] },
-              { 'name' => '2GB server', 'id' => '4', 'ram' => 2048, 'disk' => 80, 'links' => [] },
-              { 'name' => '4GB server', 'id' => '5', 'ram' => 4096, 'disk' => 160, 'links' => [] },
-              { 'name' => '8GB server', 'id' => '6', 'ram' => 8192, 'disk' => 320, 'links' => [] },
-              { 'name' => '15.5GB server', 'id' => '7', 'ram' => 15872, 'disk' => 620, 'links' => [] }
+              { 'id' => '1', 'name' => '256 server', 'ram' => 256, 'disk' => 10, 'swap' => '1', 'vcpus' => 1, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+              { 'id' => '2', 'name' => '512 server', 'ram' => 512, 'disk' => 20, 'swap' => '1', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+              { 'id' => '3', 'name' => '1GB server', 'ram' => 1024, 'disk' => 40, 'swap' => '2', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+              { 'id' => '4', 'name' => '2GB server', 'ram' => 2048, 'disk' => 80, 'swap' => '4', 'vcpus' => 4, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+              { 'id' => '5', 'name' => '4GB server', 'ram' => 4096, 'disk' => 160, 'swap' => '8', 'vcpus' => 8, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+              { 'id' => '6', 'name' => '8GB server', 'ram' => 8192, 'disk' => 320, 'swap' => '16', 'vcpus' => 16, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+              { 'id' => '7', 'name' => '15.5GB server', 'ram' => 15872, 'disk' => 620, 'swap' => '32', 'vcpus' => 32, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }
             ]
           }
           response

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

@@ -19,7 +19,7 @@ module Fog
 
       class Mock
         def list_security_groups
-          self.data[:security_groups] ||= [
+          self.data[:security_groups] = [
             { "rules" => [
               { "from_port" => 44,
                 "group" => {},
@@ -27,7 +27,7 @@ module Fog
                 "to_port" => 55,
                 "parent_group_id" => 1,
                 "ip_range" => {"cidr"=>"10.10.10.10/24"},
-                "id" => Fog::Mock.random_base64(36)
+                "id" => Fog::Mock.random_numbers(2).to_i
               },
               { "from_port" => 2,
                 "group" => {},
@@ -35,10 +35,10 @@ module Fog
                 "to_port" => 3,
                 "parent_group_id" => 1,
                 "ip_range" => {"cidr"=>"10.10.10.10/24"},
-                "id" => Fog::Mock.random_base64(36)
+                "id" => Fog::Mock.random_numbers(2).to_i
               } ],
               "tenant_id" => @openstack_tenant,
-              "id" => Fog::Mock.random_base64(36),
+              "id" => Fog::Mock.random_numbers(2).to_i,
               "name" => "default",
               "description" => "default"
             },
@@ -50,14 +50,14 @@ module Fog
                 "to_port" => 55,
                 "parent_group_id" => 2,
                 "ip_range" => { "cidr"=>"10.10.10.10/24" },
-                "id"=> Fog::Mock.random_base64(36)
+                "id"=> Fog::Mock.random_numbers(2).to_i
               } ],
             "tenant_id" => @openstack_tenant,
-            "id" => Fog::Mock.random_base64(36),
+            "id" => Fog::Mock.random_numbers(2).to_i,
             "name" => "test",
             "description" => "this is a test"
             }
-          ]
+          ] unless self.data.empty?
           Excon::Response.new(
             :body     => { 'security_groups' => self.data[:security_groups] },
             :headers  => {

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

@@ -3,9 +3,10 @@ module Fog
     class OpenStack
       class Real
 
-        def list_servers_detail(options = {})
+        # Available filters: name, status, image, flavor, changes_since, reservation_id
+        def list_servers_detail(filters = {})
           params = Hash.new
-          params['all_tenants'] = 'True' if options[:all_tenants]
+          filters[:all_tenants] ? params['all_tenants'] = 'True' : params = filters
 
           request(
             :expects  => [200, 203],
@@ -19,7 +20,7 @@ module Fog
 
       class Mock
 
-        def list_servers_detail
+        def list_servers_detail(filters = {})
           response = Excon::Response.new
 
           servers = self.data[:servers].values

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

@@ -26,22 +26,20 @@ module Fog
               "displayName" => "test 1",
               "attachments" => [{}],
               "volumeType" => nil,
-              "snapshotId" => nil,
+              "snapshotId" => Fog::Mock.random_numbers(2),
               "size" => 1,
-              "id" => 6,
-              "createdAt" => "2012-03-30 05:31:00.655058",
-              "metadata" => {} },
+              "id" => "6",
+              "createdAt" => Time.now },
             { "status" => "available",
               "displayDescription" => "",
               "availabilityZone" => "nova",
               "displayName" => "test 2",
               "attachments" => [{}],
               "volumeType" => nil,
-              "snapshotId" => nil,
+              "snapshotId" => Fog::Mock.random_numbers(2),
               "size" => 1,
-              "id" => 8,
-              "createdAt" => "2012-03-30 16:14:55.582717",
-              "metadata" => {} }
+              "id" => "8",
+              "createdAt" => Time.now}
             ]
           response.body = { 'volumes' => self.data[:volumes] }
           response

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

@@ -18,24 +18,11 @@ module Fog
       class Mock
 
         def update_quota(tenant_id, options = {})
-          defaults = {
-            'metadata_items' => 128,
-            'injected_file_content_bytes' => 10240,
-            'injected_files' => 5,
-            'gigabytes' => 1000,
-            'ram' => 51200,
-            'floating_ips' => 10,
-            'instances' => 10,
-            'volumes' => 10,
-            'cores' => 20,
-            'id' => tenant_id
-          }
-
-          defaults.merge options
+          self.data[:quota_updated] = self.data[:quota].merge options
 
           response = Excon::Response.new
           response.status = 200
-          response.body = { 'quota_set' => options }
+          response.body = { 'quota_set' => self.data[:quota_updated] }
           response
         end
 

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

@@ -17,7 +17,7 @@ module Fog
 
         def delete_role(role_id)
           response = Excon::Response.new
-          if role = list_roles.body['roles'][role_id]
+          if list_roles.body['roles'].map { |r| r['id'] }.include? role_id
             self.data[:roles].delete(role_id)
             response.status = 204
             response

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

@@ -17,7 +17,7 @@ module Fog
 
         def list_roles
           Excon::Response.new(
-            :body   => { 'roles' => self.data[:roles] },
+            :body   => { 'roles' => self.data[:roles].values },
             :status => 200
           )
         end

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

@@ -20,7 +20,7 @@ module Fog
           body = String.new
           if attributes[:location]
             file = File.open(attributes[:location], "rb")
-            body = file.read
+            body = file
           end
 
           unless attributes[:properties].nil?
@@ -38,6 +38,8 @@ module Fog
             :method   => 'POST',
             :path     => "images"
           )
+        ensure
+          body.close if body.respond_to?(:close)
         end
 
       end

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

@@ -22,7 +22,25 @@ module Fog
                 "disk_format"=>"ami",
                 "container_format"=>"ami",
                 "id"=>"0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
-                "checksum"=>"2f81976cae15c16ef0010c51e3a6c163"}]
+                "checksum"=>"2f81976cae15c16ef0010c51e3a6c163"},
+               {"name"=>"new image",
+                "size"=>0,
+                "min_disk"=>0,
+                "disk_format"=>nil,
+                "created_at"=>"2012-02-24T06:45:00",
+                "container_format"=>nil,
+                "deleted_at"=>nil,
+                "updated_at"=>"2012-02-24T06:45:00",
+                "checksum"=>nil,
+                "id"=>"e41304f3-2453-42b4-9829-2e220a737395",
+                "deleted"=>false,
+                "protected"=>false,
+                "is_public"=>false,
+                "status"=>"queued",
+                "min_ram"=>0,
+                "owner"=>"728ecc7c10614a1faa6fbabd1a68a4a0",
+                "properties"=>{}
+                }]
           }
           response
         end # def list_tenants

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

@@ -42,8 +42,26 @@ module Fog
              "properties"=>{
                "ramdisk_id"=>"b45aa128-cd36-4ad9-a026-1a1c2bfd8fdc",
                "kernel_id"=>"cd28951e-e1c2-4bc5-95d3-f0495abbcdc5"}
-               }]
-             }
+               },
+            {"name"=>"new image",
+             "size"=>0,
+             "min_disk"=>0,
+             "disk_format"=>nil,
+             "created_at"=>"2012-02-24T06:45:00",
+             "container_format"=>nil,
+             "deleted_at"=>nil,
+             "updated_at"=>"2012-02-24T06:45:00",
+             "checksum"=>nil,
+             "id"=>"e41304f3-2453-42b4-9829-2e220a737395",
+             "deleted"=>false,
+             "protected"=>false,
+             "is_public"=>false,
+             "status"=>"queued",
+             "min_ram"=>0,
+             "owner"=>"728ecc7c10614a1faa6fbabd1a68a4a0",
+             "properties"=>{}
+             }]
+          }
           response
         end # def list_tenants
       end # class Mock

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

@@ -36,7 +36,7 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           response.body = {"image"=>
-                               {"name"=>"new image",
+                               {"name"=>"edit test image",
                                 "size"=>0,
                                 "min_disk"=>0,
                                 "disk_format"=>nil,

data/lib/fog/rackspace.rb

@@ -47,6 +47,8 @@ module Fog
     service(:dns,             'rackspace/dns',            'DNS')
     service(:storage,         'rackspace/storage',        'Storage')
     service(:load_balancers,  'rackspace/load_balancers', 'LoadBalancers')
+    service(:identity,        'rackspace/identity',       'Identity')
+    service(:databases,       'rackspace/databases',      'Databases')
 
     def self.authenticate(options, connection_options = {})
       rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com"

data/lib/fog/rackspace/databases.rb

@@ -0,0 +1,121 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace'))
+
+module Fog
+  module Rackspace
+    class Databases < Fog::Service
+
+      class ServiceError < Fog::Rackspace::Errors::ServiceError; end
+      class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
+      class BadRequest < Fog::Rackspace::Errors::BadRequest; end
+
+      DFW_ENDPOINT = 'https://dfw.databases.api.rackspacecloud.com/v1.0/'
+      LON_ENDPOINT = 'https://lon.databases.api.rackspacecloud.com/v1.0/'
+      ORD_ENDPOINT = 'https://ord.databases.api.rackspacecloud.com/v1.0/'
+
+      requires :rackspace_api_key, :rackspace_username
+      recognizes :rackspace_auth_url
+      recognizes :rackspace_auth_token
+      recognizes :rackspace_endpoint
+
+      model_path 'fog/rackspace/models/databases'
+      model :flavor
+      collection :flavors
+      model :instance
+      collection :instances
+      model :database
+      collection :databases
+      model :user
+      collection :users
+
+      request_path 'fog/rackspace/requests/databases'
+      request :list_flavors
+      request :get_flavor
+
+      request :list_instances
+      request :get_instance
+      request :create_instance
+      request :delete_instance
+      request :check_root_user
+      request :enable_root_user
+      request :restart_instance
+      request :resize_instance
+      request :resize_instance_volume
+
+      request :list_databases
+      request :create_database
+      request :delete_database
+
+      request :list_users
+      request :create_user
+      request :delete_user
+
+      class Mock
+        def request(params)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def initialize(options = {})
+          @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_username = options[:rackspace_username]
+          @rackspace_auth_url = options[:rackspace_auth_url]
+          @rackspace_must_reauthenticate = false
+          @connection_options = options[:connection_options] || {}
+
+          endpoint = options[:rackspace_endpoint] || DFW_ENDPOINT
+          uri = URI.parse(endpoint)
+
+          @host = uri.host
+          @persistent = options[:persistent] || false
+          @path = uri.path
+          @port = uri.port
+          @scheme = uri.scheme
+
+          authenticate
+
+          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+        end
+
+        def request(params)
+          begin
+            response = @connection.request(params.merge!({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }.merge!(params[:headers] || {}),
+              :host     => @host,
+              :path     => "#{@path}/#{params[:path]}"
+            }))
+          rescue Excon::Errors::NotFound => error
+            raise NotFound.slurp error
+          rescue Excon::Errors::BadRequest => error
+            raise BadRequest.slurp error
+          rescue Excon::Errors::InternalServerError => error
+            raise InternalServerError.slurp error
+          rescue Excon::Errors::HTTPStatusError => error
+            raise ServiceError.slurp error
+          end
+          unless response.body.empty?
+            response.body = Fog::JSON.decode(response.body)
+          end
+          response
+        end
+
+        private
+
+        def authenticate
+          options = {
+            :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_username => @rackspace_username,
+            :rackspace_auth_url => @rackspace_auth_url
+          }
+          credentials = Fog::Rackspace.authenticate(options, @connection_options)
+          @auth_token = credentials['X-Auth-Token']
+          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
+          @path = "#{@path}/#{account_id}"
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/identity.rb

@@ -0,0 +1,83 @@
+require 'fog/rackspace'
+
+module Fog
+  module Rackspace
+    class Identity < Fog::Service
+      US_ENDPOINT = 'https://identity.api.rackspacecloud.com/v2.0'
+      UK_ENDPOINT = 'https://lon.identity.api.rackspacecloud.com/v2.0'
+
+      requires :rackspace_username, :rackspace_api_key
+      recognizes :rackspace_auth_url
+
+      model_path 'fog/rackspace/models/identity'
+      model :user
+      collection :users
+      model :role
+      collection :roles
+      model :credential
+      collection :credentials
+      model :tenant
+      collection :tenants
+
+      request_path 'fog/rackspace/requests/identity'
+      request :create_token
+
+      request :list_users
+      request :list_user_roles
+      request :list_credentials
+      request :list_tenants
+      request :get_user_by_id
+      request :get_user_by_name
+      request :create_user
+      request :update_user
+      request :delete_user
+      request :get_credentials
+
+      class Mock
+        def request
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def initialize(options={})
+          @rackspace_username = options[:rackspace_username]
+          @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_auth_url = options[:rackspace_auth_url] || US_ENDPOINT
+
+          uri = URI.parse(@rackspace_auth_url)
+          @host = uri.host
+          @path = uri.path
+          @port = uri.port
+          @scheme = uri.scheme
+          @persistent = options[:persistent] || false
+          @connection_options = options[:connection_options] || {}
+          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+
+          authenticate
+        end
+
+        def request(params)
+          begin
+            parameters = params.merge!({
+              :headers => {
+                'Content-Type' => 'application/json',
+                'X-Auth-Token' => @auth_token
+              },
+              :host => @host,
+              :path => "#{@path}/#{params[:path]}"
+            })
+            response = @connection.request(parameters)
+            response.body = Fog::JSON.decode(response.body) unless response.body.empty?
+            response
+          end
+        end
+
+        def authenticate
+          data = self.create_token(@rackspace_username, @rackspace_api_key).body
+          @auth_token = data['access']['token']['id']
+        end
+      end
+    end
+  end
+end