fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/openstack/identity.rb

@@ -6,7 +6,7 @@ module Fog
 
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_name, :openstack_tenant,
+                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
                  :openstack_api_key, :openstack_username, :openstack_current_user_id,
                  :current_user, :current_tenant
 
@@ -17,6 +17,8 @@ module Fog
       collection  :users
       model       :role
       collection  :roles
+      model       :ec2_credential
+      collection  :ec2_credentials
 
       request_path 'fog/openstack/requests/identity'
 
@@ -51,39 +53,52 @@ module Fog
       request :get_role
       request :list_roles
 
+      request :set_tenant
+
+      request :create_ec2_credential
+      request :delete_ec2_credential
+      request :get_ec2_credential
+      request :list_ec2_credentials
 
       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   ||= {}
-          @roles   ||= {}
-          @tenants ||= {}
+          @users           ||= {}
+          @roles           ||= {}
+          @tenants         ||= {}
+          @ec2_credentials ||= Hash.new { |hash, key| hash[key] = {} }
+          @user_tenant_membership ||= {}
 
           @data ||= Hash.new do |hash, key|
             hash[key] = {
-              :users   => @users,
-              :roles   => @roles,
-              :tenants => @tenants
+              :users           => @users,
+              :roles           => @roles,
+              :tenants         => @tenants,
+              :ec2_credentials => @ec2_credentials,
+              :user_tenant_membership => @user_tenant_membership
             }
           end
         end
 
         def self.reset!
-          @data  = nil
-          @users = nil
-          @roles = nil
-          @tenants = nil
+          @data            = nil
+          @users           = nil
+          @roles           = nil
+          @tenants         = nil
+          @ec2_credentials = nil
         end
 
         def initialize(options={})
           require 'multi_json'
           @openstack_username = options[:openstack_username] || 'admin'
           @openstack_tenant   = options[:openstack_tenant]   || 'admin'
-          @openstack_auth_uri   = URI.parse(options[:openstack_auth_url])
+          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
           @openstack_management_url = @openstack_auth_uri.to_s
 
           @auth_token = Fog::Mock.random_base64(64)
@@ -114,6 +129,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 +167,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,10 +183,11 @@ 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']
+          @openstack_service_type = options[:openstack_service_type] || ['identity']
+          @openstack_service_name = options[:openstack_service_name]
 
           @connection_options = options[:connection_options] || {}
 
@@ -199,10 +217,12 @@ module Fog
         end
 
         def request(params)
+          retried = false
           begin
             response = @connection.request(params.merge({
               :headers  => {
                 'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
               :host     => @host,
@@ -211,13 +231,12 @@ module Fog
               # :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
             }))
           rescue Excon::Errors::Unauthorized => error
-            if error.response.body != 'Bad username or password' # token expiration
-              @openstack_must_reauthenticate = true
-              authenticate
-              retry
-            else # bad credentials
-              raise error
-            end
+            raise if retried
+            retried = true
+
+            @openstack_must_reauthenticate = true
+            authenticate
+            retry
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
@@ -235,13 +254,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_tenant   => @openstack_tenant,
+              :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_endpoint_type => 'adminURL'
             }
@@ -255,6 +275,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

@@ -5,9 +5,9 @@ module Fog
     class OpenStack < Fog::Service
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_name, :openstack_tenant,
+                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
                  :openstack_api_key, :openstack_username,
-                 :current_user, :current_tenant
+                 :current_user, :current_tenant, :openstack_endpoint_type, :openstack_region
 
       model_path 'fog/openstack/models/image'
 
@@ -82,6 +82,7 @@ module Fog
           { :provider                 => 'openstack',
             :openstack_auth_url       => @openstack_auth_uri.to_s,
             :openstack_auth_token     => @auth_token,
+            :openstack_region         => @openstack_region,
             :openstack_management_url => @openstack_management_url }
         end
       end
@@ -109,7 +110,10 @@ module Fog
           @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] || ['image']
+          @openstack_service_type         = options[:openstack_service_type] || ['image']
+          @openstack_service_name         = options[:openstack_service_name]
+          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'adminURL'
+          @openstack_region               = options[:openstack_region]
 
           @connection_options = options[:connection_options] || {}
 
@@ -172,15 +176,17 @@ 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,
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
+              :openstack_region   => @openstack_region,
               :openstack_auth_token => @openstack_auth_token,
+              :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
-              :openstack_endpoint_type => 'adminURL'
+              :openstack_endpoint_type => @openstack_endpoint_type 
             }
 
             credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)

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

@@ -14,14 +14,14 @@ module Fog
         attribute :instance_id
 
         def initialize(attributes = {})
-          # assign server first to prevent race condition with new_record?
+          # assign server first to prevent race condition with persisted?
           self.server = attributes.delete(:server)
           super
         end
 
         def destroy
           requires :id
-          connection.release_address(id)
+          service.release_address(id)
           true
         end
 
@@ -34,8 +34,8 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          data = connection.allocate_address(pool).body['floating_ip']
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          data = service.allocate_address(pool).body['floating_ip']
           new_attributes = data.reject {|key,value| !['id', 'instance_id', 'ip', 'fixed_ip'].include?(key)}
           merge_attributes(new_attributes)
           if @server
@@ -47,19 +47,19 @@ module Fog
         private
 
         def associate(new_server)
-          if new_record?
+          unless persisted?
             @server = new_server
           else
             @server = nil
             self.instance_id = new_server.id
-            connection.associate_address(instance_id, ip)
+            service.associate_address(instance_id, ip)
           end
         end
 
         def disassociate
           @server = nil
-          unless new_record?
-            connection.disassociate_address(instance_id, ip)
+          if persisted?
+            service.disassociate_address(instance_id, ip)
           end
           self.instance_id = nil
         end

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

@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::OpenStack::Address
 
         def all
-          load(connection.list_all_addresses.body['floating_ips'])
+          load(service.list_all_addresses.body['floating_ips'])
         end
 
         def get(address_id)
-          if address = connection.get_address(address_id).body['floating_ip']
+          if address = service.get_address(address_id).body['floating_ip']
             new(address)
           end
         rescue Fog::Compute::OpenStack::NotFound
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get_address_pools
-          connection.list_address_pools.body['floating_ip_pools']
+          service.list_address_pools.body['floating_ip_pools']
         end
 
       end

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

@@ -14,24 +14,29 @@ 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]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         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
-          merge_attributes(connection.create_flavor(self.attributes).body['flavor'])
+          attributes[:rxtx_factor] = self.rxtx_factor || 1.0
+          merge_attributes(service.create_flavor(self.attributes).body['flavor'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_flavor(self.id)
+          service.delete_flavor(self.id)
           true
         end
       end

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::OpenStack::Flavor
 
         def all
-          data = connection.list_flavors_detail.body['flavors']
+          data = service.list_flavors_detail.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor_details(flavor_id).body['flavor']
+          data = service.get_flavor_details(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::OpenStack::NotFound
           nil

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

@@ -12,12 +12,13 @@ module Fog
         attribute :details
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def details
-          connection.get_host_details(self.host_name).body['host']
+          service.get_host_details(self.host_name).body['host']
         end
 
       end

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::OpenStack::Host
 
         def all
-          data = connection.list_hosts.body['hosts']
+          data = service.list_hosts.body['hosts']
           load(data)
         end
 
         def get(host_name)
-          if host = connection.get_host_details(host_name).body['host']
+          if host = service.get_host_details(host_name).body['host']
             new({
               'host_name' => host_name,
               'details' => host}

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

@@ -21,14 +21,15 @@ module Fog
         attribute :links
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def metadata
           @metadata ||= begin
             Fog::Compute::OpenStack::Metadata.new({
-              :connection => connection,
+              :service => service,
               :parent => self
             })
           end
@@ -42,7 +43,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_image(id)
+          service.delete_image(id)
           true
         end
 

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

@@ -12,7 +12,7 @@ module Fog
         attribute :server
 
         def all
-          data = connection.list_images_detail.body['images']
+          data = service.list_images_detail.body['images']
           load(data)
           if server
             self.replace(self.select {|image| image.server_id == server.id})
@@ -20,7 +20,7 @@ module Fog
         end
 
         def get(image_id)
-          data = connection.get_image_details(image_id).body['image']
+          data = service.get_image_details(image_id).body['image']
           new(data)
         rescue Fog::Compute::OpenStack::NotFound
           nil

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

@@ -19,7 +19,7 @@ module Fog
         def destroy
           requires :name
 
-          connection.delete_key_pair(name)
+          service.delete_key_pair(name)
           true
         end
 
@@ -27,9 +27,9 @@ module Fog
           requires :name
 
           data = if public_key
-            connection.create_key_pair(name, public_key).body['keypair']
+            service.create_key_pair(name, public_key).body['keypair']
           else
-            connection.create_key_pair(name).body['keypair']
+            service.create_key_pair(name).body['keypair']
           end
           new_attributes = data.reject {|key,value| !['fingerprint', 'public_key', 'name', 'private_key', 'user_id'].include?(key)}
           merge_attributes(new_attributes)

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

@@ -11,7 +11,7 @@ module Fog
 
         def all
           items = Array.new
-          connection.list_key_pairs.body['keypairs'].each do |kp|
+          service.list_key_pairs.body['keypairs'].each do |kp|
             items = items + kp.values
           end
           load(items)