fog-openstack 0.1.31 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 64e6fe81feffe46842e7b67179d4df541f816641d4ad3ccf8171654cf437f6f0
-  data.tar.gz: fdb13d901f583c649011f7574293031b455ed310984fdbceb20f3bb3680e205c
+SHA1:
+  metadata.gz: c70342e05368a8b5eee2e3b0cc8bfa02f2201156
+  data.tar.gz: d0794fd0a519e1e9a1e0501d22f04b14f5f17c90
 SHA512:
-  metadata.gz: 24766268b47e478a821f15e523b3d33c01b4bcda8de04905b1168838263584368face4b3a40c9e9a11ac4435d3e2ed92bd2db6dab1feb98adcc8070db391b81e
-  data.tar.gz: 83fca28ad50848a581dea2450e49312162bee8448bdbe8bcb69b939cb0abe4f7a5beed21def6bd9f64ad883090ce252fbc4ed3d7e15efd1fa330160b670607d4
+  metadata.gz: 9c974aa8e32e72c4bf8397c5881563e7349a54ce13b3f3f92dddd2f8434d32ee53b3c636f0316f7da4c18ca03b95e808e6848f4ea4e3c8595b84de1e8213297d
+  data.tar.gz: 7e1d1a0ebcbdd7582beb275d66a66bb24dfa08b64072a015a57c8c311aa67217b040e2b33b7be418ef379ccffb59f21399aae04dd381381b81b1e7e38266307a

data/.gitignore

@@ -11,3 +11,4 @@ gemfiles/Gemfile-1.9.lock
 .DS_Store
 .idea/
 vendor/bundle
+test/.lorem.txt

data/.rubocop.yml

@@ -41,7 +41,7 @@ Metrics/BlockLength:
   - it
   - model_tests
   - namespace
-  - draw  
+  - draw
 ParameterLists:
   Severity: refactor
 PerceivedComplexity:
@@ -54,6 +54,9 @@ SingleLineMethods:
   AllowIfMethodIsEmpty: false
 SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
+Style/RegexpLiteral:
+  EnforcedStyle: slashes
+  AllowInnerSlashes: true
 TrivialAccessors:
   AllowPredicates: true
 #

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 sudo: false
 before_install:
-  - gem install bundler --version '~> 1'
+  - gem update bundler
 script:
   - bundle exec rake test TESTOPTS="--verbose"
   - bundle exec rake spec
@@ -10,13 +10,13 @@ env:
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.3.8
+  - rvm: 2.2.10
     gemfile: Gemfile
-  - rvm: 2.4.5
+  - rvm: 2.3.7
     gemfile: Gemfile
-  - rvm: 2.5.3
+  - rvm: 2.4.4
     gemfile: Gemfile
-  - rvm: 2.6.0
+  - rvm: 2.5.1
     gemfile: Gemfile
   - rvm: jruby-head
     gemfile: Gemfile

data/.zuul.yaml

@@ -12,10 +12,10 @@
     run: playbooks/fog-openstack-unittest-test/run.yaml
     vars:
       rvm:
-        2.3.8
-        2.4.5
-        2.5.3
-        2.6.0
+        2.2.10
+        2.3.7
+        2.4.4
+        2.5.1
         jruby-head
     nodeset: ubuntu-xenial
 
@@ -27,9 +27,9 @@
     run: playbooks/fog-openstack-unittest-spec/run.yaml
     vars:
       rvm:
-        2.3.8
-        2.4.5
-        2.5.3
-        2.6.0
+        2.2.10
+        2.3.7
+        2.4.4
+        2.5.1
         jruby-head
     nodeset: ubuntu-xenial

data/Rakefile

@@ -4,18 +4,20 @@ require 'rake/testtask'
 
 RuboCop::RakeTask.new
 
-task :default => ['tests:unit', 'tests:spec']
+task :default => ['tests:mock', 'tests:spec', 'tests:unit']
 
-task :test => 'tests:unit'
+task :mock => 'tests:mock'
 
 task :spec => "tests:spec"
 
+task :unit => 'tests:unit'
+
 namespace :tests do
-  desc 'Run fog-openstack tests with Minitest'
+  desc 'Run fog-openstack tests with Mock class'
   Rake::TestTask.new do |t|
     ENV['FOG_MOCK']= ENV['FOG_MOCK'].nil? ? 'true' : ENV['FOG_MOCK']
 
-    t.name = 'unit'
+    t.name = 'mock'
     t.libs.push [ "lib", "test" ]
     t.test_files = FileList['test/**/*.rb']
     t.verbose = true
@@ -28,4 +30,12 @@ namespace :tests do
     t.pattern = 'spec/**/*_spec.rb'
     t.verbose = true
   end
+
+  desc 'Run fog-openstack unit tests'
+  Rake::TestTask.new do |t|
+    t.name = 'unit'
+    t.libs.push [ "lib", "unit" ]
+    t.pattern = 'unit/**/*_test.rb'
+    t.verbose = true
+  end
 end

data/fog-openstack.gemspec

@@ -25,14 +25,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'fog-json',  '>= 1.0'
   spec.add_dependency 'ipaddress', '>= 0.8'
 
-  spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "mime-types-data"
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake',    '~> 10.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'shindo',  '~> 0.3'
-  spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock',  '~> 1.24.6'
 end

data/lib/fog/baremetal/openstack.rb

@@ -248,35 +248,17 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
+        def default_service_type
+          %w[baremetal]
+        end
+
         # NOTE: uncommenting this should be treated as api-change!
         # def self.not_found_class
         #   Fog::Baremetal::OpenStack::NotFound
         # end
 
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_service_type  = options[:openstack_service_type] || ['baremetal']
-          @openstack_service_name  = options[:openstack_service_name]
-
-          @connection_options = options[:connection_options] || {}
-
-          authenticate
-          set_api_path
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
-
-        private
-
-        def set_api_path
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
-                                                               @openstack_management_uri,
-                                                               @auth_token,
-                                                               @connection_options)
-          end
+        def default_path_prefix
+          'v1'
         end
       end
     end

data/lib/fog/compute/openstack.rb

@@ -14,7 +14,7 @@ module Fog
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                  :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
-                 :openstack_identity_prefix
+                 :openstack_identity_api_version
 
       ## MODELS
       #
@@ -197,7 +197,6 @@ module Fog
       request :delete_key_pair
 
       # Tenant
-      request :list_tenants
       request :set_tenant
       request :get_limits
 
@@ -355,16 +354,10 @@ module Fog
           @auth_token = Fog::Mock.random_base64(64)
           @auth_token_expiration = (Time.now.utc + 86400).iso8601
 
-          initialize_identity options
-
           management_url = URI.parse(options[:openstack_auth_url])
           management_url.port = 8774
           management_url.path = '/v1.1/1'
           @openstack_management_url = management_url.to_s
-
-          identity_public_endpoint = URI.parse(options[:openstack_auth_url])
-          identity_public_endpoint.port = 5000
-          @openstack_identity_public_endpoint = identity_public_endpoint.to_s
         end
 
         def data
@@ -383,29 +376,15 @@ module Fog
           Fog::Compute::OpenStack::NotFound
         end
 
+        def default_service_type
+          %w[compute]
+        end
+
         def initialize(options = {})
           @supported_versions = SUPPORTED_VERSIONS
           @supported_microversion = SUPPORTED_MICROVERSION
           @microversion_key = 'X-OpenStack-Nova-API-Version'
-
-          initialize_identity options
-
-          @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity'
-
-          @openstack_service_type   = options[:openstack_service_type] || %w(nova compute)
-          @openstack_service_name   = options[:openstack_service_name]
-
-          @connection_options       = options[:connection_options] || {}
-
-          authenticate
-
-          unless @path =~ %r{/(v2|v2\.0|v2\.1)}
-            raise Fog::OpenStack::Errors::ServiceUnavailable,
-                  "OpenStack compute binding only supports version v2 and v2.1"
-          end
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          super
         end
       end
     end

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

@@ -21,7 +21,7 @@ module Fog
 
       class Mock
         def create_security_group(name, description)
-          Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url])
+          Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0')
           tenant_id = Fog::Identity::OpenStack::V2::Mock.data[current_tenant][:tenants].keys.first
           security_group_id = Fog::Mock.random_numbers(2).to_i + 1
           data[:security_groups][security_group_id.to_s] = {

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

@@ -94,7 +94,7 @@ module Fog
           response.status = 202
 
           server_id = Fog::Mock.random_numbers(6).to_s
-          identity = Fog::Identity::OpenStack.new :openstack_auth_url => credentials[:openstack_auth_url]
+          identity = Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0')
           user = identity.users.find do |u|
             u.name == @openstack_username
           end

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

@@ -5,11 +5,7 @@ module Fog
         def evacuate_server(server_id, host = nil, on_shared_storage = nil, admin_password = nil)
           evacuate                    = {}
           evacuate['host']            = host if host
-
-          if !microversion_newer_than?('2.13') && on_shared_storage
-            evacuate['onSharedStorage'] = on_shared_storage
-          end
-
+          evacuate['onSharedStorage'] = on_shared_storage if on_shared_storage
           evacuate['adminPass']       = admin_password if admin_password
           body                        = {
             'evacuate' => evacuate

data/lib/fog/container_infra/openstack.rb

@@ -14,7 +14,7 @@ module Fog
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                  :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
-                 :openstack_identity_prefix
+                 :openstack_identity_api_version
 
       model_path 'fog/container_infra/openstack/models'
 
@@ -126,37 +126,18 @@ module Fog
           Fog::ContainerInfra::OpenStack::NotFound
         end
 
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_service_type           = options[:openstack_service_type] || ['container-infra']
-          @openstack_service_name           = options[:openstack_service_name]
-          @openstack_endpoint_type          = options[:openstack_endpoint_type] || 'publicURL'
-
-          @connection_options               = options[:connection_options] || {}
-
-          authenticate
-          set_api_path
+        def default_path_prefix
+          'v1'
+        end
 
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        def default_service_type
+          %w[container-infra]
         end
 
         def request(options = {})
           options[:headers] = {'OpenStack-API-Version' => "container-infra #{SUPPORTED_MICROVERSION}"}
           super(options)
         end
-
-        def set_api_path
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = Fog::OpenStack.get_supported_version_path(
-              SUPPORTED_VERSIONS,
-              @openstack_management_uri,
-              @auth_token,
-              @connection_options
-            )
-          end
-        end
       end
     end
   end

data/lib/fog/dns/openstack/v1.rb

@@ -14,7 +14,7 @@ module Fog
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                    :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
-                   :openstack_identity_prefix, :openstack_temp_url_key, :openstack_cache_ttl
+                   :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl
 
         request_path 'fog/dns/openstack/v1/requests'
 
@@ -102,24 +102,12 @@ module Fog
             Fog::DNS::OpenStack::NotFound
           end
 
-          def initialize(options = {})
-            initialize_identity options
-
-            @openstack_service_type           = options[:openstack_service_type] || ['dns']
-            @openstack_service_name           = options[:openstack_service_name]
-
-            @connection_options               = options[:connection_options] || {}
-
-            authenticate
-            set_api_path
-            @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          def default_path_prefix
+            'v1'
           end
 
-          def set_api_path
-            # version explicitly set to allow usage also in 'DEPRECATED' mitaka version,
-            # where f.i. quota modification was not possible at the time of creation
-            @path = '/v1' unless @path =~ /v1/
+          def default_service_type
+            %w[dns]
           end
         end
       end

data/lib/fog/dns/openstack/v2.rb

@@ -16,7 +16,7 @@ module Fog
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                    :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
-                   :openstack_identity_prefix, :openstack_temp_url_key, :openstack_cache_ttl
+                   :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl
 
         model_path 'fog/dns/openstack/v2/models'
         model       :zone
@@ -311,29 +311,12 @@ module Fog
             Fog::DNS::OpenStack::NotFound
           end
 
-          def initialize(options = {})
-            initialize_identity options
-
-            @openstack_service_type           = options[:openstack_service_type] || ['dns']
-            @openstack_service_name           = options[:openstack_service_name]
-
-            @connection_options               = options[:connection_options] || {}
-
-            authenticate
-            set_api_path
-            @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}/", @persistent, @connection_options)
+          def default_path_prefix
+            'v2'
           end
 
-          def set_api_path
-            unless @path.match(SUPPORTED_VERSIONS)
-              @path = Fog::OpenStack.get_supported_version_path(
-                SUPPORTED_VERSIONS,
-                @openstack_management_uri,
-                @auth_token,
-                @connection_options
-              )
-            end
+          def default_service_type
+            %w[dns]
           end
         end
       end

data/lib/fog/event/openstack.rb

@@ -13,7 +13,7 @@ module Fog
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                  :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
-                 :openstack_identity_prefix
+                 :openstack_identity_api_version
 
       model_path 'fog/event/openstack/models'
 
@@ -88,31 +88,12 @@ module Fog
           Fog::Event::OpenStack::NotFound
         end
 
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_service_type           = options[:openstack_service_type] || ['event']
-          @openstack_service_name           = options[:openstack_service_name]
-          @openstack_endpoint_type          = options[:openstack_endpoint_type] || 'publicURL'
-
-          @connection_options               = options[:connection_options] || {}
-
-          authenticate
-          set_api_path
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        def default_path_prefix
+          'v2'
         end
 
-        def set_api_path
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(
-              SUPPORTED_VERSIONS,
-              @openstack_management_uri,
-              @auth_token,
-              @connection_options
-            )
-          end
+        def default_service_type
+          %w[event]
         end
       end
     end