fog 1.33.0 → 1.34.0

data/lib/fog/openstack/requests/network/get_port.rb

@@ -34,6 +34,10 @@ module Fog
                 'device_owner' => 'network:dhcp',
                 'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9',
                 'security_groups' => ['3ddde803-e550-4737-b5de-0862401dc834'],
+                'allowed_address_pairs' => [
+                    'ip_address' => '10.1.1.1',
+                    'mac_address' => 'fa:16:3e:3d:2a:cc'
+                ]
               }
             }
             response

data/lib/fog/openstack/requests/network/set_tenant.rb

@@ -6,6 +6,7 @@ module Fog
           @openstack_must_reauthenticate = true
           @openstack_tenant = tenant.to_s
           authenticate
+          set_api_path
         end
       end
 

data/lib/fog/openstack/storage.rb

@@ -5,11 +5,15 @@ module Fog
     class OpenStack < Fog::Service
       requires   :openstack_auth_url, :openstack_username,
                  :openstack_api_key
-      recognizes :persistent, :openstack_service_name,
-                 :openstack_service_type, :openstack_tenant,
-                 :openstack_region, :openstack_temp_url_key,
-                 :openstack_endpoint_type, :openstack_auth_token,
-                 :openstack_management_url
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant, :openstack_tenant_id,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_endpoint_type,
+                 :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
 
       model_path 'fog/openstack/models/storage'
       model       :directory
@@ -76,30 +80,21 @@ module Fog
       end
 
       class Real
+        include Fog::OpenStack::Core
+
         def initialize(options={})
-          @openstack_api_key = options[:openstack_api_key]
-          @openstack_username = options[:openstack_username]
-          @openstack_auth_url = options[:openstack_auth_url]
-          @openstack_auth_token = options[:openstack_auth_token]
-          @openstack_storage_url = options[:openstack_storage_url]
-          @openstack_must_reauthenticate = false
-          @openstack_service_type = options[:openstack_service_type] || ['object-store']
-          @openstack_service_name = options[:openstack_service_name]
-          @openstack_region       = options[:openstack_region]
-          @openstack_tenant       = options[:openstack_tenant]
-          @connection_options     = options[:connection_options] || {}
-          @openstack_temp_url_key = options[:openstack_temp_url_key]
-          @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL'
-          @openstack_management_url = options[:openstack_management_url]
+          initialize_identity options
+
+          @openstack_service_type           = options[:openstack_service_type] || ['object-store']
+          @openstack_service_name           = options[:openstack_service_name]
+
+          @connection_options               = options[:connection_options] || {}
+
           authenticate
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
-        def reload
-          @connection.reset
-        end
-
         # Change the current account while re-using the auth token.
         #
         # This is usefull when you have an admin role and you're able
@@ -180,40 +175,6 @@ module Fog
 
         private
 
-        def authenticate
-          if !@openstack_management_url || @openstack_must_reauthenticate
-            options = {
-              :openstack_api_key  => @openstack_api_key,
-              :openstack_username => @openstack_username,
-              :openstack_auth_uri => URI.parse(@openstack_auth_url),
-              :openstack_service_type => @openstack_service_type,
-              :openstack_service_name => @openstack_service_name,
-              :openstack_region => @openstack_region,
-              :openstack_tenant => @openstack_tenant,
-              :openstack_endpoint_type => @openstack_endpoint_type
-            }
-
-            credentials = Fog::OpenStack.authenticate(options, @connection_options)
-
-            @current_user = credentials[:user]
-            @current_tenant = credentials[:tenant]
-
-            @openstack_must_reauthenticate = false
-            @auth_token = credentials[:token]
-            @openstack_management_url = credentials[:server_management_url]
-            uri = URI.parse(@openstack_management_url)
-          else
-            @auth_token = @openstack_auth_token
-            uri = URI.parse(@openstack_management_url)
-          end
-
-          @host   = uri.host
-          @path   = uri.path
-          @path.sub!(/\/$/, '')
-          @port   = uri.port
-          @scheme = uri.scheme
-          true
-        end
       end
     end
   end

data/lib/fog/openstack/volume.rb

@@ -4,11 +4,15 @@ module Fog
   module Volume
     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,
-                 :current_user, :current_tenant,
-                 :openstack_endpoint_type, :openstack_region
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant, :openstack_tenant_id,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_endpoint_type,
+                 :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
 
       model_path 'fog/openstack/models/volume'
 
@@ -41,6 +45,7 @@ module Fog
 
       request :create_volume_snapshot
       request :list_snapshots
+      request :list_snapshots_detailed
       request :get_snapshot_details
       request :delete_snapshot
 
@@ -119,55 +124,23 @@ module Fog
       end
 
       class Real
-        attr_reader :current_user
-        attr_reader :current_tenant
+        include Fog::OpenStack::Core
 
         def initialize(options={})
-          @openstack_auth_token = options[:openstack_auth_token]
+          initialize_identity options
 
-          unless @openstack_auth_token
-            missing_credentials = Array.new
-            @openstack_api_key  = options[:openstack_api_key]
-            @openstack_username = options[:openstack_username]
+          @openstack_service_type   = options[:openstack_service_type] || ['volume']
+          @openstack_service_name   = options[:openstack_service_name]
+          @openstack_endpoint_type  = options[:openstack_endpoint_type] || 'adminURL'
 
-            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] || ['volume']
-          @openstack_service_name         = options[:openstack_service_name]
-          @openstack_region               = options[:openstack_region]
-
-          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'adminURL'
-          @connection_options = options[:connection_options] || {}
-
-          @current_user = options[:current_user]
-          @current_tenant = options[:current_tenant]
+          @connection_options       = options[:connection_options] || {}
 
           authenticate
 
-          @persistent = options[:persistent] || false
+          @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,
-            :current_user             => @current_user,
-            :current_tenant           => @current_tenant }
-        end
-
-        def reload
-          @connection.reset
-        end
-
         def request(params)
           begin
             response = @connection.request(params.merge({
@@ -202,41 +175,6 @@ module Fog
 
         private
 
-        def authenticate
-          if !@openstack_management_url || @openstack_must_reauthenticate
-            options = {
-              :openstack_region   => @openstack_region,
-              :openstack_tenant   => @openstack_tenant,
-              :openstack_api_key  => @openstack_api_key,
-              :openstack_username => @openstack_username,
-              :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
-            }
-
-            credentials = Fog::OpenStack.authenticate(options, @connection_options)
-
-            @current_user = credentials[:user]
-            @current_tenant = credentials[:tenant]
-
-            @openstack_must_reauthenticate = false
-            @auth_token = credentials[:token]
-            @openstack_management_url = credentials[:server_management_url]
-            uri = URI.parse(@openstack_management_url)
-          else
-            @auth_token = @openstack_auth_token
-            uri = URI.parse(@openstack_management_url)
-          end
-
-          @host   = uri.host
-          @path   = uri.path
-          @path.sub!(/\/$/, '')
-          @port   = uri.port
-          @scheme = uri.scheme
-          true
-        end
       end
     end
   end

data/lib/fog/rackspace/requests/storage/get_object_https_url.rb

@@ -33,8 +33,19 @@ module Fog
           hmac = Fog::HMAC.new('sha1', @rackspace_temp_url_key)
           sig  = sig_to_hex(hmac.sign(string_to_sign))
 
-          scheme = options[:scheme] ? options[:scheme] : @uri.scheme
-          "#{scheme}://#{@uri.host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
+          temp_url_query = {
+              :temp_url_sig => sig,
+              :temp_url_expires => expires
+          }
+          temp_url_query.merge!(:inline => true) if options[:inline]
+          temp_url_query.merge!(:filename => options[:filename]) if options[:filename]
+          temp_url_options = {
+              :scheme => options[:scheme] || @uri.scheme,
+              :host => @uri.host,
+              :path => object_path_escaped,
+              :query => temp_url_query.map { |param, val| "#{CGI.escape(param.to_s)}=#{CGI.escape(val.to_s)}" }.join('&')
+          }
+          URI::Generic.build(temp_url_options).to_s
         end
 
         private

data/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb

@@ -66,12 +66,13 @@ module Fog
                       xml.Netmask subnet[:Netmask]
                     }
                   end
-                  peer_subnet_config = tunnel_config[:PeerSubnet]
-                  xml.PeerSubnet {
-                    xml.Name peer_subnet_config[:Name]
-                    xml.Gateway peer_subnet_config[:Gateway]
-                    xml.Netmask peer_subnet_config[:Netmask]
-                  }
+                  tunnel_config[:PeerSubnet].each do |subnet|
+                    xml.PeerSubnet {
+                      xml.Name subnet[:Name]
+                      xml.Gateway subnet[:Gateway]
+                      xml.Netmask subnet[:Netmask]
+                    }
+                  end
                   xml.SharedSecret tunnel_config[:SharedSecret]
                   xml.SharedSecretEncrypted tunnel_config[:SharedSecretEncrypted] if tunnel_config.key?(:SharedSecretEncrypted)
                   xml.EncryptionProtocol tunnel_config[:EncryptionProtocol]

data/lib/fog/vcloud_director/models/compute/vm_customizations.rb

@@ -8,6 +8,21 @@ module Fog
         model Fog::Compute::VcloudDirector::VmCustomization
 
         attribute :vm
+
+        private
+
+        def get_by_id(item_id)
+          item = service.get_vm_customization(item_id).body
+          add_id_from_href!(item)
+          item
+        end
+
+        # The HREF returned for a VM customization object is actually the VM
+        # HREF suffixed with '/guestCustomizationSection/' so we cannot use
+        # service.add_id_from_href! like all other collections.
+        def add_id_from_href!(item={})
+          item[:id] = item[:href].gsub('/guestCustomizationSection/', '').split('/').last
+        end
       end
     end
   end

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.33.0'
+  VERSION = '1.34.0'
 end

data/lib/tasks/changelog_task.rb

@@ -135,6 +135,7 @@ Watchers      | #{watchers}
            'Nat Welch',
            'Nick Osborn',
            'nightshade427',
+           'Oleg Vivtash',
            'Patrick Debois',
            'Paul Thornthwaite',
            'Paulo Henrique Lopes Ribeiro',

data/spec/fog/openstack/volume_spec.rb

@@ -325,6 +325,11 @@ RSpec.describe Fog::Volume::OpenStack do
   end
 
   # TODO: tests for snapshots
+  it 'responds to list_snapshots_detailed' do
+    expect(@service.respond_to?(:list_snapshots_detailed)).to be true
+  end
+
+
   # TODO: tests for quotas
 
 end

data/tests/compute/helper.rb

@@ -13,12 +13,6 @@ def compute_providers
       },
       :mocked => false
     },
-    :brightbox  => {
-      :server_attributes => {
-        :image_id => Brightbox::Compute::TestSupport.image_id
-      },
-      :mocked => false
-    },
     :cloudstack => {
       :provider_attributes => {
         :cloudstack_host => 'http://host.foo'

data/tests/openstack/requests/network/port_tests.rb

@@ -1,17 +1,18 @@
 Shindo.tests('Fog::Network[:openstack] | port requests', ['openstack']) do
 
   @port_format = {
-    'id'              => String,
-    'name'            => String,
-    'network_id'      => String,
-    'fixed_ips'       => Array,
-    'mac_address'     => String,
-    'status'          => String,
-    'admin_state_up'  => Fog::Boolean,
-    'device_owner'    => String,
-    'device_id'       => String,
-    'tenant_id'       => String,
-    'security_groups' => Array,
+    'id'                    => String,
+    'name'                  => String,
+    'network_id'            => String,
+    'fixed_ips'             => Array,
+    'mac_address'           => String,
+    'status'                => String,
+    'admin_state_up'        => Fog::Boolean,
+    'device_owner'          => String,
+    'device_id'             => String,
+    'tenant_id'             => String,
+    'security_groups'       => Array,
+    'allowed_address_pairs' => Array
   }
 
   tests('success') do
@@ -20,7 +21,8 @@ Shindo.tests('Fog::Network[:openstack] | port requests', ['openstack']) do
       attributes = {:name => 'port_name', :fixed_ips => [],
                     :mac_address => 'fa:16:3e:62:91:7f', :admin_state_up => true,
                     :device_owner => 'device_owner', :device_id => 'device_id',
-                    :tenant_id => 'tenant_id' ,:security_groups => [] }
+                    :tenant_id => 'tenant_id' ,:security_groups => [],
+                    :allowed_address_pairs => [] }
       Fog::Network[:openstack].create_port(network_id, attributes).body
     end
 

data/tests/rackspace/requests/storage/object_tests.rb

@@ -1,3 +1,6 @@
+require 'uri'
+require 'cgi'
+
 Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
 
   @directory = Fog::Storage[:rackspace].directories.create(:key => 'fogobjecttests')
@@ -8,6 +11,21 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
     end
   end
 
+  def parse_url(url_string)
+    uri = URI.parse(url_string)
+    query_hash = CGI.parse(uri.query)
+    query_hash.each do |k, v|
+      query_hash[k] = v[0] if query_hash[k].is_a?(Array) and query_hash[k].count == 1
+    end
+    {
+        :scheme => uri.scheme,
+        :host => uri.host,
+        :port => uri.port,
+        :path => uri.path,
+        :query => query_hash
+    }
+  end
+
   tests('success') do
 
     tests("#put_object('fogobjecttests', 'fog_object')").succeeds do
@@ -41,7 +59,13 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
       storage.extend RackspaceStorageHelpers
       storage.override_path('/fake_version/fake_tenant')
       object_url = storage.get_object_http_url('fogobjecttests', 'fog_object', expires_at)
-      object_url =~ /http:\/\/.*clouddrive.com\/[^\/]+\/[^\/]+\/fogobjecttests\/fog_object\?temp_url_sig=7e69a73092e333095a70b3be826a7350fcbede86&temp_url_expires=1344149532/
+      url = parse_url(object_url)
+      [
+         url[:host] =~ /.*clouddrive\.com$/,
+         url[:path] =~ /\/fogobjecttests\/fog_object$/,
+         url[:query]['temp_url_sig'] == '7e69a73092e333095a70b3be826a7350fcbede86',
+         url[:query]['temp_url_expires'] == '1344149532'
+      ].all?
     end
 
     # an object key with no special characters
@@ -51,7 +75,13 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
       storage.extend RackspaceStorageHelpers
       storage.override_path('/fake_version/fake_tenant')
       object_url = storage.get_object_https_url('fogobjecttests', 'fog_object', expires_at)
-      object_url =~ /https:\/\/.*clouddrive.com\/[^\/]+\/[^\/]+\/fogobjecttests\/fog_object\?temp_url_sig=7e69a73092e333095a70b3be826a7350fcbede86&temp_url_expires=1344149532/
+      url = parse_url(object_url)
+      [
+          url[:host] =~ /.*clouddrive\.com$/,
+          url[:path] =~ /\/fogobjecttests\/fog_object$/,
+          url[:query]['temp_url_sig'] == '7e69a73092e333095a70b3be826a7350fcbede86',
+          url[:query]['temp_url_expires'] == '1344149532'
+      ].all?
     end
 
     # an object key nested under a /
@@ -61,7 +91,13 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
       storage.extend RackspaceStorageHelpers
       storage.override_path('/fake_version/fake_tenant')
       object_url = storage.get_object_https_url('fogobjecttests', 'fog/object', expires_at)
-      object_url =~ /https:\/\/.*clouddrive.com\/[^\/]+\/[^\/]+\/fogobjecttests\/fog\/object\?temp_url_sig=3e99892828804e3d0fdadd18c543b688591ca8b8&temp_url_expires=1344149532/
+      url = parse_url(object_url)
+      [
+          url[:host] =~ /.*clouddrive\.com$/,
+          url[:path] =~ /\/fogobjecttests\/fog\/object$/,
+          url[:query]['temp_url_sig'] == '3e99892828804e3d0fdadd18c543b688591ca8b8',
+          url[:query]['temp_url_expires'] == '1344149532'
+      ].all?
     end
 
     # an object key containing a -
@@ -71,7 +107,13 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
       storage.extend RackspaceStorageHelpers
       storage.override_path('/fake_version/fake_tenant')
       object_url = storage.get_object_https_url('fogobjecttests', 'fog-object', expires_at)
-      object_url =~ /https:\/\/.*clouddrive.com\/[^\/]+\/[^\/]+\/fogobjecttests\/fog-object\?temp_url_sig=a24dd5fc955a57adce7d1b5bc4ec2c7660ab8396&temp_url_expires=1344149532/
+      url = parse_url(object_url)
+      [
+          url[:host] =~ /.*clouddrive\.com$/,
+          url[:path] =~ /\/fogobjecttests\/fog-object$/,
+          url[:query]['temp_url_sig'] == 'a24dd5fc955a57adce7d1b5bc4ec2c7660ab8396',
+          url[:query]['temp_url_expires'] == '1344149532'
+      ].all?
     end
 
     tests("put_object with block") do