fog-openstack 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e282e95abf02b0be1feaf68de539e9f46dac483b
-  data.tar.gz: 267e6a26085dd1f653d3dc29873b3f2da90ea4ac
+  metadata.gz: 266dcbc5dc6dbde51beb0aeb2e2b8caacb3a9a68
+  data.tar.gz: a1b4dadc45afb05a56967d2d22c93bba19206ca1
 SHA512:
-  metadata.gz: 2673e523851172fdba9bd090628a702183420790368f4153901824e4a645dc35050264e7caf5eba5bba1ed7f56f8d22b3c394b21f2d16efcd0c54420775abc08
-  data.tar.gz: eb67d3fb407504402fa618a80f6b863beab72f2625f5fe364f2d3acc48743c0187008a5b80e9c6be6eb3c236148e4e9ddaed7ab9469796dc5bb8f1d922ac3691
+  metadata.gz: 2cb29370444ea727a5ddcb831bd43247110015485ce100451ec3cfb98a819b94f89ef819cd54b4c152f34a0b9aec511428601ccc3a3b473c77ff6fa44c7c4322
+  data.tar.gz: 6905cd3f139d98cbb958b37401737f977af61a0b6deac8519aedc8c73f4ea84566f8e1dc2e486572cbe47b10be01fa4cc4db770f3caa416b9ad13a530843dfe5

data/.rubocop.yml

@@ -67,6 +67,7 @@ IfUnlessModifier:
   Enabled: false
 NumericLiterals:
   AutoCorrect: false
+  MinDigits: 7
 ParallelAssignment:
   Enabled: false
 PerlBackrefs:

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 sudo: false
-script: bundle exec rake test
-env: JRUBY_OPTS=--debug
+script:
+  - bundle exec rake test
+  - bundle exec rake minitest
+  - bundle exec rake spec
+env:
+  - JRUBY_OPTS=--debug
 matrix:
   fast_finish: true
   include:

data/README.md

@@ -6,6 +6,10 @@ This is the plugin Gem to talk to [OpenStack](http://openstack.org) clouds via f
 
 The main maintainers for the OpenStack sections are @dhague, @Ladas, @seanhandley, @mdarby and @jjasghar. Please send CC them on pull requests.
 
+## Supported OpenStack APIs
+
+See the list of [supported OpenStack projects](supported.md).
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rubocop/rake_task'
-require "minitest/spec"
+require 'rake/testtask'
 
 RuboCop::RakeTask.new
 
@@ -12,7 +12,15 @@ task :test do
   sh("export FOG_MOCK=#{mock} && bundle exec shindont")
 end
 
-require 'rake/testtask'
+# The following is transition period until all shindo tests in /tests have been
+# migrated over minitest /test
+desc "Run fog-openstack unit tests for /test"
+Rake::TestTask.new do |t|
+  t.name = 'minitest'
+  t.libs.push [ "lib", "test" ]
+  t.test_files = FileList['test/openstack/*.rb']
+  t.verbose = true
+end
 
 desc "Run fog-openstack unit tests for /spec"
 Rake::TestTask.new do |t|

data/fog-openstack.gemspec

@@ -19,9 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fog-core',  '>= 1.38'
+  spec.add_dependency 'fog-core',  '>= 1.39'
   spec.add_dependency 'fog-json',  '>= 1.0'
-  spec.add_dependency 'fog-xml',   '>= 0.1'
   spec.add_dependency 'ipaddress', '>= 0.8'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
@@ -33,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'shindo',  '~> 0.3'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'webmock',  '~> 1.24.6'
 end

data/gemfiles/Gemfile-1.9

@@ -15,5 +15,5 @@ group :development, :test do
   gem "shindo",          "~> 0.3"
   gem "minitest"
   gem "vcr"
-  gem "webmock"
+  gem "webmock",         "~> 1.24.6"
 end

data/lib/fog/openstack.rb

@@ -41,6 +41,10 @@ module Fog
     autoload :OpenStack, File.expand_path('../openstack/orchestration', __FILE__)
   end
 
+  module NFV
+    autoload :OpenStack, File.expand_path('../openstack/nfv', __FILE__)
+  end
+
   module Volume
     autoload :OpenStack, File.expand_path('../openstack/volume', __FILE__)
   end
@@ -64,6 +68,7 @@ module Fog
     service(:volume,        'Volume')
     service(:metering,      'Metering')
     service(:orchestration, 'Orchestration')
+    service(:nfv,           'NFV')
     service(:baremetal,     'Baremetal')
     service(:planning,      'Planning')
     service(:introspection, 'Introspection')
@@ -220,13 +225,16 @@ module Fog
               :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)
+          project_uri = uri.clone
+          project_uri.path = uri.path.sub('/auth/tokens', "/users/#{user_id}/projects")
+          project_uri_param = "#{project_uri.scheme}://#{project_uri.host}:#{project_uri.port}#{project_uri.path}"
+          response = Fog::Core::Connection.new(project_uri_param, false, connection_options).request(request_body)
 
           projects_body = Fog::JSON.decode(response.body)
           if projects_body['projects'].empty?
             options[:openstack_domain_id] = body['token']['user']['domain']['id']
           else
+            options[:openstack_project_id] = projects_body['projects'].first['id']
             options[:openstack_project_name] = projects_body['projects'].first['name']
             options[:openstack_domain_id] = projects_body['projects'].first['domain_id']
           end
@@ -274,9 +282,9 @@ module Fog
       identity_url = identity_service['endpoints'].find { |e| e['interface']=='public' }['url'] if identity_service
 
       if body['token']['project']
-        tenant = body['token']['project']['name']
-      else
-        tenant = body['token']['user']['project']['name'] if body['token']['user']['project']
+        tenant = body['token']['project']
+      elsif body['token']['user']['project']
+        tenant = body['token']['user']['project']
       end
 
       return {
@@ -497,7 +505,7 @@ module Fog
       # Find a version in the path (e.g. the v1 in /xyz/v1/tenantid/abc) and get the path up until that version (e.g. /xyz))
       path_components = uri.path.split '/'
       version_component_index = path_components.index{|comp| comp.match(/v[0-9].?[0-9]?/) }
-      versionless_path = (path_components.take(version_component_index).join '/' if version_component_index) || ''
+      versionless_path = (path_components.take(version_component_index).join '/' if version_component_index) || uri.path
       connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}#{versionless_path}", false, connection_options)
       response = connection.request({
                                         :expects => [200, 204, 300],

data/lib/fog/openstack/baremetal.rb

@@ -11,7 +11,7 @@ module Fog
                  :openstack_tenant, :openstack_tenant_id,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type,
+                 :openstack_endpoint_type, :openstack_cache_ttl,
                  :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

data/lib/fog/openstack/common.rb

@@ -1,5 +1,3 @@
-
-
 module Fog
   module OpenStack
     module Common

data/lib/fog/openstack/compute.rb

@@ -9,7 +9,7 @@ module Fog
                  :openstack_tenant, :openstack_tenant_id,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type,
+                 :openstack_endpoint_type, :openstack_cache_ttl,
                  :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,
@@ -44,6 +44,8 @@ module Fog
       collection  :tenants
       model       :volume
       collection  :volumes
+      model       :volume_attachment
+      collection  :volume_attachments
       model       :network
       collection  :networks
       model       :snapshot
@@ -133,6 +135,8 @@ module Fog
       # Flavor Actions
       request :get_flavor_metadata
       request :create_flavor_metadata
+      request :update_flavor_metadata
+      request :delete_flavor_metadata
 
       # Flavor Access
       request :add_flavor_access
@@ -176,6 +180,7 @@ module Fog
 
       # Key Pair
       request :list_key_pairs
+      request :get_key_pair
       request :create_key_pair
       request :delete_key_pair
 
@@ -193,9 +198,10 @@ module Fog
       request :attach_volume
       request :detach_volume
       request :get_server_volumes
+      request :list_volume_attachments
 
       # Snapshot
-      request :create_volume_snapshot
+      request :create_snapshot
       request :list_snapshots
       request :list_snapshots_detail
       request :get_snapshot_details
@@ -217,6 +223,7 @@ module Fog
       # Zones
       request :list_zones
       request :list_zones_detailed
+      request :list_availability_zones
 
       class Mock
         attr_reader :auth_token
@@ -227,73 +234,75 @@ module Fog
         def self.data
           @data ||= Hash.new do |hash, key|
             hash[key] = {
-              :last_modified => {
-                :images  => {},
-                :servers => {},
-                :key_pairs => {},
+              :last_modified             => {
+                :images          => {},
+                :servers         => {},
+                :key_pairs       => {},
                 :security_groups => {},
-                :addresses => {}
+                :addresses       => {}
               },
-              :aggregates => [{
+              :aggregates                => [{
                 "availability_zone" => "nova",
-                "created_at" => "2012-11-16T06:22:23.032493",
-                "deleted" => false,
-                "deleted_at" => nil,
-                "id" => 1,
-                "name" => "name",
-                "updated_at" => nil
+                "created_at"        => "2012-11-16T06:22:23.032493",
+                "deleted"           => false,
+                "deleted_at"        => nil,
+                "id"                => 1,
+                "name"              => "name",
+                "updated_at"        => nil
               }],
-              :images  => {
+              :images                    => {
                 "0e09fbd6-43c5-448a-83e9-0d3d05f9747e" => {
-                  "id"=>"0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
-                  "name"=>"cirros-0.3.0-x86_64-blank",
-                  'progress'  => 100,
-                  'status'    => "ACTIVE",
-                  'updated'   => "",
-                  'minRam'    => 0,
-                  'minDisk'   => 0,
-                  'metadata'  => {},
-                  'links'     => [{"href"=>"http://nova1:8774/v1.1/admin/images/1", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/images/2", "rel"=>"bookmark"}]
+                  "id"       => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e",
+                  "name"     => "cirros-0.3.0-x86_64-blank",
+                  'progress' => 100,
+                  'status'   => "ACTIVE",
+                  'updated'  => "",
+                  'minRam'   => 0,
+                  'minDisk'  => 0,
+                  'metadata' => {},
+                  'links'    => [{"href" => "http://nova1:8774/v1.1/admin/images/1", "rel" => "self"},
+                                 {"href" => "http://nova1:8774/admin/images/2", "rel" => "bookmark"}]
                 }
               },
-              :servers => {},
-              :key_pairs => {},
-              :security_groups => {
+              :servers                   => {},
+              :key_pairs                 => {},
+              :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"           => {}, },
+                    {"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 => {
-                'security_group_rules' => 20,
-                'security_groups' => 10,
+              :addresses                 => {},
+              :quota                     => {
+                'security_group_rules'        => 20,
+                'security_groups'             => 10,
                 'injected_file_content_bytes' => 10240,
-                'injected_file_path_bytes' => 256,
-                'injected_files' => 5,
-                'metadata_items' => 128,
-                'floating_ips'   => 10,
-                'instances'      => 10,
-                'key_pairs'      => 10,
-                'gigabytes'      => 5000,
-                'volumes'        => 10,
-                'cores'          => 20,
-                'ram'            => 51200
+                'injected_file_path_bytes'    => 256,
+                'injected_files'              => 5,
+                'metadata_items'              => 128,
+                'floating_ips'                => 10,
+                'instances'                   => 10,
+                'key_pairs'                   => 10,
+                'gigabytes'                   => 5000,
+                'volumes'                     => 10,
+                'cores'                       => 20,
+                'ram'                         => 51200
               },
-              :volumes => {},
-              :snapshots => {}
+              :volumes                   => {},
+              :snapshots                 => {}
             }
           end
         end
@@ -304,7 +313,7 @@ module Fog
 
         include Fog::OpenStack::Core
 
-        def initialize(options={})
+        def initialize(options = {})
           @auth_token = Fog::Mock.random_base64(64)
           @auth_token_expiration = (Time.now.utc + 86400).iso8601
 
@@ -327,27 +336,26 @@ module Fog
         def reset_data
           self.class.data.delete("#{@openstack_username}-#{@current_tenant}")
         end
-
       end
 
       class Real
         include Fog::OpenStack::Core
 
-        def initialize(options={})
+        def initialize(options = {})
           initialize_identity options
 
           @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity'
 
-          @openstack_service_type   = options[:openstack_service_type] || ['nova', 'compute']
+          @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.match(/1\.1|v2/)
-            raise Fog::OpenStack::Errors::ServiceUnavailable.new(
-                    "OpenStack compute binding only supports version 2 (a.k.a. 1.1)")
+          unless @path =~ /1\.1|v2/
+            raise Fog::OpenStack::Errors::ServiceUnavailable,
+                  "OpenStack compute binding only supports version 2 (a.k.a. 1.1)"
           end
 
           @persistent = options[:persistent] || false
@@ -356,15 +364,13 @@ module Fog
 
         def request(params)
           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]}",
-              :query    => params[:query]
-            }))
+            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]}",
+                                                        :query   => params[:query]))
           rescue Excon::Errors::Unauthorized => error
             if error.response.body != 'Bad username or password' # token expiration
               @openstack_must_reauthenticate = true
@@ -375,22 +381,19 @@ module Fog
             end
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
-              when Excon::Errors::NotFound
-                Fog::Compute::OpenStack::NotFound.slurp(error)
-              else
-                error
-              end
+                  when Excon::Errors::NotFound
+                    Fog::Compute::OpenStack::NotFound.slurp(error)
+                  else
+                    error
+                  end
           end
 
-          if !response.body.empty? and response.get_header('Content-Type') == 'application/json'
+          if !response.body.empty? && response.get_header('Content-Type') == 'application/json'
             response.body = Fog::JSON.decode(response.body)
           end
 
           response
         end
-
-        private
-
       end
     end
   end

data/lib/fog/openstack/core.rb

@@ -2,7 +2,7 @@ module Fog
   module OpenStack
     module Core
       attr_accessor :auth_token
-      attr_reader   :openstack_cache_ttl
+      attr_reader :openstack_cache_ttl
       attr_reader :auth_token_expiration
       attr_reader :current_user
       attr_reader :current_user_id
@@ -12,6 +12,7 @@ module Fog
       attr_reader :openstack_project_domain
       attr_reader :openstack_domain_id
       attr_reader :openstack_user_domain_id
+      attr_reader :openstack_project_id
       attr_reader :openstack_project_domain_id
       attr_reader :openstack_identity_prefix