fog 1.20.0 → 1.21.0

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

@@ -9,7 +9,7 @@ module Fog
 
         model Fog::Compute::RackspaceV2::Server
 
-        # Returns list of servers 
+        # Returns list of servers
         # @return [Fog::Compute::RackspaceV2::Servers] Retrieves a list servers.
         # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
@@ -41,7 +41,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::InvalidServerStateException] if server state is an error state
         def bootstrap(new_attributes = {})
           server = create(new_attributes)
-          server.wait_for(1500) { ready? && !public_ip_address.empty? }
+          server.wait_for { ready? && !public_ip_address.empty? }
           server.setup(:password => server.password)
           server
         end

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

@@ -0,0 +1,87 @@
+require 'fog/core/collection'
+require 'fog/rackspace/models/compute_v2/virtual_interface'
+
+module Fog
+  module Compute
+    class RackspaceV2
+      class VirtualInterface < Fog::Model
+
+        # @!attribute [r] id
+        # @return [String] The virtual interface id
+        identity :id
+
+        # @!attribute [r] mac_address
+        # @return [String] The Media Access Control (MAC) address for the virtual interface.
+        #   A MAC address is a unique identifier assigned to network interfaces for communications on the physical network segment.
+        attribute :mac_address
+
+        # @!attribute [r] ip_addresses
+        # @return [Array<Hash>] returns an array of hashes containing information about allocated ip addresses and their associated networks
+        # @example
+        # [
+        #   {
+        #       "address": "2001:4800:7810:0512:d87b:9cbc:ff04:850c",
+        #       "network_id": "ba122b32-dbcc-4c21-836e-b701996baeb3",
+        #       "network_label": "public"
+        #   },
+        #   {
+        #       "address": "64.49.226.149",
+        #       "network_id": "ba122b32-dbcc-4c21-836e-b701996baeb3",
+        #       "network_label": "public"
+        #   }
+        # ]
+        attribute :ip_addresses
+
+        # Saves the virtual interface.
+        # This method can only create a virtual interface. Attempting to update interface will result an exception
+        # @return [Boolean] true if virtual interface has been saved
+        def save(attributes = {})
+          if persisted?
+            raise Fog::Errors::Error.new("This virtual interface has already been created and it cannot be updated")
+          else
+            create
+          end
+          true
+        end
+
+        # Creates Virtual interface for server
+        # * requires attributes: :network
+        # @return [Boolean] returns true if virtual network interface is being created
+        # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::RackspaceV2::ServiceError]
+        # @example To create a virtual interface;
+        # my_server.virtual_interfaces.create :network => my_network
+        # @see http://docs.rackspace.com/servers/api/v2/cn-devguide/content/api_create_virtual_interface.html
+        def create
+          data = service.create_virtual_interface(server_id, network_id)
+          merge_attributes(data.body['virtual_interfaces'].first)
+        end
+
+        # Destroy the virtual interface
+        # @return [Boolean] returns true if virtual interface has been destroyed
+        # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::RackspaceV2::ServiceError]
+        # @see http://docs.rackspace.com/servers/api/v2/cn-devguide/content/delete_virt_interface_api.html
+        def destroy
+          service.delete_virtual_interface(server_id, id)
+          true
+        end
+
+        private
+
+        def server_id
+           attributes[:server].is_a?(Server) ? attributes[:server].id : attributes[:server]
+        end
+
+        def network_id
+          attributes[:network].is_a?(Network) ? attributes[:network].id : attributes[:network]
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+require 'fog/core/collection'
+require 'fog/rackspace/models/compute_v2/virtual_interface'
+require 'fog/rackspace/models/compute_v2/server'
+
+module Fog
+  module Compute
+    class RackspaceV2
+      class VirtualInterfaces < Fog::Collection
+        model Fog::Compute::RackspaceV2::VirtualInterface
+
+        attr_reader :server
+
+        def server=(obj)
+          if obj.is_a?(Server)
+            @server = obj
+          else
+            @server = Fog::Compute::RackspaceV2::Server.new :id => obj, :service => service
+          end
+        end
+
+        # Returns list of virtual interfaces for a server
+        # @return [Fog::Compute::RackspaceV2::Servers] Retrieves a list virtual interfaces for server.
+        # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::RackspaceV2::ServiceError]
+        # @note Fog's current implementation only returns 1000 servers
+        # @note The filter parameter on the method is just to maintain compatability with other providers that support filtering.
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html
+        # @see Fog::Compute::RackspaceV2::Server#virtual_interfaces
+        def all
+          raise "Please access this collection via Server#virtual_interfaces" unless self.server
+
+          data = service.list_virtual_interfaces(server.id).body['virtual_interfaces']
+          objects = load(data)
+          objects.each {|obj| obj.attributes[:server] = self.server}
+          objects
+        end
+
+        def new(attributes = {})
+          super({ :server => server }.merge(attributes))
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/models/dns/zones.rb

@@ -11,7 +11,7 @@ module Fog
         model Fog::DNS::Rackspace::Zone
 
         # List all domains. Return by default a maximum of 100 items
-        # @param [Hash] options Options to pass to the underlying API call 
+        # @param [Hash] options Options to pass to the underlying API call
         # @option options [String] :name search for domains containing the given substring
         # @option options [Integer] :limit number of records to return
         # @option options [Integer] :offset starting offset of records to return
@@ -22,7 +22,7 @@ module Fog
 
           load(body['domains'])
         end
-        
+
         alias :each_zone_this_page :each
         def each
           return self unless block_given?

data/lib/fog/rackspace/models/identity/service_catalog.rb

@@ -5,12 +5,12 @@ module Fog
     class Identity
       class ServiceCatalog < Fog::Model
         attr_reader :catalog
-        
+
         def initialize(attributes)
           @service = attributes.delete(:service)
           @catalog = attributes.delete(:catalog) || {}
         end
-        
+
         def services
           catalog.collect {|s| s["name"]}
         end
@@ -22,7 +22,7 @@ module Fog
           h["endpoints"].select {|e| e[key]}
         end
 
-        
+
         def display_service_regions(service_name, service_net=false)
           endpoints = get_endpoints(service_name, service_net)
           regions = endpoints.collect do |e|
@@ -30,7 +30,7 @@ module Fog
           end
           regions.join(", ")
         end
-        
+
         def get_endpoint(service_name, region=nil, service_net=false)
           service_region = region_key(region)
 
@@ -54,19 +54,19 @@ module Fog
 
           raise "Unknown region :#{region} for service #{service_name}. Please use one of the following regions: #{display_service_regions(service_name)}"
         end
-        
+
         def reload
           @service.authenticate
           @catalog = @service.service_catalog.catalog
           self
         end
-                
+
         def self.from_response(service, hash)
           ServiceCatalog.new :service => service, :catalog => hash["access"]["serviceCatalog"]
         end
 
         private
-        
+
         def network_type_key(service_net)
           service_net ? "internalURL" : "publicURL"
         end
@@ -74,12 +74,12 @@ module Fog
         def matching_region?(h, region)
           region_key(h["region"]) == region
         end
-        
+
         def region_key(region)
           return region.to_s.upcase if region.is_a? Symbol
           (region.nil? || region.empty?) ? "GLOBAL" : region.to_s.upcase
         end
-        
+
       end
     end
   end

data/lib/fog/rackspace/models/queues/claims.rb

@@ -54,7 +54,7 @@ module Fog
           new(data)
         rescue Fog::Rackspace::Queues::NotFound
           nil
-        # HACK - This has been escalated to the Rackspace Queues team, as this 
+        # HACK - This has been escalated to the Rackspace Queues team, as this
         # behavior is not normal HTTP behavior.
         rescue Fog::Rackspace::Queues::ServiceError
           nil

data/lib/fog/rackspace/models/queues/messages.rb

@@ -69,7 +69,7 @@ module Fog
           new(data)
         rescue Fog::Rackspace::Queues::NotFound
           nil
-        # HACK - This has been escalated to the Rackspace Queues team, as this 
+        # HACK - This has been escalated to the Rackspace Queues team, as this
         # behavior is not normal HTTP behavior.
         rescue Fog::Rackspace::Queues::ServiceError
           nil

data/lib/fog/rackspace/models/queues/queues.rb

@@ -34,7 +34,7 @@ module Fog
         # @raise [Fog::Rackspace::Queues::ServiceError]
         # @see http://docs.rackspace.com/queues/api/v1.0/cq-devguide/content/GET_checkQueueExists__version__queues__queue_name__queue-operations-dle001.html
         def get(queue_name)
-          #204 no content is returned on success.  That's why no data is passed 
+          #204 no content is returned on success.  That's why no data is passed
           # from the GET to the constructor.
           service.get_queue(queue_name)
           new({:name => queue_name})

data/lib/fog/rackspace/models/storage/account.rb

@@ -21,8 +21,8 @@ module Fog
 
         # @!attribute [r] object_count
         # @return [Integer] The total number of objects in the account
-        attribute :object_count, :aliases => 'X-Account-Object-Count', :type => :integer        
-        
+        attribute :object_count, :aliases => 'X-Account-Object-Count', :type => :integer
+
         # Saves account settings (meta_temp_url_key)
         # @return [Boolean] returns true if successfully updated
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
@@ -33,7 +33,7 @@ module Fog
           service.post_set_meta_temp_url_key meta_temp_url_key
           true
         end
-        
+
         # Reload account with latest data from Cloud Files
         # @return [Fog::Storage::Rackspace::Account] returns itself
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
@@ -47,4 +47,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/rackspace/models/storage/directories.rb

@@ -46,11 +46,11 @@ module Fog
               directory.merge_attributes(key => value)
             end
           end
-          
+
           directory.metadata = Metadata.from_headers(directory, data.headers)
           directory.files.merge_attributes(options)
           directory.files.instance_variable_set(:@loaded, true)
-          
+
           data.body.each do |file|
             directory.files << directory.files.new(file)
           end

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

@@ -26,7 +26,7 @@ module Fog
         # @note This value does not persist and will need to be specified each time a directory is created or retrieved
         # @see Directories#get
         attribute :cdn_cname
-        
+
         # @!attribute [w] public
         # Required for compatibility with other Fog providers. Not Used.
         attr_writer :public
@@ -45,7 +45,7 @@ module Fog
           end
           attributes[:metadata]
         end
-        
+
         # Retrieve directory metadata
         # @return [Fog::Storage::Rackspace::Metadata] metadata key value pairs.
         def metadata
@@ -100,7 +100,7 @@ module Fog
           end
           @public
         end
-        
+
         # Reload directory with latest data from Cloud Files
         # @return [Fog::Storage::Rackspace::Directory] returns itself
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
@@ -113,7 +113,7 @@ module Fog
           @files = nil
           super
         end
-        
+
         # Returns the public url for the directory.
         # If the directory has not been published to the CDN, this method will return nil as it is not publically accessible. This method will return the approprate
         # url in the following order:
@@ -132,7 +132,7 @@ module Fog
           return urls[:ssl_uri] if service.ssl?
           cdn_cname || urls[:uri]
         end
-        
+
         # URL used to stream video to iOS devices. Cloud Files will auto convert to the approprate format.
         # @return [String] iOS URL
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
@@ -143,7 +143,7 @@ module Fog
         def ios_url
           urls[:ios_uri]
         end
-        
+
         # URL used to stream resources
         # @return [String] streaming url
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
@@ -173,22 +173,22 @@ module Fog
           end
           true
         end
-        
+
         private
-        
+
         def cdn_enabled?
           service.cdn && service.cdn.enabled?
         end
-        
+
         def urls
-          requires :key          
+          requires :key
           return {} unless cdn_enabled?
           @urls ||= service.cdn.urls(self)
         end
-           
+
         def create_or_update_container
-          headers = attributes[:metadata].nil? ? {} : metadata.to_headers           
-          service.put_container(key, headers)        
+          headers = attributes[:metadata].nil? ? {} : metadata.to_headers
+          service.put_container(key, headers)
         end
       end
     end

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

@@ -36,7 +36,7 @@ module Fog
         # @return [String] string containing a list of space delimited URLs
         # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/CORS_Container_Header-d1e1300.html
         attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin']
-        
+
         # @!attribute [rw] origin
         # @return [String] The origin is the URI of the object's host.
         # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/CORS_Container_Header-d1e1300.html
@@ -133,13 +133,13 @@ module Fog
           end
           attributes[:metadata]
         end
-        
+
         # File metadata
         # @return [Fog::Storage::Rackspace::Metadata] metadata key value pairs.
         def metadata
           attributes[:metadata] ||= Fog::Storage::Rackspace::Metadata.new(self)
         end
-        
+
         # Required for compatibility with other Fog providers. Not Used.
         def owner=(new_owner)
           if new_owner
@@ -177,7 +177,7 @@ module Fog
         def public?
           directory.public?
         end
-        
+
 
         # Get a url for file.
         #
@@ -213,7 +213,7 @@ module Fog
         def public_url
           Files::file_url directory.public_url, key
         end
-        
+
         # URL used to stream video to iOS devices without needing to convert your video
         # @return [String] iOS URL
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
@@ -224,7 +224,7 @@ module Fog
         def ios_url
           Files::file_url directory.ios_url, key
         end
-        
+
         # URL used to stream resources
         # @return [String] streaming url
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
@@ -234,8 +234,8 @@ module Fog
         # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Streaming-CDN-Enabled_Containers-d1f3721.html
         def streaming_url
           Files::file_url directory.streaming_url, key
-        end      
-        
+        end
+
         # Immediately purge file from the CDN network
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
         # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
@@ -272,7 +272,7 @@ module Fog
 
           data = service.put_object(directory.key, key, body, options)
           update_attributes_from(data)
-          
+
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)
           true