fog-aws 0.4.0 → 0.4.1

data/lib/fog/aws/iam/paged_collection.rb

@@ -0,0 +1,54 @@
+module Fog
+  module AWS
+    class IAM
+      class PagedCollection < Fog::Collection
+        def self.inherited(klass)
+          klass.send(:attribute, :truncated, :aliases => 'IsTruncated', :type => :boolean)
+          klass.send(:attribute, :marker,    :aliases => 'Marker')
+
+          super
+        end
+
+        def each_entry(*args, &block)
+          to_a.each(*args, &block)
+        end
+
+        def each
+          if !block_given?
+            self
+          else
+            subset = dup.all
+
+            subset.each_entry { |f| yield f }
+
+            while subset.truncated
+              subset.
+                all(:marker => subset.marker, :limit => 1000).
+                each_entry { |f| yield f }
+            end
+
+            self
+          end
+        end
+
+        protected
+
+        def page_params(options={})
+          marker = options.fetch(:marker) { options.fetch('Marker') { self.marker } }
+          limit  = options.fetch(:limit) { options['MaxItems'] }
+          params = {}
+
+          if marker && !marker.empty?
+            params.merge!('Marker' => marker)
+          end
+
+          if limit
+            params.merge!('MaxItems' => limit)
+          end
+
+          params
+        end
+      end
+    end
+  end
+end

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

@@ -108,7 +108,7 @@ module Fog
           :id                      => 'c3.large',
           :name                    => 'C3 Large',
           :bits                    => 64,
-          :cores                   => 7,
+          :cores                   => 2,
           :disk                    => 32,
           :ram                     => 3750,
           :ebs_optimized_available => false,
@@ -118,7 +118,7 @@ module Fog
           :id                      => 'c3.xlarge',
           :name                    => 'C3 Extra Large',
           :bits                    => 64,
-          :cores                   => 14,
+          :cores                   => 4,
           :disk                    => 80,
           :ram                     => 7168,
           :ebs_optimized_available => true,
@@ -128,7 +128,7 @@ module Fog
           :id                      => 'c3.2xlarge',
           :name                    => 'C3 Double Extra Large',
           :bits                    => 64,
-          :cores                   => 28,
+          :cores                   => 8,
           :disk                    => 160,
           :ram                     => 15360,
           :ebs_optimized_available => true,
@@ -138,7 +138,7 @@ module Fog
           :id                      => 'c3.4xlarge',
           :name                    => 'C3 Quadruple Extra Large',
           :bits                    => 64,
-          :cores                   => 55,
+          :cores                   => 16,
           :disk                    => 320,
           :ram                     => 30720,
           :ebs_optimized_available => true,
@@ -148,7 +148,7 @@ module Fog
           :id                      => 'c3.8xlarge',
           :name                    => 'C3 Eight Extra Large',
           :bits                    => 64,
-          :cores                   => 108,
+          :cores                   => 16,
           :disk                    => 640,
           :ram                     => 61440,
           :ebs_optimized_available => false,
@@ -158,61 +158,71 @@ module Fog
           :id                      => 'c4.large',
           :name                    => 'C4 Large',
           :bits                    => 64,
-          :cores                   => 7,
-          :disk                    => 32,
+          :cores                   => 2,
+          :disk                    => 0,
           :ram                     => 3750,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
           :id                      => 'c4.xlarge',
           :name                    => 'C4 Extra Large',
           :bits                    => 64,
-          :cores                   => 14,
-          :disk                    => 80,
+          :cores                   => 4,
+          :disk                    => 0,
           :ram                     => 7168,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
           :id                      => 'c4.2xlarge',
           :name                    => 'C4 Double Extra Large',
           :bits                    => 64,
-          :cores                   => 28,
-          :disk                    => 160,
+          :cores                   => 8,
+          :disk                    => 0,
           :ram                     => 15360,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
           :id                      => 'c4.4xlarge',
           :name                    => 'C4 Quadruple Extra Large',
           :bits                    => 64,
-          :cores                   => 55,
-          :disk                    => 320,
+          :cores                   => 16,
+          :disk                    => 0,
           :ram                     => 30720,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 2
+          :instance_store_volumes  => 0
         },
         {
           :id                      => 'c4.8xlarge',
           :name                    => 'C4 Eight Extra Large',
           :bits                    => 64,
-          :cores                   => 122,
-          :disk                    => 640,
+          :cores                   => 36,
+          :disk                    => 0,
           :ram                     => 61440,
-          :ebs_optimized_available => false,
-          :instance_store_volumes  => 2
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         },
         {
           :id                      => 'g2.2xlarge',
           :name                    => 'GPU Double Extra Large',
           :bits                    => 64,
-          :cores                   => 26,
+          :cores                   => 8,
           :disk                    => 60,
           :ram                     => 15360,
           :ebs_optimized_available => true,
-          :instance_store_volumes  => 0
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'g2.8xlarge',
+          :name                    => 'GPU Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 240,
+          :ram                     => 61440,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
         },
         {
           :id                      => 'hs1.8xlarge',
@@ -268,19 +278,19 @@ module Fog
           :id                      => 'm3.medium',
           :name                    => 'M3 Medium',
           :bits                    => 64,
-          :cores                   => 3,
+          :cores                   => 1,
           :disk                    => 4,
           :ram                     => 3840,
           :ebs_optimized_available => false,
-          :instance_store_volumes  => 0
+          :instance_store_volumes  => 1
         },
         {
           :id                      => 'm3.large',
           :name                    => 'M3 Large',
           :bits                    => 64,
-          :cores                   => 6.5,
+          :cores                   => 2,
           :disk                    => 32,
-          :ram                     => 7168,
+          :ram                     => 7680,
           :ebs_optimized_available => false,
           :instance_store_volumes  => 1
         },
@@ -288,7 +298,7 @@ module Fog
           :id                      => 'm3.xlarge',
           :name                    => 'M3 Extra Large',
           :bits                    => 64,
-          :cores                   => 13,
+          :cores                   => 4,
           :disk                    => 80,
           :ram                     => 15360,
           :ebs_optimized_available => true,
@@ -298,7 +308,7 @@ module Fog
           :id                      => 'm3.2xlarge',
           :name                    => 'M3 Double Extra Large',
           :bits                    => 64,
-          :cores                   => 26,
+          :cores                   => 8,
           :disk                    => 160,
           :ram                     => 30720,
           :ebs_optimized_available => true,
@@ -348,7 +358,7 @@ module Fog
           :id                      => 'i2.xlarge',
           :name                    => 'I2 Extra Large',
           :bits                    => 64,
-          :cores                   => 14,
+          :cores                   => 4,
           :disk                    => 800,
           :ram                     => 31232,
           :ebs_optimized_available => true,
@@ -358,7 +368,7 @@ module Fog
           :id                      => 'i2.2xlarge',
           :name                    => 'I2 Double Extra Large',
           :bits                    => 64,
-          :cores                   => 27,
+          :cores                   => 8,
           :disk                    => 1600,
           :ram                     => 62464,
           :ebs_optimized_available => true,
@@ -368,7 +378,7 @@ module Fog
           :id                      => 'i2.4xlarge',
           :name                    => 'I2 Quadruple Extra Large',
           :bits                    => 64,
-          :cores                   => 53,
+          :cores                   => 16,
           :disk                    => 3200,
           :ram                     => 124928,
           :ebs_optimized_available => true,
@@ -378,7 +388,7 @@ module Fog
           :id                      => 'i2.8xlarge',
           :name                    => 'I2 Eight Extra Large',
           :bits                    => 64,
-          :cores                   => 104,
+          :cores                   => 32,
           :disk                    => 6400,
           :ram                     => 249856,
           :ebs_optimized_available => false,
@@ -389,7 +399,7 @@ module Fog
           :name                    => "R3 Large",
           :bits                    => 64,
           :cores                   => 2,
-          :ram                     => 15360,
+          :ram                     => 15616,
           :disk                    => 32,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 1
@@ -431,7 +441,7 @@ module Fog
           :cores                   => 32,
           :ram                     => 249856,
           :disk                    => 640,
-          :ebs_optimized_available => true,
+          :ebs_optimized_available => false,
           :instance_store_volumes  => 2
         },
         {
@@ -473,6 +483,56 @@ module Fog
           :disk                    => 48000,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 24
+        },
+        {
+          :id                      => "m4.large",
+          :name                    => "M4 Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 8192,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.xlarge",
+          :name                    => "M4 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 16384,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.2xlarge",
+          :name                    => "M4 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 31232,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.4xlarge",
+          :name                    => "M4 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 62464,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m4.10xlarge",
+          :name                    => "M4 Ten Extra Large",
+          :bits                    => 64,
+          :cores                   => 40,
+          :ram                     => 163840,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         }
       ]
 

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -143,23 +143,22 @@ module Fog
         end
 
         def listeners
-          Fog::AWS::ELB::Listeners.new({
-            :data => attributes['ListenerDescriptions'],
-            :service => service,
+          Fog::AWS::ELB::Listeners.new(
+            :data          => attributes['ListenerDescriptions'],
+            :service       => service,
             :load_balancer => self
-          })
+          )
         end
 
         def policies
-          Fog::AWS::ELB::Policies.new({
-            :data => policy_descriptions,
-            :service => service,
-            :load_balancer => self
-          })
+          requires :id
+
+          service.policies(:load_balancer_id => self.identity)
         end
 
         def policy_descriptions
           requires :id
+
           @policy_descriptions ||= service.describe_load_balancer_policies(id).body["DescribeLoadBalancerPoliciesResult"]["PolicyDescriptions"]
         end
 
@@ -202,7 +201,7 @@ module Fog
           service.remove_tags(id, tag_keys)
           tags
         end
-        
+
 
         def save
           requires :id

data/lib/fog/aws/models/elb/policies.rb

@@ -1,29 +1,44 @@
 require 'fog/aws/models/elb/policy'
+
 module Fog
   module AWS
     class ELB
       class Policies < Fog::Collection
+
+        attribute :load_balancer_id
+
         model Fog::AWS::ELB::Policy
 
-        attr_accessor :data, :load_balancer
+        def all(options={})
+          merge_attributes(options)
+
+          requires :load_balancer_id
 
-        def all
-          load(munged_data)
+          data = service.describe_load_balancer_policies(self.load_balancer_id).
+            body["DescribeLoadBalancerPoliciesResult"]["PolicyDescriptions"]
+
+          load(munge(data))
         end
 
         def get(id)
-          all.find{|policy| id == policy.id}
+          all.find { |policy| id == policy.id }
+        end
+
+        def new(attributes={})
+          super(self.attributes.merge(attributes))
         end
 
         private
-        def munged_data
-          data.reduce([]){|m,e|
+
+        def munge(data)
+          data.reduce([]) { |m,e|
             policy_attribute_descriptions = e["PolicyAttributeDescriptions"]
 
             policy = {
-              :id => e["PolicyName"],
-              :type_name => e["PolicyTypeName"],
-              :policy_attributes => policy_attributes(policy_attribute_descriptions)
+              :id                => e["PolicyName"],
+              :type_name         => e["PolicyTypeName"],
+              :policy_attributes => policy_attributes(policy_attribute_descriptions),
+              :load_balancer_id  => self.load_balancer_id,
             }
 
             case e["PolicyTypeName"]

data/lib/fog/aws/models/elb/policy.rb

@@ -8,13 +8,13 @@ module Fog
         attribute :expiration, :aliases => 'CookieExpirationPeriod'
         attribute :type_name
         attribute :policy_attributes
+        attribute :load_balancer_id
 
         attr_accessor :cookie_stickiness # Either :app or :lb
 
         def save
-          requires :id, :load_balancer
-          service_method = nil
-          args = [load_balancer.id, id]
+          requires :id, :load_balancer_id
+          args = [load_balancer_id, id]
 
           if cookie_stickiness
             case cookie_stickiness
@@ -40,17 +40,16 @@ module Fog
         end
 
         def destroy
-          requires :id, :load_balancer
-          service.delete_load_balancer_policy(load_balancer.id, id)
-          reload
-        end
+          requires :identity, :load_balancer_id
 
-        def reload
-          load_balancer.reload
+          service.delete_load_balancer_policy(self.load_balancer_id, self.identity)
+          reload
         end
 
         def load_balancer
-          collection.load_balancer
+          requires :load_balancer_id
+
+          service.load_balancers.new(:identity => self.load_balancer_id)
         end
       end
     end