fog 1.32.0 → 1.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7801c7c007b8ade9b3db8b3adbcccce77483a544
-  data.tar.gz: f4b0c047843cc79f845badafc9afeb2e9ba04167
+  metadata.gz: 54e5d06378a8bcb46784753de3c7fa8f8252e196
+  data.tar.gz: f3b2c0a9ae87d177341e3eff3b291a8e832eae02
 SHA512:
-  metadata.gz: 444572699a31be8229aca465659aaabc11ddf16d81bfd103914561a82e11dc55f43ab57a2e254fd986eb53dbe4ef3b1f30dc9be25bc4ac09dded50eceb73dbc6
-  data.tar.gz: e74522ce110047b1f7bdeb6e4ae263ff5854fd4741d6af224dbded8046543196d26986cbb6e5d7b33717ed1ef848abb9bfac5932ca52f13f6490a2b6cc6909ad
+  metadata.gz: 155cc3a6c109f0b7097c0a0a9576c77377b188c37b62137f0b17110659926695db1d8120765c55f75188a1dfef012ac62bc8bdaf5cf059451cb14551afbbe771
+  data.tar.gz: 9354b948a15c1b36c53b18b34f6abb74a01aad171494885dbd8f8f961432803f66b5a879ccb2de87d035365b435436fd29db5961a86153079cd7a654d765113b

data/CHANGELOG.md

@@ -1,3 +1,62 @@
+## 1.33.0 08/12/2015
+*Hash* 514fb792da07e6c5beaf4b735ea944fa873483f0
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Downloads     | 11035171
+Forks         | 1472
+Open Issues   | 78
+Watchers      | 3573
+
+**MVP!** Darren Hague
+
+#### [Dynect]
+*   Extract Dynect DNS provider to fog-dynect. thanks Glenn Pratt
+
+#### [misc]
+*   vCloud Director queued tasks should not count as "non_running". thanks Adam Leff
+*   Add execute request. thanks Alan Sebastian
+*   Fix comment: 5mins = 300s. thanks Andrew Langhorn
+*   Allow real OpenStack storage adapter to take :openstack_management_url option. thanks Danny Guinther
+*   [openstack][Storage] Added the delete_at and delete_after flags. thanks Francesco Vollero
+*   Vsphere - customizing interfaces and disks when cloning from template. thanks as
+*   Add support for multiple VPN tunnels. thanks Josh Myers
+*   Adding Openstack Collection base class. thanks Ladislav Smola
+*   Openstack Model base class. thanks Ladislav Smola
+*   Fog::OpenStack::Model base class for all openstack models. thanks Ladislav Smola
+*   Fog::OpenStack::Collection base class for all openstack collections. thanks Ladislav Smola
+*   OpenStack compute add full support of availability zones. thanks Ladislav Smola
+*   OpenStack servers list options fix. thanks Ladislav Smola
+*   Adding OpenStack volume availability_zones. thanks Ladislav Smola
+*   OpenStack compute add shelve related actions. thanks Ladislav Smola
+*   Add missing require of identitty v3. thanks Ladislav Smola
+*   update Linode avail_datacenters mock results. thanks Marques Johansson
+*   add extend_volume request to Fog::Volume::OpenStack. thanks Stefan Majewsky
+*   fucking 1.8.7. thanks Stefan Majewsky
+*   fix test run on JRuby. thanks Stefan Majewsky
+*   Use traverse to get resource pools, fixes #3579. thanks alan
+*   Fix nested folders in get virtual machine. thanks alan
+*   Intermediate foldes in DC/Cluster tree. thanks slivik
+
+#### [openstack]
+*   Allow the auth_token to be overridden (e.g. with the admin token from keystone.conf). thanks Darren Hague
+*   Deal with Compute 'server details' returning null user_data. thanks Darren Hague
+*   Add support for hierarchical projects. thanks Darren Hague
+*   Add test for subnet creation. thanks Darren Hague
+*   Add tests for subtree_as_list and parents_as_list in hierarchical projects. thanks Darren Hague
+*   hierarchical projects: subtree_as_list and parents_as_list - set subtree and parents attributes as Array of Project instead of Array of Hash. thanks Darren Hague
+*   hierarchical projects: Add test to check that a newly added subproject appears in a top-level project's list. thanks Darren Hague
+*   Refactoring to avoid having to copy/paste openstack options to/from instance variables. thanks Darren Hague
+*   fix subnet update & create regarding to empty vanilla options, add allocation_pools option. thanks Maurice Schreiber
+*   mock create subnet array options. thanks Maurice Schreiber
+*   fix broken subnet test. thanks Maurice Schreiber
+*   reduce code duplication between specs. thanks Stefan Majewsky
+*   fix test run so that the volume_spec.rb is actually run. thanks Stefan Majewsky
+*   reduce code duplication in volume spec... thanks Stefan Majewsky
+*   add volume transfer models/requests. thanks Stefan Majewsky
+
+
 ## 1.32.0 07/02/2015
 *Hash* 3339ba764f099c1fab8c989510c427ac65dabeca
 

data/Gemfile

@@ -4,6 +4,7 @@ group :development, :test do
   # This is here because gemspec doesn't support require: false
   gem "netrc", :require => false
   gem "octokit", :require => false
+  gem 'rspec', :require => false
 end
 
 gemspec

data/Rakefile

@@ -54,7 +54,7 @@ end
 
 GEM_NAME = "#{name}"
 task :default => :test
-task :travis  => ['test', 'test:travis', 'test:openstack_idv3']
+task :travis  => ['test', 'test:travis', 'test:openstack_specs']
 
 Rake::TestTask.new do |t|
   t.pattern = File.join("spec", "**", "*_spec.rb")
@@ -63,10 +63,10 @@ end
 
 namespace :test do
   mock = ENV['FOG_MOCK'] || 'true'
-  task :openstack_idv3 do
-    sh("export FOG_MOCK=false && bundle exec rspec spec/fog/openstack/identity_v3_spec.rb")
+  task :openstack_specs do
+    sh("export FOG_MOCK=false && bundle exec rspec spec/fog/openstack/*_spec.rb")
   end
-  task :travis => [:openstack_idv3] do
+  task :travis => [:openstack_specs] do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont")
   end
   task :vsphere do

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.32.0"
-  s.date              = "2015-07-02"
+  s.version           = "1.33.0"
+  s.date              = "2015-08-12"
   s.rubyforge_project = "fog"
 
   ## Make sure your summary is short. The description may be as long
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-atmos")
   s.add_dependency("fog-aws", ">= 0.6.0")
   s.add_dependency("fog-brightbox", "~> 0.4")
+  s.add_dependency("fog-dynect")
   s.add_dependency("fog-ecloud", "= 0.1.1")
   s.add_dependency("fog-google", ">= 0.0.2")
   s.add_dependency("fog-local")

data/lib/fog/linode/requests/compute/avail_datacenters.rb

@@ -24,13 +24,14 @@ module Fog
           response.body = {
             "ERRORARRAY" => [],
             "DATA" => [
-              { "LOCATION" => "Dallas, TX, USA",     "DATACENTERID" => 2 },
-              { "LOCATION" => "Fremont, CA, USA",    "DATACENTERID" => 3 },
-              { "LOCATION" => "Atlanta, GA, USA",    "DATACENTERID" => 4 },
-              { "LOCATION" => "Newark, NJ, USA",     "DATACENTERID" => 6 },
-              { "LOCATION" => "London, England, UK", "DATACENTERID" => 7 },
-              { "LOCATION" => "Tokyo, JP",           "DATACENTERID" => 8 },
-              { "LOCATION" => "Singapore, SGP",      "DATACENTERID" => 9 },
+              { "LOCATION" => "Dallas, TX, USA",     "DATACENTERID" => 2,  "ABBR" => "dallas" },
+              { "LOCATION" => "Fremont, CA, USA",    "DATACENTERID" => 3,  "ABBR" => "fremont" },
+              { "LOCATION" => "Atlanta, GA, USA",    "DATACENTERID" => 4,  "ABBR" => "atlanta" },
+              { "LOCATION" => "Newark, NJ, USA",     "DATACENTERID" => 6,  "ABBR" => "newark" },
+              { "LOCATION" => "London, England, UK", "DATACENTERID" => 7,  "ABBR" => "london" },
+              { "LOCATION" => "Tokyo, JP",           "DATACENTERID" => 8,  "ABBR" => "tokyo" },
+              { "LOCATION" => "Singapore, SGP",      "DATACENTERID" => 9,  "ABBR" => "singapore" },
+              { "LOCATION" => "Frankfurt, DE",       "DATACENTERID" => 10, "ABBR" => "frankfurt" },
             ],
             "ACTION" => "avail.datacenters"
           }

data/lib/fog/openstack.rb

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

data/lib/fog/openstack/compute.rb

@@ -19,6 +19,8 @@ module Fog
       model_path 'fog/openstack/models/compute'
       model       :aggregate
       collection  :aggregates
+      model       :availability_zone
+      collection  :availability_zones
       model       :server
       collection  :servers
       model       :service
@@ -62,7 +64,7 @@ module Fog
       request :add_aggregate_host
       request :remove_aggregate_host
       request :delete_aggregate
-      
+
       # Server CRUD
       request :list_servers
       request :list_servers_detail
@@ -94,6 +96,9 @@ module Fog
       request :reset_server_state
       request :add_security_group
       request :remove_security_group
+      request :shelve_server
+      request :unshelve_server
+      request :shelve_offload_server
 
       # Server Extenstions
       request :get_console_output
@@ -208,6 +213,7 @@ module Fog
 
       # Zones
       request :list_zones
+      request :list_zones_detailed
 
       class Mock
         attr_reader :auth_token

data/lib/fog/openstack/core.rb

@@ -40,6 +40,8 @@ module Fog
           new_error
         end
       end
+
+      class InterfaceNotImplemented < Fog::Errors::Error; end
     end
 
     service(:compute ,      'Compute')
@@ -57,6 +59,7 @@ module Fog
       attr_reader :auth_token
       attr_reader :auth_token_expiration
       attr_reader :current_user
+      attr_reader :current_user_id
       attr_reader :current_tenant
       attr_reader :openstack_domain_name
       attr_reader :openstack_user_domain
@@ -66,38 +69,19 @@ module Fog
       attr_reader :openstack_project_domain_id
 
       def initialize_identity options
-        @openstack_auth_token = options[:openstack_auth_token]
-        @auth_token        ||= options[:openstack_auth_token]
-        @openstack_identity_public_endpoint = options[:openstack_identity_endpoint]
-
-        @openstack_username = options[:openstack_username]
-        @openstack_userid = options[:openstack_userid]
-
-        @openstack_domain_name = options[:openstack_domain_name]
-        @openstack_user_domain = options[:openstack_user_domain]
-        @openstack_project_domain  = options[:openstack_project_domain]
-        @openstack_domain_id = options[:openstack_domain_id]
-        @openstack_user_domain_id = options[:openstack_user_domain_id]
-        @openstack_project_domain_id  = options[:openstack_project_domain_id]
+        # Create @openstack_* instance variables from all :openstack_* options
+        options.select{|x|x.to_s.start_with? 'openstack'}.each do |openstack_param, value|
+          instance_variable_set "@#{openstack_param}".to_sym, value
+        end
 
-        @openstack_project_name = options[:openstack_project_name]
-        @openstack_tenant      = options[:openstack_tenant]
-        @openstack_tenant_id   = options[:openstack_tenant_id]
+        @auth_token        ||= options[:openstack_auth_token]
 
         @openstack_auth_uri    = URI.parse(options[:openstack_auth_url])
-
-        @openstack_management_url       = options[:openstack_management_url]
-
         @openstack_must_reauthenticate  = false
-
         @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL'
-        @openstack_region        = options[:openstack_region]
 
         unless @auth_token
           missing_credentials = Array.new
-          @openstack_api_key = options[:openstack_api_key]
-          @openstack_username = options[:openstack_username]
-          @openstack_userid = options[:openstack_userid]
 
           missing_credentials << :openstack_api_key unless @openstack_api_key
           unless @openstack_username || @openstack_userid
@@ -107,55 +91,45 @@ module Fog
         end
 
         @current_user = options[:current_user]
+        @current_user_id = options[:current_user_id]
         @current_tenant = options[:current_tenant]
 
       end
 
       def credentials
-        { :provider                 => 'openstack',
-          :openstack_domain_name    => @openstack_domain_name,
-          :openstack_user_domain    => @openstack_user_domain,
-          :openstack_project_domain => @openstack_project_domain,
-          :openstack_domain_id      => @openstack_domain_id,
-          :openstack_user_domain_id => @openstack_user_domain_id,
-          :openstack_project_domain_id => @openstack_project_domain_id,
+        options =  { :provider => 'openstack',
           :openstack_auth_url       => @openstack_auth_uri.to_s,
           :openstack_auth_token     => @auth_token,
-          :openstack_management_url => @openstack_management_url,
           :openstack_identity_endpoint => @openstack_identity_public_endpoint,
-          :openstack_region         => @openstack_region,
           :current_user             => @current_user,
+          :current_user_id          => @current_user_id,
           :current_tenant           => @current_tenant }
+        openstack_options.merge options
       end
 
       private
+
+      def openstack_options
+        options={}
+        # Create a hash of (:openstack_*, value) of all the @openstack_* instance variables
+        self.instance_variables.select{|x|x.to_s.start_with? '@openstack'}.each do |openstack_param|
+          option_name = openstack_param.to_s[1..-1]
+          options[option_name.to_sym] = instance_variable_get openstack_param
+        end
+        options
+      end
+
       def authenticate
         if !@openstack_management_url || @openstack_must_reauthenticate
-          options = {
-              :openstack_tenant        => @openstack_tenant,
-              :openstack_tenant_id     => @openstack_tenant_id,
-              :openstack_api_key       => @openstack_api_key,
-              :openstack_username      => @openstack_username,
-              :openstack_userid        => @openstack_userid,
-              :openstack_user_domain   => @openstack_user_domain,
-              :openstack_project_domain => @openstack_project_domain,
-              :openstack_user_domain_id => @openstack_user_domain_id,
-              :openstack_project_domain_id => @openstack_project_domain_id,
-              :openstack_domain_name   => @openstack_domain_name,
-              :openstack_project_name  => @openstack_project_name,
-              :openstack_domain_id     => @openstack_domain_id,
-              :openstack_project_id    => @openstack_project_id,
-              :openstack_auth_uri      => @openstack_auth_uri,
-              :openstack_auth_token    => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
-              :openstack_service_type  => @openstack_service_type,
-              :openstack_service_name  => @openstack_service_name,
-              :openstack_endpoint_type => @openstack_endpoint_type,
-              :openstack_region        => @openstack_region
-          }
+
+          options = openstack_options
+
+          options[:openstack_auth_token] = @openstack_must_reauthenticate ? nil : @openstack_auth_token
 
           credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
           @current_user = credentials[:user]
+          @current_user_id = credentials[:current_user_id]
           @current_tenant = credentials[:tenant]
 
           @openstack_must_reauthenticate = false

data/lib/fog/openstack/identity.rb

@@ -44,6 +44,7 @@ module Fog
             credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
+            @current_user_id = credentials[:current_user_id]
             @current_tenant = credentials[:tenant]
 
             @openstack_must_reauthenticate = false

data/lib/fog/openstack/identity_v3.rb

@@ -13,7 +13,7 @@ module Fog
                    :openstack_user_domain, :openstack_project_domain,
                    :openstack_user_domain_id, :openstack_project_domain_id,
                    :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username,
-                   :current_user, :current_tenant,
+                   :current_user, :current_user_id, :current_tenant,
                    :provider
 
         model_path 'fog/openstack/models/identity_v3'
@@ -149,9 +149,10 @@ module Fog
 
         class Real
           attr_reader :current_user
+          attr_reader :current_user_id
           attr_reader :current_tenant
           attr_reader :unscoped_token
-          attr_reader :auth_token
+          attr_accessor :auth_token
 
           include Fog::Identity::OpenStack::Common
           include Fog::OpenStack::Core
@@ -182,13 +183,13 @@ module Fog
             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]}" #,
-                                                          }))
+                :headers => params.fetch(:headers,{}).merge({
+                  'Content-Type' => 'application/json',
+                  'Accept' => 'application/json',
+                  'X-Auth-Token' => @auth_token
+                }), 
+                :path => "#{@path}/#{params[:path]}"
+              })) 
             rescue Excon::Errors::Unauthorized => error
               raise if retried
               retried = true

data/lib/fog/openstack/models/baremetal/chassis.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Baremetal
     class OpenStack
-      class Chassis < Fog::Model
+      class Chassis < Fog::OpenStack::Model
         identity :uuid
 
         attribute :description
@@ -14,17 +14,6 @@ module Fog
         attribute :updated_at
         attribute :extra
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :description
-          identity ? update : create
-        end
-
         def create
           requires :description
           merge_attributes(service.create_chassis(self.attributes).body)
@@ -32,7 +21,7 @@ module Fog
         end
 
         def update(patch=nil)
-          requires :uuid
+          requires :uuid, :description
           if patch
             merge_attributes(service.patch_chassis(uuid, patch).body)
           else

data/lib/fog/openstack/models/baremetal/chassis_collection.rb

@@ -1,24 +1,24 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/baremetal/chassis'
 
 module Fog
   module Baremetal
     class OpenStack
-      class ChassisCollection < Fog::Collection
+      class ChassisCollection < Fog::OpenStack::Collection
         model Fog::Baremetal::OpenStack::Chassis
 
         def all(options = {})
-          load(service.list_chassis_detailed(options).body['chassis'])
+          load_response(service.list_chassis_detailed(options), 'chassis')
         end
 
         def summary(options = {})
-          load(service.list_chassis(options).body['chassis'])
+          load_response(service.list_chassis(options), 'chassis')
         end
 
         def details(options = {})
           Fog::Logger.deprecation("Calling OpenStack[:baremetal].chassis_collection.details will be removed, "\
                                   " call .chassis_collection.all for detailed list.")
-          load(service.list_chassis_detailed(options).body['chassis'])
+          all(options)
         end
 
         def find_by_uuid(uuid)