fog 1.8.0 → 1.9.0

data/lib/fog/openstack/README.identity.md

@@ -0,0 +1,69 @@
+# OpenStack Identity Service (Keystone) Example
+
+    require 'fog'
+    require 'pp'
+    
+    auth_url = "https://example.net/v2.0/tokens"
+    username = 'admin@example.net'
+    password = 'secret'
+    
+    keystone = Fog::Identity.new :provider           => 'OpenStack',
+                                 :openstack_auth_url => auth_url,
+                                 :openstack_username => username,
+                                 :openstack_api_key  => password
+                                 # Optional, self-signed certs
+                                 #:connection_options => { :ssl_verify_peer => false }
+    
+    #
+    # Listing keystone tenants
+    #
+    keystone.tenants.each do |tenant|
+      # <Fog::Identity::OpenStack::Tenant
+      #   id="46b4ab...",
+      #   description=nil,
+      #   enabled=1,
+      #   name="admin@example.net"
+      # >
+      #pp tenant
+    end
+    
+    #
+    # List users
+    #
+    keystone.users.each do |user|
+      # <Fog::Identity::OpenStack::User
+      #   id="c975f...",
+      #   email="quantum@example.net",
+      #   enabled=true,
+      #   name="quantum",
+      #   tenant_id="00928...",
+      #   password=nil
+      # >
+      # ...
+      #pp user
+    end
+    
+    #
+    # Create a new tenant
+    #
+    tenant = keystone.tenants.create :name        => 'rubiojr@example.net',
+                                     :description => 'My foo tenant'
+    
+    #
+    # Create a new user
+    #
+    user = keystone.users.create :name      => 'rubiojr@example.net',
+                                 :tenant_id => tenant.id,
+                                 :password  => 'rubiojr@example.net',
+                                 :email     => 'rubiojr@example.net'
+    
+    
+    # Find the recently created tenant
+    tenant = keystone.tenants.find { |t| t.name == 'rubiojr@example.net' }
+    # Destroy the tenant
+    tenant.destroy
+    
+    # Find the recently created user 
+    user = keystone.users.find { |u| u.name == 'rubiojr@example.net' }
+    # Destroy the user
+    user.destroy

data/lib/fog/openstack/compute.rb

@@ -7,7 +7,8 @@ module Fog
 
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url,
-                 :persistent, :openstack_service_name, :openstack_tenant,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region
 
@@ -187,18 +188,39 @@ module Fog
               },
               :servers => {},
               :key_pairs => {},
-              :security_groups => {},
+              :security_groups => {
+                0 => {
+                  "id"          => 0,
+                  "tenant_id"   => Fog::Mock.random_hex(8),
+                  "name"        => "default",
+                  "description" => "default",
+                  "rules"       => [
+                    { "id"              => 0,
+                      "parent_group_id" => 0,
+                      "from_port"       => 68,
+                      "to_port"         => 68,
+                      "ip_protocol"     => "udp",
+                      "ip_range"        => { "cidr" => "0.0.0.0/0" },
+                      "group"           => {}, },
+                  ],
+                },
+              },
+              :server_security_group_map => {},
               :addresses => {},
               :quota => {
-                'metadata_items' => 128,
-                'key_pairs' => 10,
+                'security_group_rules' => 20,
+                'security_groups' => 10,
                 'injected_file_content_bytes' => 10240,
                 'injected_file_path_bytes' => 256,
                 'injected_files' => 5,
-                'ram' => 51200,
-                'floating_ips' => 10,
-                'instances' => 10,
-                'cores' => 20,
+                'metadata_items' => 128,
+                'floating_ips'   => 10,
+                'instances'      => 10,
+                'key_pairs'      => 10,
+                'gigabytes'      => 5000,
+                'volumes'        => 10,
+                'cores'          => 20,
+                'ram'            => 51200
               }
             }
           end
@@ -210,9 +232,10 @@ module Fog
 
         def initialize(options={})
           @openstack_username = options[:openstack_username]
-          @openstack_tenant   = options[:openstack_tenant]
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
 
+          @current_tenant = options[:openstack_tenant]
+
           @auth_token = Fog::Mock.random_base64(64)
           @auth_token_expiration = (Time.now.utc + 86400).iso8601
 
@@ -227,11 +250,11 @@ module Fog
         end
 
         def data
-          self.class.data["#{@openstack_username}-#{@openstack_tenant}"]
+          self.class.data["#{@openstack_username}-#{@current_tenant}"]
         end
 
         def reset_data
-          self.class.data.delete("#{@openstack_username}-#{@openstack_tenant}")
+          self.class.data.delete("#{@openstack_username}-#{@current_tenant}")
         end
 
         def credentials
@@ -268,8 +291,9 @@ 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] || ['nova', 'compute']
-          @openstack_identity_service_name = options[:openstack_identity_service_name] || 'identity'
+          @openstack_service_type = options[:openstack_service_type] || ['nova', 'compute']
+          @openstack_service_name = options[:openstack_service_name]
+          @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity'
           @openstack_region      = options[:openstack_region]
 
           @connection_options = options[:connection_options] || {}
@@ -345,11 +369,13 @@ module Fog
               :openstack_auth_uri   => @openstack_auth_uri,
               :openstack_region     => @openstack_region,
               :openstack_tenant     => @openstack_tenant,
+              :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
-              :openstack_identity_service_name => @openstack_identity_service_name
+              :openstack_identity_service_type => @openstack_identity_service_type
             }
 
             if @openstack_auth_uri.path =~ /\/v2.0\//
+
               credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
             else
               credentials = Fog::OpenStack.authenticate_v1(options, @connection_options)
@@ -371,15 +397,20 @@ module Fog
 
           @path.sub!(/\/$/, '')
           unless @path.match(/1\.1|v2/)
-            raise Fog::Compute::OpenStack::ServiceUnavailable.new(
+            raise Fog::OpenStack::Errors::ServiceUnavailable.new(
                     "OpenStack binding only supports version 2 (a.k.a. 1.1)")
           end
 
           @port   = uri.port
           @scheme = uri.scheme
-          @identity_connection = Fog::Connection.new(
-            @openstack_identity_public_endpoint,
-            false, @connection_options)
+           
+          # Not all implementations have identity service in the catalog
+          if @openstack_identity_public_endpoint
+            @identity_connection = Fog::Connection.new(
+              @openstack_identity_public_endpoint,
+              false, @connection_options)
+          end
+
           true
         end
 

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'
 
@@ -53,6 +55,10 @@ module Fog
 
       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
@@ -63,31 +69,36 @@ module Fog
         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)
@@ -175,7 +186,8 @@ 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] || ['identity']
+          @openstack_service_type = options[:openstack_service_type] || ['identity']
+          @openstack_service_name = options[:openstack_service_name]
 
           @connection_options = options[:connection_options] || {}
 
@@ -205,6 +217,7 @@ module Fog
         end
 
         def request(params)
+          retried = false
           begin
             response = @connection.request(params.merge({
               :headers  => {
@@ -218,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
@@ -249,6 +261,7 @@ module Fog
               :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'
             }

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] || {}
 
@@ -178,9 +182,11 @@ module Fog
               :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

@@ -18,7 +18,8 @@ module Fog
         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
 
@@ -29,13 +30,13 @@ module Fog
           attributes[:disabled] = self.disabled || false
           attributes[:swap] = self.swap || 0
           attributes[:rxtx_factor] = self.rxtx_factor || 1.0
-          merge_attributes(connection.create_flavor(self.attributes).body['flavor'])
+          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