fog 1.7.0 → 1.8.0

data/lib/fog/openstack/compute.rb

@@ -69,6 +69,7 @@ module Fog
       request :remove_fixed_ip
       request :server_diagnostics
       request :boot_from_snapshot
+      request :reset_server_state
 
       # Server Extenstions
       request :get_console_output
@@ -125,6 +126,7 @@ module Fog
       # Tenant
       request :list_tenants
       request :set_tenant
+      request :get_limits
 
       # Volume
       request :list_volumes
@@ -189,13 +191,13 @@ module Fog
               :addresses => {},
               :quota => {
                 'metadata_items' => 128,
+                'key_pairs' => 10,
                 'injected_file_content_bytes' => 10240,
+                'injected_file_path_bytes' => 256,
                 'injected_files' => 5,
-                'gigabytes' => 1000,
                 'ram' => 51200,
                 'floating_ips' => 10,
                 'instances' => 10,
-                'volumes' => 10,
                 'cores' => 20,
               }
             }
@@ -249,9 +251,10 @@ module Fog
 
         def initialize(options={})
           @openstack_auth_token = options[:openstack_auth_token]
+          @auth_token        = options[:openstack_auth_token]
           @openstack_identity_public_endpoint = options[:openstack_identity_endpoint]
 
-          unless @openstack_auth_token
+          unless @auth_token
             missing_credentials = Array.new
             @openstack_api_key  = options[:openstack_api_key]
             @openstack_username = options[:openstack_username]
@@ -300,6 +303,7 @@ module Fog
             response = @connection.request(params.merge({
               :headers  => {
                 'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
               :host     => @host,
@@ -333,14 +337,14 @@ module Fog
         private
 
         def authenticate
-          if @openstack_must_reauthenticate || @openstack_auth_token.nil?
+          if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
-              :openstack_api_key  => @openstack_api_key,
-              :openstack_username => @openstack_username,
-              :openstack_auth_token => @openstack_auth_token,
-              :openstack_auth_uri => @openstack_auth_uri,
-              :openstack_region   => @openstack_region,
-              :openstack_tenant   => @openstack_tenant,
+              :openstack_api_key    => @openstack_api_key,
+              :openstack_username   => @openstack_username,
+              :openstack_auth_token => @auth_token,
+              :openstack_auth_uri   => @openstack_auth_uri,
+              :openstack_region     => @openstack_region,
+              :openstack_tenant     => @openstack_tenant,
               :openstack_service_name => @openstack_service_name,
               :openstack_identity_service_name => @openstack_identity_service_name
             }
@@ -359,12 +363,9 @@ module Fog
             @auth_token_expiration    = credentials[:expires]
             @openstack_management_url = credentials[:server_management_url]
             @openstack_identity_public_endpoint  = credentials[:identity_public_endpoint]
-            uri = URI.parse(@openstack_management_url)
-          else
-            @auth_token = @openstack_auth_token
-            uri = URI.parse(@openstack_management_url)
           end
 
+          uri = URI.parse(@openstack_management_url)
           @host   = uri.host
           @path, @tenant_id = uri.path.scan(/(\/.*)\/(.*)/).flatten
 

data/lib/fog/openstack/identity.rb

@@ -51,12 +51,16 @@ module Fog
       request :get_role
       request :list_roles
 
+      request :set_tenant
+
 
       class Mock
         attr_reader :auth_token
+        attr_reader :unscoped_token
         attr_reader :auth_token_expiration
         attr_reader :current_user
         attr_reader :current_tenant
+        attr_reader :unscoped_token
 
         def self.data
           @users   ||= {}
@@ -114,6 +118,7 @@ module Fog
           @current_user = self.data[:users].values.find do |u|
             u['name'] == @openstack_username
           end
+          @current_tenant_id = Fog::Mock.random_hex(32)
 
           unless @current_user
             @current_user_id = Fog::Mock.random_hex(32)
@@ -151,6 +156,7 @@ module Fog
       class Real
         attr_reader :current_user
         attr_reader :current_tenant
+        attr_reader :unscoped_token
 
         def initialize(options={})
           @openstack_auth_token = options[:openstack_auth_token]
@@ -166,7 +172,7 @@ module Fog
           end
 
           @openstack_tenant   = options[:openstack_tenant]
-          @openstack_auth_uri   = URI.parse(options[:openstack_auth_url])
+          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
           @openstack_management_url       = options[:openstack_management_url]
           @openstack_must_reauthenticate  = false
           @openstack_service_name = options[:openstack_service_name] || ['identity']
@@ -203,6 +209,7 @@ module Fog
             response = @connection.request(params.merge({
               :headers  => {
                 'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
               :host     => @host,
@@ -235,7 +242,7 @@ module Fog
         private
 
         def authenticate
-          if @openstack_must_reauthenticate || @openstack_auth_token.nil?
+          if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
@@ -255,6 +262,7 @@ module Fog
             @auth_token = credentials[:token]
             @openstack_management_url = credentials[:server_management_url]
             @openstack_current_user_id = credentials[:current_user_id]
+            @unscoped_token = credentials[:unscoped_token]
             uri = URI.parse(@openstack_management_url)
           else
             @auth_token = @openstack_auth_token

data/lib/fog/openstack/image.rb

@@ -172,7 +172,7 @@ module Fog
         private
 
         def authenticate
-          if @openstack_must_reauthenticate || @openstack_auth_token.nil?
+          if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
               :openstack_tenant   => @openstack_tenant,
               :openstack_api_key  => @openstack_api_key,

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

@@ -14,6 +14,8 @@ module Fog
         attribute :swap
         attribute :rxtx_factor
         attribute :ephemeral, :aliases => 'OS-FLV-EXT-DATA:ephemeral'
+        attribute :is_public, :aliases => 'os-flavor-access:is_public'
+        attribute :disabled, :aliases => 'OS-FLV-DISABLED:disabled'
 
         def initialize(attributes)
           @connection = attributes[:connection]
@@ -23,8 +25,10 @@ module Fog
         def save
           requires :name, :ram, :vcpus, :disk
           attributes[:ephemeral] = self.ephemeral || 0
+          attributes[:is_public] = self.is_public || false
+          attributes[:disabled] = self.disabled || false
           attributes[:swap] = self.swap || 0
-          attributes[:rxtx_factor] = self.rxtx_factor || 1
+          attributes[:rxtx_factor] = self.rxtx_factor || 1.0
           merge_attributes(connection.create_flavor(self.attributes).body['flavor'])
           self
         end

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

@@ -17,7 +17,7 @@ module Fog
         def save
           requires :name, :description
           data = connection.create_security_group(name, description)
-          merge_attributes(data.body['security_groups'])
+          merge_attributes(data.body['security_group'])
           true
         end
 

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

@@ -195,6 +195,11 @@ module Fog
           connection.disassociate_address id, floating_ip
         end
 
+        def reset_vm_state(vm_state)
+          requires :id
+          connection.reset_server_state id, vm_state
+        end
+
         def min_count=(new_min_count)
           @min_count = new_min_count
         end

data/lib/fog/openstack/models/identity/users.rb

@@ -7,10 +7,9 @@ module Fog
       class Users < Fog::Collection
         model Fog::Identity::OpenStack::User
 
-        attribute :tenant
+        attribute :tenant_id
 
         def all
-          tenant_id = tenant.nil? ? nil : tenant.id
           load(connection.list_users(tenant_id).body['users'])
         end
 

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

@@ -29,6 +29,7 @@ module Fog
               'id' => attributes[:flavor_id],
               'swap' => attributes[:swap],
               'OS-FLV-EXT-DATA:ephemeral' => attributes[:ephemeral],
+              'os-flavor-access:is_public' => attributes[:is_public],
               'rxtx_factor' => attributes[:rxtx_factor]
             }
           }
@@ -67,8 +68,10 @@ module Fog
                   "rel" => "bookmark"
                 }
               ],
-              "rxtx_factor" => attributes[:rxtx_factor] || 1,
+              "rxtx_factor" => attributes[:rxtx_factor] || 1.0,
               "OS-FLV-EXT-DATA:ephemeral" => attributes[:ephemeral] || 0,
+              "os-flavor-access:is_public" => attributes[:is_public] || false,
+              "OS-FLV-DISABLED:disabled" => attributes[:disabled] || false,
               "ram" => attributes[:ram],
               "id" => "11",
               "swap" => attributes[:swap] || ""

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

@@ -41,7 +41,7 @@ module Fog
             'Content-Length' => Fog::Mock.random_numbers(3).to_s,
             'Date'           => Date.new}
           response.body = {
-            'security_group' => self.data[:security_groups].values
+            'security_group' => self.data[:security_groups][security_group_id]
           }
           response
         end

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

@@ -0,0 +1,93 @@
+module Fog
+  module Compute
+    class OpenStack
+
+      # http://docs.openstack.org/api/openstack-compute/2/content/ProgramaticLimits.html
+      #
+      class Real
+        def get_limits
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => '/limits.json'
+          )
+        end
+      end
+
+
+      class Mock
+        def get_limits
+          rate_limits = [
+            { 'regex' => '.*',
+              'limit' => [
+                { 'next-available' => '2012-11-22T16:13:44Z',
+                  'unit'           => 'MINUTE',
+                  'verb'           => 'POST',
+                  'remaining'      => 9,
+                  'value'          => 10 },
+                { 'next-available' => '2012-11-23T00:46:14Z',
+                  'unit'           => 'MINUTE',
+                  'verb'           => 'PUT',
+                  'remaining'      => 10,
+                  'value' => 10 },
+                { 'next-available' => '2012-11-22T16:14:30Z',
+                  'unit'           => 'MINUTE',
+                  'verb'           => 'DELETE',
+                  'remaining'      => 99,
+                  'value'          => 100 } ],
+                'uri' => '*' },
+            { 'regex' => '^/servers',
+              'limit' => [
+                { 'next-available' => '2012-11-23T00:46:14Z',
+                  'unit'           => 'DAY',
+                  'verb'           => 'POST',
+                  'remaining'      => 50,
+                  'value'          => 50} ],
+              'uri'=>'*/servers' },
+            { 'regex' => '.*changes-since.*',
+              'limit' => [
+                { 'next-available' => '2012-11-23T00:46:14Z',
+                  'unit'           => 'MINUTE',
+                  'verb'           => 'GET',
+                  'remaining'      => 3,
+                  'value'          => 3 } ],
+              'uri' => '*changes-since*' }
+          ]
+
+          absolute_limits = {
+            # Max
+            'maxServerMeta'            => 128,
+            'maxTotalInstances'        => 10,
+            'maxPersonality'           => 5,
+            'maxImageMeta'             => 128,
+            'maxPersonalitySize'       => 10240,
+            'maxSecurityGroupRules'    => 20,
+            'maxTotalKeypairs'         => 100,
+            'maxSecurityGroups'        => 10,
+            'maxTotalCores'            => 20,
+            'maxTotalFloatingIps'      => 10,
+            'maxTotalRAMSize'          => 51200,
+
+            # Used
+            'totalCoresUsed'           => -1,
+            'totalRAMUsed'             => -2048,
+            'totalInstancesUsed'       => -1,
+            'totalSecurityGroupsUsed'  => 0,
+            'totalKeyPairsUsed'        => 0
+          }
+
+
+          Excon::Response.new(
+            :status => 200,
+            :body => {
+              'limits' => {
+                'rate'     => rate_limits,
+                'absolute' => absolute_limits }
+            }
+          )
+        end
+      end
+
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module Fog
           response = @identity_connection.request({
             :expects => [200, 204],
             :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
                          'X-Auth-Token' => @auth_token},
             :method  => 'GET',
             :path    => '/v2.0/tenants'

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

@@ -15,8 +15,20 @@ module Fog
 
       class Mock
 
+        def release_address(address_id)
+          response = Excon::Response.new
+          response.status = 202
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response.body = {}
+          response
+        end
+
+      end # mock
 
-      end
     end
   end
 end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+
+        def reset_server_state(server_id, status)
+          body = { 'os-resetState' => { 'state' => status } }
+          server_action(server_id, body, 202)
+        end
+
+      end
+
+      class Mock
+
+        def reset_server_state(server_id, status)
+          response = get_server_details(server_id)
+          response.body['server']['status'] = status.upcase
+          response
+        end
+
+      end
+    end
+  end
+end

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

@@ -21,7 +21,7 @@ module Fog
       class Mock
         def create_role(name)
           data = {
-            'id'   => Fog::Mock.random_numbers(6).to_s,
+            'id'   => Fog::Mock.random_base64(64),
             'name' => name
           }
           self.data[:roles][data['id']] = data

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

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+
+      class Real
+        def set_tenant(tenant)
+          @openstack_must_reauthenticate = true
+          @openstack_tenant = tenant.to_s
+          authenticate
+        end
+      end
+
+      class Mock
+        def set_tenant(tenant)
+          true
+        end
+      end
+
+    end # class OpenStack
+  end # module Identity
+end # module Fog

data/lib/fog/openstack/volume.rb

@@ -142,6 +142,7 @@ module Fog
             response = @connection.request(params.merge({
               :headers  => {
                 'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
               :host     => @host,
@@ -174,7 +175,7 @@ module Fog
         private
 
         def authenticate
-          if @openstack_must_reauthenticate || @openstack_auth_token.nil?
+          if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
               :openstack_tenant   => @openstack_tenant,
               :openstack_api_key  => @openstack_api_key,