fog 1.29.0 → 1.30.0

data/lib/fog/openstack/core.rb

@@ -182,7 +182,6 @@ module Fog
       identity_service_type = options[:openstack_identity_service_type]
       endpoint_type         = (options[:openstack_endpoint_type] || 'public').to_s
       openstack_region      = options[:openstack_region]
-      domain_name           = options[:openstack_domain]
 
       body, token_headers = retrieve_tokens_v3(options, connection_options)
 
@@ -212,8 +211,10 @@ 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['region'] == openstack_region && endpoint['interface'] == endpoint_type
       end if openstack_region
 
       if service['endpoints'].empty?
@@ -245,7 +246,6 @@ module Fog
       identity_service = get_service(body, identity_service_type) if identity_service_type
       tenant = body['token']['project']['name']
       user = body['token']['user']['name']
-      endpoint_type = 'public'
 
       management_url = service['endpoints'].find{|s| s["interface"][endpoint_type]}["url"]
       identity_url   = identity_service['endpoints'].find{|s| s["interface"]["public"]}["url"] if identity_service
@@ -319,10 +319,15 @@ module Fog
     def self.retrieve_tokens_v3(options, connection_options = {})
       api_key     = options[:openstack_api_key].to_s
       username    = options[:openstack_username].to_s
-      tenant_name = options[:openstack_tenant].to_s
+      if options[:openstack_tenant_id]
+        tenant_id   = options[:openstack_tenant_id].to_s
+      else
+        tenant_name = options[:openstack_tenant].to_s
+      end
       auth_token  = options[:openstack_auth_token] || options[:unscoped_token]
       uri         = options[:openstack_auth_uri]
-      domain      = options[:openstack_domain]
+      userdomain  = options[:openstack_user_domain] || options[:openstack_domain]
+      project_domain  = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
 
       connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       request_body = {:auth => Hash.new}
@@ -337,21 +342,29 @@ module Fog
           :password => {
             :user => {
               :domain => {
-                :name => domain
+                :name => userdomain
               },
               :name => username,
               :password => api_key
             }
           }
         }
-        request_body[:auth][:scope] = {
-          :project => {
-            :domain => {
-              :name => domain
-            },
-            :id => tenant_name
+        unless tenant_id.nil?
+          request_body[:auth][:scope] = {
+            :project => {
+              :id => tenant_id
+            }
           }
-        }
+        else
+          request_body[:auth][:scope] = {
+            :project => {
+              :domain => {
+                :name => project_domain
+              },
+              :name => tenant_name
+            }
+          }
+        end
       end
 
       response = connection.request({

data/lib/fog/openstack/models/orchestration/resource.rb

@@ -9,7 +9,7 @@ module Fog
 
         identity :id
 
-        %w{resource_name description links logical_resource_id resource_status
+        %w{resource_name description links logical_resource_id physical_resource_id resource_status
             updated_time required_by resource_status_reason resource_type}.each do |a|
           attribute a.to_sym
         end

data/lib/fog/openstack/models/orchestration/stack.rb

@@ -6,7 +6,7 @@ module Fog
         identity :id
 
         %w{capabilities description disable_rollback links notification_topics outputs parameters
-            stack_name stack_status stack_status_reason template_description timeout_mins
+            stack_name stack_status stack_status_reason template_description timeout_mins parent
             creation_time updated_time}.each do |a|
           attribute a.to_sym
         end

data/lib/fog/openstack/network.rb

@@ -8,8 +8,10 @@ module Fog
       requires :openstack_auth_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_endpoint_type,
-                 :current_user, :current_tenant, :openstack_region
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_project_domain, :openstack_user_domain
 
       ## MODELS
       #
@@ -204,6 +206,7 @@ module Fog
         def initialize(options={})
           @openstack_username = options[:openstack_username]
           @openstack_tenant   = options[:openstack_tenant]
+          @openstack_tenant_id = options[:openstack_tenant_id]
         end
 
         def data
@@ -225,6 +228,8 @@ module Fog
       class Real
         attr_reader :current_user
         attr_reader :current_tenant
+        attr_reader :openstack_user_domain
+        attr_reader :openstack_project_domain
 
         def initialize(options={})
           @openstack_auth_token = options[:openstack_auth_token]
@@ -233,6 +238,8 @@ module Fog
             missing_credentials = Array.new
             @openstack_api_key  = options[:openstack_api_key]
             @openstack_username = options[:openstack_username]
+            @openstack_user_domain = options[:openstack_user_domain] || options[:openstack_domain]
+            @openstack_project_domain  = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
 
             missing_credentials << :openstack_api_key  unless @openstack_api_key
             missing_credentials << :openstack_username unless @openstack_username
@@ -240,6 +247,9 @@ module Fog
           end
 
           @openstack_tenant               = options[:openstack_tenant]
+          @openstack_tenant_id             = options[:openstack_tenant_id]
+          @openstack_user_domain           = options[:openstack_user_domain] || options[:openstack_domain]
+          @openstack_project_domain            = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
           @openstack_auth_uri             = URI.parse(options[:openstack_auth_url])
           @openstack_management_url       = options[:openstack_management_url]
           @openstack_must_reauthenticate  = false
@@ -261,6 +271,9 @@ module Fog
 
         def credentials
           { :provider                 => 'openstack',
+            :openstack_tenant_id      => @openstack_tenant_id,
+            :openstack_user_domain    => @openstack_user_domain,
+            :openstack_project_domain     => @openstack_project_domain,
             :openstack_auth_url       => @openstack_auth_uri.to_s,
             :openstack_auth_token     => @auth_token,
             :openstack_management_url => @openstack_management_url,
@@ -310,18 +323,29 @@ module Fog
         def authenticate
           if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
-              :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_tenant        => @openstack_tenant,
+              :openstack_tenant_id      => @openstack_tenant_id,
+              :openstack_api_key       => @openstack_api_key,
+              :openstack_username      => @openstack_username,
+              :openstack_user_domain    => @openstack_user_domain,
+              :openstack_project_domain     => @openstack_project_domain,
+              :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
+              :openstack_region        => @openstack_region
             }
 
-            credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            case @openstack_auth_uri.path
+            when %r{/v2.0}
+              credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            when %r{/v3}
+              credentials = Fog::OpenStack.authenticate_v3(options, @connection_options)
+            else
+              credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            end
+
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]

data/lib/fog/openstack/requests/storage/get_object_http_url.rb

@@ -13,7 +13,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         def get_object_http_url(container, object, expires, options = {})
-          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "http"))
+          create_temp_url(container, object, expires, "GET", {:port => 80}.merge(options).merge(:scheme => "http"))
         end
       end
     end

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

@@ -13,7 +13,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         def get_object_https_url(container, object, expires, options = {})
-          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "https"))
+          create_temp_url(container, object, expires, "GET", {:port => 443}.merge(options).merge(:scheme => "https"))
         end
 
         # creates a temporary url
@@ -23,8 +23,10 @@ module Fog
         # * object<~String> - Name of object to get expiring url for
         # * expires<~Time> - An expiry time for this url
         # * method<~String> - The method to use for accessing the object (GET, PUT, HEAD)
-        # * scheme<~String> - The scheme to use (http, https)
         # * options<~Hash> - An optional options hash
+        #   * 'scheme'<~String> - The scheme to use (http, https)
+        #   * 'host'<~String> - The host to use
+        #   * 'port'<~Integer> - The port to use
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -37,6 +39,8 @@ module Fog
           raise ArgumentError, "Storage must be instantiated with the :openstack_temp_url_key option" if @openstack_temp_url_key.nil?
 
           scheme = options[:scheme] || @scheme
+          host = options[:host] || @host
+          port = options[:port] || @port
 
           # POST not allowed
           allowed_methods = %w{GET PUT HEAD}
@@ -54,13 +58,10 @@ module Fog
 
           temp_url_options = {
             :scheme => scheme,
-            :host => @host,
-            :port => @port,
+            :host => host,
+            :port => port,
             :path => object_path_escaped,
-            :query => URI.encode_www_form(
-              :temp_url_sig => sig,
-              :temp_url_expires => expires
-            )
+            :query => "temp_url_sig=#{sig}&temp_url_expires=#{expires}"
           }
           URI::Generic.build(temp_url_options).to_s
         end

data/lib/fog/openstack/requests/volume/list_snapshots.rb

@@ -2,18 +2,19 @@ module Fog
   module Volume
     class OpenStack
       class Real
-        def list_snapshots(detailed=true)
+        def list_snapshots(detailed=true, options={})
           path = detailed ? 'snapshots/detail' : 'snapshots'
           request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => path
+            :path     => path,
+            :query    => options
           )
         end
       end
 
       class Mock
-        def list_snapshots(detailed=true)
+        def list_snapshots(detailed=true, options={})
           response = Excon::Response.new
           response.status = 200
           response.body = {

data/lib/fog/rackspace/docs/compute_v2.md

@@ -485,6 +485,10 @@ The `create` method also supports the following key values:
 		<td>Whether a read-only configuration drive is attached. Refer to  Next Gen Server API documentation - <a
 href="http://docs.rackspace.com/servers/api/v2/cs-devguide/content/config_drive_ext.html">Config Drive Extension</a>.</td>
 	</tr>
+        <tr>
+                <td>:networks</td>
+                <td>Array of uuids corresponding to cloud networks that should be attached to the server, and defaults to two elements (all-zeros for public internet and all-ones for ServiceNet). Please refer to the Rackspace <a href="http://docs.rackspace.com/servers/api/v2/cs-devguide/content/CreateServers.html">Create Server </a> API documentation for further information.</td>
+        </tr>
 </table>
 
 ## Bootstrap

data/lib/fog/rackspace/requests/cdn_v2/update_service.rb

@@ -3,8 +3,11 @@ class Fog::Rackspace::CDNV2::Real
     request(
       :expects => [201, 202],
       :method  => 'PATCH',
+      :headers => {"Content-Type" => "application/json-patch+json"},
       :body    => Fog::JSON.encode(service.operations),
       :path    => "services/#{service.id}"
     )
+
+    service.operations = []
   end
 end

data/lib/fog/vcloud_director/compute.rb

@@ -44,7 +44,7 @@ module Fog
       class TaskError < Fog::VcloudDirector::Errors::TaskError; end
 
       requires :vcloud_director_username, :vcloud_director_password, :vcloud_director_host
-      recognizes :vcloud_director_api_version, :vcloud_director_show_progress
+      recognizes :vcloud_director_api_version, :vcloud_director_show_progress, :path, :vcloud_token
 
       secrets :vcloud_director_password
 
@@ -346,6 +346,7 @@ module Fog
           @api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION
           @show_progress = options[:vcloud_director_show_progress]
           @show_progress = $stdin.tty? if @show_progress.nil?
+          @vcloud_token  = options[:vcloud_token]
         end
 
         def vcloud_token
@@ -460,7 +461,8 @@ module Fog
         private
 
         def login
-          if @vcloud_token = ENV['FOG_VCLOUD_TOKEN']
+          @vcloud_token ||= ENV['FOG_VCLOUD_TOKEN']
+          if @vcloud_token
             response = get_current_session
             session_org = response.body[:org]
             session_user = response.body[:user]
@@ -768,8 +770,9 @@ module Fog
           @port = options[:port] || Fog::Compute::VcloudDirector::Defaults::PORT
           @scheme = options[:scheme] || Fog::Compute::VcloudDirector::Defaults::SCHEME
           #@connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-          @end_point = "#{@scheme}://#{@host}#{@path}/"
-          @api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION
+          @end_point    = "#{@scheme}://#{@host}#{@path}/"
+          @api_version  = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION
+          @vcloud_token = options[:vcloud_token]
         end
 
         def vcloud_token

data/lib/fog/vcloud_director/requests/compute/instantiate_vapp_template.rb

@@ -61,6 +61,21 @@ module Fog
             }
             # The template
             xml.Source(:href => options[:template_uri])
+            # Use of sourceItems for configuring VM's during instantiation.
+            # NOTE: Name and storage profile configuration supported so far.
+            # http://pubs.vmware.com/vca/index.jsp?topic=%2Fcom.vmware.vcloud.api.doc_56%2FGUID-BF9B790D-512E-4EA1-99E8-6826D4B8E6DC.html
+            (options[:vms_config] || []).each do |vm_config|
+              next unless vm_config[:href]
+              xml.SourcedItem {
+                xml.Source(:href => vm_config[:href])
+                xml.VmGeneralParams{
+                  xml.Name(vm_config[:name]) if vm_config[:name]
+                }
+                if storage_href = vm_config[:storage_profile_href]
+                  xml.StorageProfile(:href => storage_href)
+                end
+              }
+            end
             xml.AllEULAsAccepted("true")
           }
         end

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.29.0'
+  VERSION = '1.30.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -7,6 +7,7 @@ module Fog
       requires :vsphere_username, :vsphere_password, :vsphere_server
       recognizes :vsphere_port, :vsphere_path, :vsphere_ns
       recognizes :vsphere_rev, :vsphere_ssl, :vsphere_expected_pubkey_hash
+      recognizes :vsphere_debug
 
       model_path 'fog/vsphere/models/compute'
       model :server
@@ -113,6 +114,9 @@ module Fog
           :overall_status => 'overallStatus',
           :guest_id => 'config.guestId',
           :hardware_version => 'config.version',
+          :cpuHotAddEnabled => 'config.cpuHotAddEnabled',
+          :memoryHotAddEnabled => 'config.memoryHotAddEnabled',
+          :firmware => 'config.firmware',
         }
 
         def convert_vm_view_to_attr_hash(vms)
@@ -381,6 +385,7 @@ module Fog
           @vsphere_ns       = options[:vsphere_ns] || 'urn:vim25'
           @vsphere_rev      = options[:vsphere_rev] || '4.0'
           @vsphere_ssl      = options[:vsphere_ssl] || true
+          @vsphere_debug    = options[:vsphere_debug] || false
           @vsphere_expected_pubkey_hash = options[:vsphere_expected_pubkey_hash]
           @vsphere_must_reauthenticate = false
           @vsphere_is_vcenter = nil
@@ -422,7 +427,8 @@ module Fog
                                              :ns   => @vsphere_ns,
                                              :rev  => @vsphere_rev,
                                              :ssl  => @vsphere_ssl,
-                                             :insecure => bad_cert
+                                             :insecure => bad_cert,
+                                             :debug => @vsphere_debug
               break
             rescue OpenSSL::SSL::SSLError
               raise if bad_cert

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

@@ -46,6 +46,9 @@ module Fog
         attribute :guest_id
         attribute :hardware_version
         attribute :scsi_controller # this is the first scsi controller. Right now no more of them can be used.
+        attribute :cpuHotAddEnabled
+        attribute :memoryHotAddEnabled
+        attribute :firmware
 
         def initialize(attributes={} )
           super defaults.merge(attributes)

data/lib/fog/vsphere/requests/compute/create_vm.rb

@@ -16,6 +16,9 @@ module Fog
             :deviceChange => device_change(attributes),
             :extraConfig  => extra_config(attributes),
           }
+          vm_cfg[:cpuHotAddEnabled] = attributes[:cpuHotAddEnabled] if attributes.key?(:cpuHotAddEnabled)
+          vm_cfg[:memoryHotAddEnabled] = attributes[:memoryHotAddEnabled] if attributes.key?(:memoryHotAddEnabled)
+          vm_cfg[:firmware] = attributes[:firmware] if attributes.key?(:firmware)
           resource_pool = if attributes[:resource_pool]
                             get_raw_resource_pool(attributes[:resource_pool], attributes[:cluster], attributes[:datacenter])
                           else

data/lib/fog/vsphere/requests/compute/get_datacenter.rb

@@ -11,7 +11,7 @@ module Fog
         protected
 
         def find_raw_datacenter name
-          raw_datacenters.find {|d| d.name == name} ||  get_raw_datacenter(name)
+          raw_datacenters.find {|d| d.name == name} || get_raw_datacenter(name)
         end
 
         def get_raw_datacenter name

data/lib/fog/vsphere/requests/compute/get_virtual_machine.rb

@@ -30,7 +30,13 @@ module Fog
 
         def get_vm_by_name(name, dc)
           vms = raw_list_all_virtual_machines(dc)
-          vms.keep_if { |v| v["name"] == name }.first
+
+          if name.include?('/')
+            folder, basename = name.split('/')
+            vms.keep_if { |v| v["name"] == basename && v.parent["name"] == folder }.first
+          else
+            vms.keep_if { |v| v["name"] == name }.first
+          end
         end
       end