fog 1.30.0 → 1.31.0

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2014 [CONTRIBUTORS.md](https://github.com/fog/fog/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2009-2015 [CONTRIBUTORS.md](https://github.com/fog/fog/blob/master/CONTRIBUTORS.md)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/Rakefile

@@ -6,6 +6,12 @@ require 'rubygems/package_task'
 require 'yard'
 require File.dirname(__FILE__) + '/lib/fog'
 
+require "tasks/changelog_task"
+Fog::Rake::ChangelogTask.new
+
+require "tasks/github_release_task"
+Fog::Rake::GithubReleaseTask.new
+
 #############################################################################
 #
 # Helper functions
@@ -72,6 +78,9 @@ namespace :test do
   task :openstack do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openstack")
   end
+  task :openstack_idv3 do
+    sh("export FOG_MOCK=#{mock} && bundle exec rspec spec/fog/openstack/identity_v3_spec.rb")
+  end
   task :cloudstack do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/cloudstack")
   end
@@ -160,12 +169,11 @@ end
 
 task :git_mark_release do
   sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
 end
 
 task :git_push_release do
   sh "git push origin master"
-  sh "git push origin v#{version}"
+  ::Rake::Task[:github_release].invoke
 end
 
 task :gem_push do
@@ -215,9 +223,3 @@ YARD::Rake::YardocTask.new do |t|
   t.files   = ['lib/**/*.rb', "README"]
   t.options = ["--output-dir", YARDOC_LOCATION, "--title", "#{name} #{version}"]
 end
-
-require "tasks/changelog_task"
-Fog::Rake::ChangelogTask.new
-
-require "tasks/github_release_task"
-Fog::Rake::GithubReleaseTask.new

data/fog.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = "fog"
-  s.version           = "1.30.0"
-  s.date              = "2015-05-07"
+  s.version           = "1.31.0"
+  s.date              = "2015-06-04"
   s.rubyforge_project = "fog"
 
   ## Make sure your summary is short. The description may be as long
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md]
 
-  s.add_dependency("fog-core", "~> 1.27", ">= 1.27.4")
+  s.add_dependency("fog-core", "~> 1.30")
   s.add_dependency("fog-json")
   s.add_dependency("fog-xml", "~> 0.1.1")
 
@@ -84,6 +84,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency("simplecov")
   s.add_development_dependency("thor")
   s.add_development_dependency("yard")
+  s.add_development_dependency("rspec-core")
+  s.add_development_dependency("vcr")
+  s.add_development_dependency("webmock")
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")

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

@@ -39,6 +39,7 @@ module Fog
         attribute :security_group_list,    :type => :array, :aliases => 'securitygroup'
         attribute :nics,                   :type => :array, :aliases => 'nic'
         attribute :job_id,                                  :aliases => 'jobid'   # only on create
+        attribute :size,                   :type => :integer
 
         attr_accessor :network_ids, :disk_offering_id, :ip_address, :ip_to_network_list
         attr_writer :security_group_ids
@@ -128,6 +129,7 @@ module Fog
             'projectid'         => project_id,
             'keypair'           => key_name,
             'userdata'          => user_data,
+            'size'              => size,
           }
 
           options.merge!('networkids' => network_ids) if network_ids

data/lib/fog/openstack.rb

@@ -1,5 +1,5 @@
 require 'fog/openstack/compute'
-require 'fog/openstack/identity'
+require 'fog/openstack/identity_v2'
 require 'fog/openstack/image'
 require 'fog/openstack/metering'
 require 'fog/openstack/network'

data/lib/fog/openstack/baremetal.rb

@@ -34,6 +34,10 @@ module Fog
       request :list_nodes
       request :list_nodes_detailed
       request :patch_node
+      request :set_node_power_state
+      request :set_node_provision_state
+      request :set_node_maintenance
+      request :unset_node_maintenance
 
       # Chassis requests
       request :create_chassis
@@ -63,14 +67,10 @@ module Fog
 
       ## Node requests
       # request :validate_node
-      # request :set_maintenance
-      # request :unset_maintenance
       # request :get_boot_device
       # request :set_boot_device
       # request :list_supported_boot_devices
       # request :list_node_states
-      # request :set_power_state
-      # request :provision_node
       # request :get_console_info
       # request :change_console_state
       # request :get_vendor_passthru_methods
@@ -337,7 +337,7 @@ module Fog
               :openstack_endpoint_type => @openstack_endpoint_type
             }
 
-            credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]

data/lib/fog/openstack/compute.rb

@@ -10,6 +10,7 @@ module Fog
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
                  :openstack_endpoint_type,
+                 :openstack_project_name,
                  :openstack_project_domain, :openstack_user_domain
 
       ## MODELS
@@ -17,6 +18,8 @@ module Fog
       model_path 'fog/openstack/models/compute'
       model       :server
       collection  :servers
+      model       :service
+      collection  :services
       model       :image
       collection  :images
       model       :flavor
@@ -84,6 +87,13 @@ module Fog
       request :live_migrate_server
       request :migrate_server
 
+      # Service CRUD
+      request :list_services
+      request :enable_service
+      request :disable_service
+      request :disable_service_log_reason
+      request :delete_service
+
       # Image CRUD
       request :list_images
       request :list_images_detail
@@ -98,6 +108,10 @@ module Fog
       request :create_flavor
       request :delete_flavor
 
+      # Flavor Actions
+      request :get_flavor_metadata
+      request :create_flavor_metadata
+
       # Flavor Access
       request :add_flavor_access
       request :remove_flavor_access
@@ -175,6 +189,9 @@ module Fog
       request :list_hosts
       request :get_host_details
 
+      # Zones
+      request :list_zones
+
       class Mock
         attr_reader :auth_token
         attr_reader :auth_token_expiration
@@ -363,7 +380,7 @@ module Fog
                 'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :path     => "#{@path}/#{@tenant_id}/#{params[:path]}",
+              :path     => "#{@path}/#{params[:path]}",
               :query    => params[:query]
             }))
           rescue Excon::Errors::Unauthorized => error
@@ -410,13 +427,7 @@ module Fog
               :openstack_endpoint_type => @openstack_endpoint_type
             }
 
-            if @openstack_auth_uri.path =~ /\/v2.0/
-              credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
-            elsif @openstack_auth_uri.path =~ /\/v3/
-              credentials = Fog::OpenStack.authenticate_v3(options, @connection_options)
-            else
-              credentials = Fog::OpenStack.authenticate_v1(options, @connection_options)
-            end
+            credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]
@@ -430,7 +441,7 @@ module Fog
 
           uri = URI.parse(@openstack_management_url)
           @host   = uri.host
-          @path, @tenant_id = uri.path.scan(/(\/.*)\/(.*)/).flatten
+          @path   = uri.path
 
           @path.sub!(/\/$/, '')
           unless @path.match(/1\.1|v2/)

data/lib/fog/openstack/core.rb

@@ -177,10 +177,11 @@ module Fog
     def self.authenticate_v3(options, connection_options = {})
       uri                   = options[:openstack_auth_uri]
       tenant_name           = options[:openstack_tenant]
+      project_name          = options[:openstack_project_name]
       service_type          = options[:openstack_service_type]
       service_name          = options[:openstack_service_name]
       identity_service_type = options[:openstack_identity_service_type]
-      endpoint_type         = (options[:openstack_endpoint_type] || 'public').to_s
+      endpoint_type         = map_endpoint_type(options[:openstack_endpoint_type] || 'publicURL')
       openstack_region      = options[:openstack_region]
 
       body, token_headers = retrieve_tokens_v3(options, connection_options)
@@ -190,6 +191,29 @@ module Fog
       options[:unscoped_token] = token_headers['X-Subject-Token']
 
       unless service
+        unless project_name
+          request_body = {
+              :expects => [200],
+              :headers => {'Content-Type' => 'application/json',
+                           'Accept' => 'application/json',
+                           'X-Auth-Token' => token_headers['X-Subject-Token']},
+              :method  => 'GET'
+          }
+          user_id = body['token']['user']['id']
+          response = Fog::Core::Connection.new(
+              "#{uri.scheme}://#{uri.host}:#{uri.port}/v3/users/#{user_id}/projects", false, connection_options).request(request_body)
+
+          projects_body = Fog::JSON.decode(response.body)
+          if projects_body['projects'].empty?
+            raise Fog::Errors::NotFound.new('No Project Found')
+          else
+            options[:openstack_project_name] = projects_body['projects'].first['name']
+            options[:openstack_domain_name] = body['token']['user']['domain']['name']
+          end
+        end
+
+        tenant_name = options[:openstack_project_name]
+
         unless tenant_name
           response = Fog::Core::Connection.new(
             "#{uri.scheme}://#{uri.host}:#{uri.port}/v3/projects", false, connection_options).request({
@@ -211,8 +235,6 @@ module Fog
         service = get_service(body, service_type, service_name)
       end
 
-      endpoint_type = 'public'
-
       service['endpoints'] = service['endpoints'].select do |endpoint|
         endpoint['region'] == openstack_region && endpoint['interface'] == endpoint_type
       end if openstack_region
@@ -238,13 +260,14 @@ module Fog
         admin = true if r["name"] == "admin"
       end
 
-      if service['endpoints'].count > 1 and not admin
-        regions = service["endpoints"].map{ |e| e['region'] }.uniq.join(',')
-        raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions}'")
+      regions = service["endpoints"].map{ |e| e['region'] }.uniq
+      if regions.count > 1 and not admin
+        raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions.join(',')}'")
       end
 
       identity_service = get_service(body, identity_service_type) if identity_service_type
-      tenant = body['token']['project']['name']
+      tenant = body['token']['project']['name'] if body['token']['project']
+      tenant = body['token']['user']['project']['name'] unless body['token']['project']
       user = body['token']['user']['name']
 
       management_url = service['endpoints'].find{|s| s["interface"][endpoint_type]}["url"]
@@ -326,7 +349,7 @@ module Fog
       end
       auth_token  = options[:openstack_auth_token] || options[:unscoped_token]
       uri         = options[:openstack_auth_uri]
-      userdomain  = options[:openstack_user_domain] || options[:openstack_domain]
+      userdomain  = options[:openstack_user_domain] || options[:openstack_domain] || 'Default'
       project_domain  = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
 
       connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
@@ -341,9 +364,6 @@ module Fog
           :methods => ["password"],
           :password => {
             :user => {
-              :domain => {
-                :name => userdomain
-              },
               :name => username,
               :password => api_key
             }
@@ -358,13 +378,20 @@ module Fog
         else
           request_body[:auth][:scope] = {
             :project => {
-              :domain => {
-                :name => project_domain
-              },
               :name => tenant_name
             }
           }
         end
+        unless userdomain.to_s.empty?
+          request_body[:auth][:identity][:password][:user][:domain] = {
+                  :name => userdomain
+          }
+        end
+        unless project_domain.to_s.empty?
+          request_body[:auth][:scope][:project][:domain] = {
+                :name => project_domain
+          }
+        end
       end
 
       response = connection.request({
@@ -411,5 +438,17 @@ module Fog
         '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
       end
     end
+
+    def self.map_endpoint_type type
+      case type
+        when "publicURL"
+          "public"
+        when "internalURL"
+          "internal"
+        when "adminURL"
+          "admin"
+      end
+
+    end
   end
 end

data/lib/fog/openstack/examples/compute/basics.rb

@@ -17,7 +17,9 @@ compute_client ||= ::Fog::Compute.new(:provider           => :openstack,
 # Options include metadata, availability zone, etc...
 
 begin
-  vm = compute_client.servers.create(name, image, flavor, options = {})
+  vm = compute_client.servers.create(:name => 'lucky',
+                                     :image_ref => 'fcd8f8a9',
+                                     :flavor_ref => 4)
 rescue => e
   puts JSON.parse(e.response.body)['badRequest']['message']
 end

data/lib/fog/openstack/identity.rb

@@ -3,269 +3,41 @@ require 'fog/openstack/core'
 module Fog
   module Identity
     class OpenStack < Fog::Service
-      requires :openstack_auth_url
-      recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
-                 :openstack_api_key, :openstack_username, :openstack_current_user_id,
-                 :current_user, :current_tenant,
-                 :openstack_endpoint_type, :openstack_region
 
-      model_path 'fog/openstack/models/identity'
-      model       :tenant
-      collection  :tenants
-      model       :user
-      collection  :users
-      model       :role
-      collection  :roles
-      model       :ec2_credential
-      collection  :ec2_credentials
-
-      request_path 'fog/openstack/requests/identity'
-
-      request :check_token
-      request :validate_token
-
-      request :list_tenants
-      request :create_tenant
-      request :get_tenant
-      request :get_tenants_by_id
-      request :get_tenants_by_name
-      request :update_tenant
-      request :delete_tenant
-
-      request :list_users
-      request :create_user
-      request :update_user
-      request :delete_user
-      request :get_user_by_id
-      request :get_user_by_name
-      request :add_user_to_tenant
-      request :remove_user_from_tenant
-
-      request :list_endpoints_for_token
-      request :list_roles_for_user_on_tenant
-      request :list_user_global_roles
-
-      request :create_role
-      request :delete_role
-      request :delete_user_role
-      request :create_user_role
-      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 :auth_token_expiration
-        attr_reader :current_user
-        attr_reader :current_tenant
-        attr_reader :unscoped_token
-
-        def self.data
-          @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,
-              :ec2_credentials => @ec2_credentials,
-              :user_tenant_membership => @user_tenant_membership
-            }
-          end
-        end
-
-        def self.reset!
-          @data            = nil
-          @users           = nil
-          @roles           = nil
-          @tenants         = nil
-          @ec2_credentials = nil
-        end
-
-        def initialize(options={})
-          @openstack_username = options[:openstack_username] || 'admin'
-          @openstack_tenant   = options[:openstack_tenant]   || 'admin'
-          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-          @openstack_management_url = @openstack_auth_uri.to_s
-
-          @auth_token = Fog::Mock.random_base64(64)
-          @auth_token_expiration = (Time.now.utc + 86400).iso8601
-
-          @admin_tenant = self.data[:tenants].values.find do |u|
-            u['name'] == 'admin'
-          end
-
-          if @openstack_tenant
-            @current_tenant = self.data[:tenants].values.find do |u|
-              u['name'] == @openstack_tenant
-            end
-
-            unless @current_tenant
-              @current_tenant_id = Fog::Mock.random_hex(32)
-              @current_tenant = self.data[:tenants][@current_tenant_id] = {
-                'id'   => @current_tenant_id,
-                'name' => @openstack_tenant
-              }
-            else
-              @current_tenant_id = @current_tenant['id']
+      # Fog::Identity::OpenStack.new() will return a Fog::Identity::OpenStack::V2 or a Fog::Identity::OpenStack::V3,
+      #  depending on whether the auth URL is for an OpenStack Identity V2 or V3 API endpoint
+      def self.new(args = {})
+        if self.inspect == 'Fog::Identity::OpenStack'
+          if args[:openstack_auth_url]
+            @openstack_auth_uri = URI.parse(args[:openstack_auth_url])
+            if @openstack_auth_uri.path =~ /\/v3/
+              service = Fog::Identity::OpenStack::V3.new(args)
             end
-          else
-            @current_tenant = @admin_tenant
           end
-
-          @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)
-            @current_user = self.data[:users][@current_user_id] = {
-              'id'       => @current_user_id,
-              'name'     => @openstack_username,
-              'email'    => "#{@openstack_username}@mock.com",
-              'tenantId' => Fog::Mock.random_numbers(6).to_s,
-              'enabled'  => true
-            }
-          else
-            @current_user_id = @current_user['id']
-          end
-        end
-
-        def data
-          self.class.data[@openstack_username]
-        end
-
-        def reset_data
-          self.class.data.delete(@openstack_username)
-        end
-
-        def credentials
-          { :provider                  => 'openstack',
-            :openstack_auth_url        => @openstack_auth_uri.to_s,
-            :openstack_auth_token      => @auth_token,
-            :openstack_management_url  => @openstack_management_url,
-            :openstack_current_user_id => @openstack_current_user_id,
-            :current_user              => @current_user,
-            :current_tenant            => @current_tenant}
+          service ||= Fog::Identity::OpenStack::V2.new(args)
+        else
+          service = Fog::Service.new(args)
         end
+        service
       end
 
-      class Real
-        attr_reader :current_user
-        attr_reader :current_tenant
-        attr_reader :unscoped_token
-
-        def initialize(options={})
-          @openstack_auth_token = options[:openstack_auth_token]
-
-          unless @openstack_auth_token
-            missing_credentials = Array.new
-            @openstack_api_key  = options[:openstack_api_key]
-            @openstack_username = options[:openstack_username]
-            @openstack_region   = options[:openstack_region]
-
-            missing_credentials << :openstack_api_key  unless @openstack_api_key
-            missing_credentials << :openstack_username unless @openstack_username
-            raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
-          end
-
-          @openstack_tenant   = options[:openstack_tenant]
-          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-          @openstack_management_url       = options[:openstack_management_url]
-          @openstack_must_reauthenticate  = false
-          @openstack_service_type = options[:openstack_service_type] || ['identity']
-          @openstack_service_name = options[:openstack_service_name]
-
-          @connection_options = options[:connection_options] || {}
-
-          @openstack_current_user_id = options[:openstack_current_user_id]
-
-          @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
-
-          @current_user = options[:current_user]
-          @current_tenant = options[:current_tenant]
-
-          authenticate
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
-
-        def credentials
-          { :provider                 => 'openstack',
-            :openstack_auth_url       => @openstack_auth_uri.to_s,
-            :openstack_auth_token     => @auth_token,
-            :openstack_management_url => @openstack_management_url,
-            :openstack_current_user_id => @openstack_current_user_id,
-            :current_user             => @current_user,
-            :current_tenant           => @current_tenant }
-        end
-
-        def reload
-          @connection.reset
-        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] || {}),
-              :path     => "#{@path}/#{params[:path]}"#,
-            }))
-          rescue Excon::Errors::Unauthorized => error
-            raise if retried
-            retried = true
-
-            @openstack_must_reauthenticate = true
-            authenticate
-            retry
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Identity::OpenStack::NotFound.slurp(error)
-            else
-              error
-            end
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
-        end
-
-        private
+      module Common
 
         def authenticate
           if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
-              :openstack_api_key  => @openstack_api_key,
-              :openstack_username => @openstack_username,
-              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @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 => @openstack_endpoint_type,
-              :openstack_region => @openstack_region
+                :openstack_api_key => @openstack_api_key,
+                :openstack_username => @openstack_username,
+                :openstack_auth_token => @openstack_must_reauthenticate ? nil : @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 => @openstack_endpoint_type,
+                :openstack_region => @openstack_region
             }
 
-            credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]
@@ -281,14 +53,17 @@ module Fog
             uri = URI.parse(@openstack_management_url)
           end
 
-          @host   = uri.host
-          @path   = uri.path
+          @host = uri.host
+          @path = uri.path
           @path.sub!(/\/$/, '')
-          @port   = uri.port
+          @port = uri.port
           @scheme = uri.scheme
           true
         end
+
       end
     end
+
+
   end
 end