fog 0.3.25 → 0.3.26

data/lib/fog/aws/models/compute/security_groups.rb

@@ -11,10 +11,49 @@ module Fog
 
         model Fog::AWS::Compute::SecurityGroup
 
+        # Creates a new security group
+        #
+        # AWS.security_groups.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new image
+        #
+        #>> AWS.security_groups.new
+        #  <Fog::AWS::Compute::SecurityGroup
+        #    name=nil,
+        #    description=nil,
+        #    ip_permissions=nil,
+        #    owner_id=nil
+        #  >
+        #
+        
         def initialize(attributes)
           self.filters ||= {}
           super
         end
+        
+        # Returns an array of all security groups that have been created
+        #
+        # AWS.security_groups.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all security groups
+        #
+        #>> AWS.security_groups.all
+        #  <Fog::AWS::Compute::SecurityGroups
+        #    filters={}
+        #    [
+        #      <Fog::AWS::Compute::SecurityGroup
+        #        name="default",
+        #        description="default group",
+        #        ip_permissions=[{"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>-1, "toPort"=>-1, "ipRanges"=>[], "ipProtocol"=>"icmp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"tcp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"udp"}],
+        #        owner_id="312571045469"
+        #      >
+        #    ]
+        #  >
+        #
 
         def all(filters = filters)
           unless filters.is_a?(Hash)
@@ -22,10 +61,27 @@ module Fog
             filters = {'group-name' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_security_groups(@filters).body
+          data = connection.describe_security_groups(filters).body
           load(data['securityGroupInfo'])
         end
 
+        # Used to retreive a security group
+        # group name is required to get the associated flavor information.
+        #
+        # You can run the following command to get the details:
+        # AWS.security_groups.get("default")
+        #
+        # ==== Returns
+        #
+        #>> AWS.security_groups.get("default")
+        #  <Fog::AWS::Compute::SecurityGroup
+        #    name="default",
+        #    description="default group",
+        #    ip_permissions=[{"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>-1, "toPort"=>-1, "ipRanges"=>[], "ipProtocol"=>"icmp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"tcp"}, {"groups"=>[{"groupName"=>"default", "userId"=>"312571045469"}], "fromPort"=>0, "toPort"=>65535, "ipRanges"=>[], "ipProtocol"=>"udp"}],
+        #    owner_id="312571045469"
+        #  > 
+        #
+        
         def get(group_name)
           if group_name
             self.class.new(:connection => connection).all('group-name' => group_name).first

data/lib/fog/aws/models/compute/servers.rb

@@ -11,6 +11,45 @@ module Fog
 
         model Fog::AWS::Compute::Server
 
+        # Creates a new server
+        #
+        # AWS.servers.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new server
+        #
+        #>> AWS.servers.new
+        #  <Fog::AWS::Compute::Server
+        #    id=nil,
+        #    ami_launch_index=nil,
+        #    availability_zone=nil,
+        #    block_device_mapping=nil,
+        #    client_token=nil,
+        #    dns_name=nil,
+        #    groups=["default"],
+        #    flavor_id="m1.small",
+        #    image_id=nil,
+        #    ip_address=nil,
+        #    kernel_id=nil,
+        #    key_name=nil,
+        #    created_at=nil,
+        #    monitoring=nil,
+        #    product_codes=nil,
+        #    private_dns_name=nil,
+        #    private_ip_address=nil,
+        #    ramdisk_id=nil,
+        #    reason=nil,
+        #    root_device_name=nil,
+        #    root_device_type=nil,
+        #    state=nil,
+        #    state_reason=nil,
+        #    subnet_id=nil,
+        #    tags=nil,
+        #    user_data=nil
+        #  >
+        #
+        
         def initialize(attributes)
           self.filters ||= {}
           super
@@ -64,6 +103,46 @@ module Fog
           server
         end
 
+        # Used to retreive a server
+        #
+        # server_id is required to get the associated server information.
+        #
+        # You can run the following command to get the details:
+        # AWS.servers.get("i-5c973972")
+        #
+        # ==== Returns
+        #
+        #>> AWS.servers.get("i-5c973972")
+        #  <Fog::AWS::Compute::Server
+        #    id="i-5c973972",
+        #    ami_launch_index=0,
+        #    availability_zone="us-east-1b",
+        #    block_device_mapping=[],
+        #    client_token=nil,
+        #    dns_name="ec2-25-2-474-44.compute-1.amazonaws.com",
+        #    groups=["default"],
+        #    flavor_id="m1.small",
+        #    image_id="test",
+        #    ip_address="25.2.474.44",
+        #    kernel_id="aki-4e1e1da7",
+        #    key_name=nil,
+        #    created_at=Mon Nov 29 18:09:34 -0500 2010,
+        #    monitoring=false,
+        #    product_codes=[],
+        #    private_dns_name="ip-19-76-384-60.ec2.internal",
+        #    private_ip_address="19.76.384.60",
+        #    ramdisk_id="ari-0b3fff5c",
+        #    reason=nil,
+        #    root_device_name=nil,
+        #    root_device_type="instance-store",
+        #    state="running",
+        #    state_reason={},
+        #    subnet_id=nil,
+        #    tags={},
+        #    user_data=nil
+        #  >
+        #
+        
         def get(server_id)
           if server_id
             self.class.new(:connection => connection).all('instance-id' => server_id).first

data/lib/fog/aws/models/compute/snapshots.rb

@@ -30,7 +30,7 @@ module Fog
           end
           self
         end
-
+        
         def get(snapshot_id)
           if snapshot_id
             self.class.new(:connection => connection).all('snapshot-id' => snapshot_id).first

data/lib/fog/aws/models/compute/tags.rb

@@ -21,7 +21,7 @@ module Fog
           data = connection.describe_tags(filters).body
           load(data['tagSet'])
         end
-
+        
         def get(key)
           if key
             self.class.new(:connection => connection).all('key' => key)

data/lib/fog/aws/models/compute/volume.rb

@@ -87,7 +87,7 @@ module Fog
           @server = nil
           self.server_id = nil
           unless new_record?
-            connection.detach_volume(@id)
+            connection.detach_volume(id)
             reload
           end
         end
@@ -96,7 +96,7 @@ module Fog
           @server = nil
           self.server_id = nil
           unless new_record?
-            connection.detach_volume(@id, 'Force' => true)
+            connection.detach_volume(id, 'Force' => true)
             reload
           end
         end

data/lib/fog/aws/models/compute/volumes.rb

@@ -12,11 +12,56 @@ module Fog
 
         model Fog::AWS::Compute::Volume
 
+        # Used to create a volume.  There are 3 arguments and availability_zone and size are required.  You can generate a new key_pair as follows:
+        # AWS.volumes.create(:availability_zone => 'us-east-1a', :size => 't1.micro')
+        #
+        # ==== Returns
+        #
+        #<Fog::AWS::Compute::Volume
+        #  id="vol-1e2028b9",
+        #  attached_at=nil,
+        #  availability_zone="us-east-1a",
+        #  created_at=Tue Nov 23 23:30:29 -0500 2010,
+        #  delete_on_termination=nil,
+        #  device=nil,
+        #  server_id=nil,
+        #  size="t1.micro",
+        #  snapshot_id=nil,
+        #  state="creating",
+        #  tags=nil
+        #>
+        #
+        # The volume can be retreived by running AWS.volumes.get("vol-1e2028b9").  See get method below.
+        #
+
         def initialize(attributes)
           self.filters ||= {}
           super
         end
 
+        # Used to return all volumes.
+        # AWS.volumes.all
+        #
+        # ==== Returns
+        #
+        #>>AWS.volumes.all
+        #<Fog::AWS::Compute::Volume
+        #  id="vol-1e2028b9",
+        #  attached_at=nil,
+        #  availability_zone="us-east-1a",
+        #  created_at=Tue Nov 23 23:30:29 -0500 2010,
+        #  delete_on_termination=nil,
+        #  device=nil,
+        #  server_id=nil,
+        #  size="t1.micro",
+        #  snapshot_id=nil,
+        #  state="creating",
+        #  tags=nil
+        #>
+        #
+        # The volume can be retreived by running AWS.volumes.get("vol-1e2028b9").  See get method below.
+        #
+
         def all(filters = filters)
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('volume-id' => []) instead[/] [light_black](#{caller.first})[/]")
@@ -31,6 +76,30 @@ module Fog
           self
         end
 
+        # Used to retreive a volume
+        # volume_id is required to get the associated volume information.
+        #
+        # You can run the following command to get the details:
+        # AWS.volumes.get("vol-1e2028b9")
+        #
+        # ==== Returns
+        #
+        #>> AWS.volumes.get("vol-1e2028b9")
+        # <Fog::AWS::Compute::Volume
+        #    id="vol-1e2028b9",
+        #    attached_at=nil,
+        #    availability_zone="us-east-1a",
+        #    created_at=Tue Nov 23 23:30:29 -0500 2010,
+        #    delete_on_termination=nil,
+        #    device=nil,
+        #    server_id=nil,
+        #    size="t1.micro",
+        #    snapshot_id=nil,
+        #    state="available",
+        #    tags={}
+        #  >
+        #
+
         def get(volume_id)
           if volume_id
             self.class.new(:connection => connection).all('volume-id' => volume_id).first

data/lib/fog/aws/requests/cdn/post_distribution.rb

@@ -60,7 +60,7 @@ module Fog
           for key, value in options
             case value
             when Array
-              for item in array
+              for item in value
                 data << "<#{key}>#{item}</#{key}>"
               end
             when Hash

data/lib/fog/aws/requests/compute/create_image.rb

@@ -18,6 +18,7 @@ module Fog
         #   * body<~Hash>:
         #     * 'imageId'<~String> - The ID of the created AMI.
         #     * 'requestId'<~String> - Id of request.
+        
         def create_image(instance_id, name, description, no_reboot = false)
           request(
             'Action'            => 'CreateImage',
@@ -31,7 +32,12 @@ module Fog
       end
 
       class Mock
-
+        
+        # Usage
+        # 
+        # AWS[:compute].create_image("i-ac65ee8c", "test", "something")
+        #
+        
         def create_image(instance_id, name, description, no_reboot = false)
           response = Excon::Response.new
           if instance_id && !name.empty?

data/lib/fog/aws/requests/compute/create_snapshot.rb

@@ -31,7 +31,13 @@ module Fog
       end
 
       class Mock
-
+        
+        #
+        # Usage
+        #
+        # AWS[:compute].create_snapshot("vol-f7c23423", "latest snapshot")
+        #
+        
         def create_snapshot(volume_id, description = nil)
           response = Excon::Response.new
           if volume = @data[:volumes][volume_id]

data/lib/fog/bluebox/compute.rb

@@ -68,7 +68,7 @@ module Fog
 
           begin
             response = @connection.request(params.merge!({:host => @host}))
-          rescue Excon::Errors::Error => error
+          rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
               Fog::Bluebox::Compute::NotFound.slurp(error)

data/lib/fog/go_grid/compute.rb

@@ -81,7 +81,7 @@ module Fog
             response = @connection.request(
               params.merge!(:path => "#{@path}/#{params[:path]}")
             )
-          rescue Excon::Errors::Error => error
+          rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
               Fog::GoGrid::Compute::NotFound.slurp(error)

data/lib/fog/new_servers/compute.rb

@@ -70,7 +70,7 @@ module Fog
 
           begin
             response = @connection.request(params.merge!({:host => @host}))
-          rescue Excon::Errors::Error => error
+          rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
               Fog::NewServers::Compute::NotFound.slurp(error)

data/lib/fog/rackspace/cdn.rb

@@ -61,7 +61,7 @@ module Fog
               :host     => @host,
               :path     => "#{@path}/#{params[:path]}",
             }))
-          rescue Excon::Errors::Error => error
+          rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
               Fog::Rackspace::Storage::NotFound.slurp(error)

data/lib/fog/rackspace/compute.rb

@@ -13,6 +13,7 @@ module Fog
       collection  :servers
 
       request_path 'fog/rackspace/requests/compute'
+      request :confirm_resized_server
       request :create_image
       request :create_server
       request :delete_image
@@ -30,6 +31,9 @@ module Fog
       request :list_servers
       request :list_servers_detail
       request :reboot_server
+      request :revert_resized_server
+      request :resize_server
+      request :server_action
       request :update_server
 
       class Mock
@@ -88,7 +92,7 @@ module Fog
               :host     => @host,
               :path     => "#{@path}/#{params[:path]}"
             }))
-          rescue Excon::Errors::Error => error
+          rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
               Fog::Rackspace::Compute::NotFound.slurp(error)

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

@@ -77,7 +77,7 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          requires :flavor_id, :image_id, :name
+          requires :flavor_id, :image_id
           options = {
             'metadata'    => metadata,
             'name'        => name,

data/lib/fog/rackspace/requests/compute/confirm_resized_server.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Rackspace
+    class Compute
+      class Real
+
+        # Confirm resizing
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to confirm
+        #
+        def confirm_resized_server(server_id)
+          body = { 'confirmResize' => nil }
+          server_action(server_id, body, 204)
+        end
+
+      end
+
+      class Mock
+
+        def confirm_resized_server(server_id)
+          response = Excon::Response.new
+          response.status = 204
+
+          @data[:servers][server_id].delete('old_flavorId')
+          @data[:last_modified][:servers][server_id] = Time.now
+          @data[:servers][server_id]['status'] = 'ACTIVE'
+
+          response
+        end
+
+      end
+    end
+  end
+end