fog 1.23.0 → 1.24.0

data/lib/fog/hp/requests/network/list_networks.rb

@@ -21,12 +21,25 @@ module Fog
         #       * 'admin_state_up'<~Boolean>: - true or false
         #       * 'shared'<~Boolean>: - true or false
         def list_networks(options = {})
-          request(
-            :expects => 200,
-            :method  => 'GET',
-            :path    => 'networks',
-            :query   => options
-          )
+          begin
+            request(
+              :expects => 200,
+              :method  => 'GET',
+              :path    => 'networks',
+              :query   => options
+            )
+          rescue Fog::HP::Network::NotFound
+            begin
+              request(
+                :expects => 200,
+                :method  => 'GET',
+                :path    => 'os-networks',
+                :query   => options
+              )
+            rescue Exception => e
+              throw e
+            end
+          end
         end
       end
 

data/lib/fog/hp/storage.rb

@@ -326,7 +326,7 @@ module Fog
           auth_version = auth_version.to_s.downcase.to_sym
 
           ### Pass the service name for object storage to the authentication call
-          options[:hp_service_type] ||= "Object Storage"
+          options[:hp_service_type] ||= " object-store"
           @hp_tenant_id = options[:hp_tenant_id]
           @hp_avl_zone  = options[:hp_avl_zone]
 

data/lib/fog/linode/models/compute/disks.rb

@@ -16,7 +16,7 @@ module Fog
         def get(id)
           requires :server
           new disks(server.id, id).first
-        rescue Fog::Linode::Compute::NotFound
+        rescue Fog::Compute::Linode::NotFound
           nil
         end
 

data/lib/fog/linode/models/compute/flavor.rb

@@ -9,31 +9,7 @@ module Fog
         attribute :name
         attribute :ram
         attribute :price
-
-        def cores
-          case id
-          when 1
-            1
-          when 2
-          	2
-          when 4
-          	4
-          when 6
-          	6
-          when 7
-          	8
-          when 8
-          	12
-          when 9
-          	16
-          when 10
-          	20
-          when 12
-          	20
-          else
-          	0
-          end
-        end
+        attribute :cores
 
         def bits
           0 # these are determined by images you select not the hardware

data/lib/fog/linode/models/compute/flavors.rb

@@ -13,7 +13,7 @@ module Fog
 
         def get(id)
           new flavors(id).first
-        rescue Fog::Linode::Compute::NotFound
+        rescue Fog::Compute::Linode::NotFound
           nil
         end
 

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

@@ -66,6 +66,10 @@ module Fog
           service.linode_delete id
         end
 
+        def ready?
+          status == 1
+        end
+
         private
         def config
           service.linode_config_list(id).body['DATA'].first['ConfigID']
@@ -79,9 +83,9 @@ module Fog
         end
 
         def create_disks
-          @swap = disks.create :type => :swap, :name => @name, :size => @flavor.ram
+          @swap = disks.create :type => :swap, :name => @name, :size => 256
           @disk = disks.create(:type => @type, :image => @image, :stack_script => @stack_script,
-                               :password => @password, :name => @name, :size => (@flavor.disk*1024)-@flavor.ram)
+                               :password => @password, :name => @name, :size => (@flavor.disk*1024)-256)
         end
 
         def create_config

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

@@ -22,8 +22,6 @@ module Fog
             :query    => { :api_action => 'avail.linodeplans' }.merge!(options)
           )
 
-          #hack for plans not filtering by id like they should above, remove when they fix it.
-          result.body["DATA"] = result.body["DATA"].select { |item| item['PLANID'] == linodeplan_id } if linodeplan_id
           result
         end
       end
@@ -56,6 +54,7 @@ module Fog
           { "PRICE" => 19.95, "RAM" => 512, "XFER" => 200,
             "PLANID" => linodeplan_id, "LABEL" => "Linode #{linodeplan_id}",
             "DISK" => 20,
+            "CORES" => 1,
             "AVAIL" => {
               "3"=>48, "2"=>207, "7"=>161, "6"=>143, "4"=>108, "8"=>60
             }

data/lib/fog/local/models/storage/file.rb

@@ -95,8 +95,10 @@ module Fog
               next
             end
             # create directory if it doesn't already exist
-            unless ::File.directory?(dir_path)
+            begin
               Dir.mkdir(dir_path)
+            rescue Errno::EEXIST
+              raise unless ::File.directory?(dir_path)
             end
           end
           file = ::File.new(path, 'wb')

data/lib/fog/openstack/models/storage/directory.rb

@@ -9,6 +9,8 @@ module Fog
 
         attribute :bytes, :aliases => 'X-Container-Bytes-Used'
         attribute :count, :aliases => 'X-Container-Object-Count'
+        
+        attr_writer :public
 
         def destroy
           requires :key
@@ -27,17 +29,13 @@ module Fog
           end
         end
 
-        def public=(new_public)
-          @public = new_public
-        end
-
         def public_url
           raise NotImplementedError
         end
 
         def save
           requires :key
-          service.put_container(key)
+          service.put_container(key, :public => @public)
           true
         end
       end

data/lib/fog/openstack/network.rb

@@ -308,7 +308,7 @@ module Fog
         private
 
         def authenticate
-          if @openstack_must_reauthenticate || @openstack_auth_token.nil?
+          if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
               :openstack_tenant   => @openstack_tenant,
               :openstack_api_key  => @openstack_api_key,

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

@@ -7,11 +7,14 @@ module Fog
         # ==== Parameters
         # * name<~String> - Name for container, should be < 256 bytes and must not contain '/'
         #
-        def put_container(name)
+        def put_container(name, options={})
+          headers = options[:headers] || {}
+          headers['X-Container-Read'] = '.r:*' if options[:public]
           request(
             :expects  => [201, 202],
             :method   => 'PUT',
-            :path     => Fog::OpenStack.escape(name)
+            :path     => Fog::OpenStack.escape(name),
+            :headers  => headers
           )
         end
       end

data/lib/fog/openstack/storage.rb

@@ -7,7 +7,8 @@ module Fog
                  :openstack_api_key
       recognizes :persistent, :openstack_service_name,
                  :openstack_service_type, :openstack_tenant,
-                 :openstack_region, :openstack_temp_url_key
+                 :openstack_region, :openstack_temp_url_key,
+                 :openstack_endpoint_type
 
       model_path 'fog/openstack/models/storage'
       model       :directory
@@ -80,12 +81,13 @@ module Fog
           @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_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'
           authenticate
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@@ -185,7 +187,7 @@ module Fog
               :openstack_service_name => @openstack_service_name,
               :openstack_region => @openstack_region,
               :openstack_tenant => @openstack_tenant,
-              :openstack_endpoint_type => 'publicURL'
+              :openstack_endpoint_type => @openstack_endpoint_type
             }
 
             credentials = Fog::OpenStack.authenticate(options, @connection_options)

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

@@ -26,6 +26,7 @@ module Fog
         attribute :volumes
         attribute :raw
         attribute :quota
+        attribute :ips
 
         def ready?
           !(status =~ /down/i)

data/lib/fog/rackspace/block_storage.rb

@@ -139,7 +139,7 @@ module Fog
               @rackspace_endpoint = nil
               @rackspace_region = :lon
             else
-              @rackspace_region = options[:rackspace_region] || :dfw
+              @rackspace_region = options[:rackspace_region]
             end
           else
             #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
@@ -154,10 +154,6 @@ module Fog
             regions = @identity_service.service_catalog.display_service_regions(service_name)
             Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid region for :rackspace_region are #{regions}.")
           end
-
-          unless options[:rackspace_region]
-            Fog::Logger.deprecation("Default region support will be removed in an upcoming release. Please switch to manually setting your endpoint. This requires setting the :rackspace_region option")
-          end
         end
 
         def append_tenant_v1(credentials)

data/lib/fog/rackspace/cdn.rb

@@ -29,7 +29,7 @@ module Fog
           @connection_options = options[:connection_options] || {}
           @rackspace_auth_url = options[:rackspace_auth_url]
           @rackspace_cdn_url = options[:rackspace_cdn_url]
-          @rackspace_region = options[:rackspace_region] || :dfw
+          @rackspace_region = options[:rackspace_region]
         end
 
         def service_name

data/lib/fog/rackspace/compute_v2.rb

@@ -214,7 +214,7 @@ module Fog
               @rackspace_region = :lon
             else
               # we are actually using a custom endpoint
-              @rackspace_region = options[:rackspace_region] || :dfw
+              @rackspace_region = options[:rackspace_region]
             end
           else
             #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
@@ -229,10 +229,6 @@ module Fog
             regions = @identity_service.service_catalog.display_service_regions(service_name)
             Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid regions for :rackspace_region are #{regions}.")
           end
-
-          unless options[:rackspace_region]
-            Fog::Logger.deprecation("Default region support will be removed in an upcoming release. Please switch to manually setting your endpoint. This requires setting the :rackspace_region option")
-          end
         end
 
         def append_tenant_v1(credentials)

data/lib/fog/rackspace/databases.rb

@@ -51,6 +51,8 @@ module Fog
       request :list_users
       request :create_user
       request :delete_user
+      request :grant_user_access
+      request :revoke_user_access
 
       class Mock < Fog::Rackspace::Service
         def request(params)
@@ -126,11 +128,11 @@ module Fog
               @rackspace_region = :lon
             else
               # we are actually using a custom endpoint
-              @rackspace_region = options[:rackspace_region] || :dfw
+              @rackspace_region = options[:rackspace_region]
             end
           else
             #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
-             @rackspace_endpoint ||= DFW_ENDPOINT
+            @rackspace_endpoint ||= DFW_ENDPOINT
           end
         end
 
@@ -141,10 +143,6 @@ module Fog
             regions = @identity_service.service_catalog.display_service_regions(service_name)
             Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid region for :rackspace_region are #{regions}.")
           end
-
-          unless options[:rackspace_region]
-            Fog::Logger.deprecation("Default region support will be removed in an upcoming release. Please switch to manually setting your endpoint. This requires setting the :rackspace_region option")
-          end
         end
 
         def append_tenant_v1(credentials)

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

@@ -93,10 +93,6 @@ The Storage service supports the following additional parameters:
 		<td>:rackspace_cdn_url</td>
 		<td>The endpoint for the CDN service. By default, Fog::Storage pick the appropriate endpoint for region. This option will typically only be used for Rackspace Private Cloud Access.</td>
 	</tr>
-		<tr>
-		<td>:chunk_size</td>
-		<td>The chunk size in bytes used for block transfers. By default, Fog uses 1 MB chunks.</td>
-	</tr>
 </table>
 
 
@@ -136,6 +132,10 @@ Fog supports passing additional connection parameters to its underlying HTTP lib
 		<td>:ssl_verify_peer</td>
 		<td>SSL verify peer (default: true)</td>
 	</tr>	
+    <tr>
+		<td>:chunk_size</td>
+		<td>The chunk size in bytes used for block transfers. By default, Fog uses 1 MB chunks.</td>
+	</tr>
 </table>
 
 

data/lib/fog/rackspace/load_balancers.rb

@@ -170,7 +170,7 @@ module Fog
               @rackspace_region = :lon
             else
               # we are actually using a custom endpoint
-              @rackspace_region = options[:rackspace_region] || :dfw
+              @rackspace_region = options[:rackspace_region]
             end
           else
             #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
@@ -185,10 +185,6 @@ module Fog
             regions = @identity_service.service_catalog.display_service_regions(service_name)
             Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid regions for :rackspace_region are #{regions}.")
           end
-
-          unless options[:rackspace_region]
-            Fog::Logger.deprecation("Default region support will be removed in an upcoming release. Please switch to manually setting your endpoint. This requires setting the :rackspace_region option")
-          end
         end
 
         def append_tenant_v1(credentials)

data/lib/fog/rackspace/models/auto_scale/group_builder.rb

@@ -60,6 +60,8 @@ module Fog
             }
 
             server_template["personality"] = attributes[:personality] if attributes[:personality]
+            server_template["user_data"] = [attributes[:user_data]].pack('m') if attributes[:user_data]
+            server_template["config_drive"] = 'true' if attributes[:config_drive]
             server_template["networks"] = networks_to_hash(attributes[:networks]) if attributes[:networks]
             server_template
           end

data/lib/fog/rackspace/models/block_storage/volume.rb

@@ -48,6 +48,10 @@ module Fog
         # @return [String] region of the volume
         attribute :availability_zone
 
+        # @!attribute [rw] image_id
+        # @return [String] The ID of an image used to create a bootable volume.
+        attribute :image_id, :aliases => ['image', 'imageRef'], :squash => 'id'
+
         # Returns true if the volume is in a ready state
         # @return [Boolean] returns true if volume is in a ready state
         def ready?
@@ -104,7 +108,8 @@ module Fog
             :display_description => display_description,
             :volume_type => volume_type,
             :availability_zone => availability_zone,
-            :snapshot_id => attributes[:snapshot_id]
+            :snapshot_id => attributes[:snapshot_id],
+            :image_id => attributes[:image_id]
           })
           merge_attributes(data.body['volume'])
           true

data/lib/fog/rackspace/models/compute_v2/server.rb

@@ -148,6 +148,16 @@ module Fog
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Images-d1e4435.html
         attribute :image_id, :aliases => 'image', :squash => 'id'
 
+        # @!attribute [w] boot_volume_id
+        # @return [String] The ID of a bootable volume from the BlockStorage service.
+        # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
+        attribute :boot_volume_id
+
+        # @!attribute [w] boot_image_id
+        # @return [String] The ID of an image to create a bootable volume from.
+        # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
+        attribute :boot_image_id
+
         # @!attribute [rw] password
         # @return [String] Password for system adminstrator account.
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Server_Passwords-d1e2510.html
@@ -221,7 +231,8 @@ module Fog
 
         # Creates server
         # * requires attributes: service:, :name, :image_id, and :flavor_id
-        # * optional attributes :disk_config, :metadata, :personality, :config_drive
+        # * optional attributes :disk_config, :metadata, :personality, :config_drive, :boot_volume_id, :boot_image_id
+        # * :image_id should be "" if :boot_volume_id or :boot_image_id are provided.
         # @return [Boolean] returns true if server is being created
         # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
@@ -251,10 +262,13 @@ module Fog
           modified_options[:config_drive] = config_drive unless config_drive.nil?
           modified_options[:user_data] = user_data_encoded unless user_data_encoded.nil?
           modified_options[:key_name] ||= attributes[:key_name]
+          modified_options[:boot_volume_id] ||= attributes[:boot_volume_id]
+          modified_options[:boot_image_id] ||= attributes[:boot_image_id]
 
           if modified_options[:networks]
             modified_options[:networks].map! { |id| { :uuid => id } }
           end
+
           data = service.create_server(name, image_id, flavor_id, 1, 1, modified_options)
           merge_attributes(data.body['server'])
           true

data/lib/fog/rackspace/models/databases/database.rb

@@ -21,6 +21,17 @@ module Fog
           true
         end
 
+        def grant_access_for(user)
+          requires :identity, :instance
+          service.grant_user_access(instance.identity, user, name)
+        end
+
+        def revoke_access_for(user)
+          requires :identity, :instance
+          service.revoke_user_access(instance.identity, user, name)
+        end
+
+
         private
 
         def instance