fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

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

@@ -13,6 +13,8 @@ module Fog
         attribute :disk
         attribute :name
         attribute :ram
+        attribute :ebs_optimized_available
+        attribute :instance_store_volumes
 
       end
 

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

@@ -6,38 +6,306 @@ module Fog
     class AWS
 
       FLAVORS = [
-        { :bits => 0,  :cores =>   2,  :disk => 0,    :id =>  't1.micro',   :name => 'Micro Instance',       :ram => 613},
-
-        { :bits => 32, :cores =>   1,  :disk => 160,  :id =>  'm1.small',   :name => 'Small Instance',       :ram => 1740.8},
-        { :bits => 32, :cores =>   2,  :disk => 400,  :id =>  'm1.medium',  :name => 'Medium Instance',      :ram => 3750},
-        { :bits => 64, :cores =>   4,  :disk => 850,  :id =>  'm1.large',   :name => 'Large Instance',       :ram => 7680},
-        { :bits => 64, :cores =>   8,  :disk => 1690, :id =>  'm1.xlarge',  :name => 'Extra Large Instance', :ram => 15360},
-
-        { :bits => 32, :cores =>   5,  :disk => 350,  :id =>  'c1.medium',  :name => 'High-CPU Medium',      :ram => 1740.8},
-        { :bits => 64, :cores =>  20,  :disk => 1690, :id =>  'c1.xlarge',  :name => 'High-CPU Extra Large', :ram => 7168},
-
-        { :bits => 64, :cores =>   7,  :disk =>  32,  :id => 'c3.large',    :name => 'C3 Large',                 :ram => 3750},
-        { :bits => 64, :cores =>  14,  :disk =>  80,  :id => 'c3.xlarge',   :name => 'C3 Extra Large',           :ram => 7168},
-        { :bits => 64, :cores =>  28,  :disk => 160,  :id => 'c3.2xlarge',  :name => 'C3 Double Extra Large',    :ram => 15360},
-        { :bits => 64, :cores =>  55,  :disk => 320,  :id => 'c3.4xlarge',  :name => 'C3 Quadruple Extra Large', :ram => 30720},
-        { :bits => 64, :cores => 108,  :disk => 640,  :id => 'c3.8xlarge',  :name => 'C3 Eight Extra Large',     :ram => 61440},
-
-        { :bits => 64, :cores =>   26, :disk => 60,   :id => 'g2.2xlarge',  :name => 'GPU Double Extra Large', :ram => 15360},
-
-        { :bits => 64, :cores =>   35, :disk => 50331648, :id => 'hs1.8xlarge', :name => 'High Storage Eight Extra Large', :ram => 119808},
-
-        { :bits => 64, :cores =>  6.5, :disk => 420,  :id =>  'm2.xlarge',  :name => 'High-Memory Extra Large',           :ram => 17510.4},
-        { :bits => 64, :cores =>   13, :disk => 850,  :id =>  'm2.2xlarge', :name => 'High Memory Double Extra Large',    :ram => 35020.8},
-        { :bits => 64, :cores =>   26, :disk => 1690, :id =>  'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
-
-        { :bits => 64, :cores =>   13, :disk => 0, :id =>  'm3.xlarge', :name => 'M3 Extra Large', :ram => 15360},
-        { :bits => 64, :cores =>   26, :disk => 0, :id =>  'm3.2xlarge', :name => 'M3 Double Extra Large', :ram => 30720},
-
-        { :bits => 64, :cores =>   35, :disk => 2048, :id => "hi1.4xlarge", :name => "High I/O Quadruple Extra Large Instance", :ram => 61952},
-
-        { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552},
-        { :bits => 64, :cores =>   88, :disk => 3370, :id => 'cc2.8xlarge', :name => 'Cluster Compute Eight Extra Large',     :ram => 61952},
-        { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cg1.4xlarge', :name => 'Cluster GPU Quadruple Extra Large',     :ram => 22528}
+        {
+          :id                      => 't1.micro',
+          :name                    => 'Micro Instance',
+          :bits                    => 0,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 613,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm1.small',
+          :name                    => 'Small Instance',
+          :bits                    => 32,
+          :cores                   => 1,
+          :disk                    => 160,
+          :ram                     => 1740.8,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm1.medium',
+          :name                    => 'Medium Instance',
+          :bits                    => 32,
+          :cores                   => 2,
+          :disk                    => 400,
+          :ram                     => 3750,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm1.large',
+          :name                    => 'Large Instance',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 850,
+          :ram                     => 7680,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'm1.xlarge',
+          :name                    => 'Extra Large Instance',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 1690,
+          :ram                     => 15360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      =>  'c1.medium',
+          :bits                    => 32,
+          :cores                   => 5,
+          :disk                    => 350,
+          :name                    => 'High-CPU Medium',
+          :ram                     => 1740.8,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'c1.xlarge',
+          :name                    => 'High-CPU Extra Large',
+          :bits                    => 64,
+          :cores                   => 20,
+          :disk                    => 1690,
+          :ram                     => 7168,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'c3.large',
+          :name                    => 'C3 Large',
+          :bits                    => 64,
+          :cores                   => 7,
+          :disk                    => 32,
+          :ram                     => 3750,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'c3.xlarge',
+          :name                    => 'C3 Extra Large',
+          :bits                    => 64,
+          :cores                   => 14,
+          :disk                    => 80,
+          :ram                     => 7168,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'c3.2xlarge',
+          :name                    => 'C3 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 28,
+          :disk                    => 160,
+          :ram                     => 15360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'c3.4xlarge',
+          :name                    => 'C3 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 55,
+          :disk                    => 320,
+          :ram                     => 30720,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'c3.8xlarge',
+          :name                    => 'C3 Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 108,
+          :disk                    => 640,
+          :ram                     => 61440,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'g2.2xlarge',
+          :name                    => 'GPU Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 26,
+          :disk                    => 60,
+          :ram                     => 15360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'hs1.8xlarge',
+          :name                    => 'High Storage Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 35,
+          :disk                    => 50331648,
+          :ram                     => 119808,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 24
+        },
+        {
+          :id                      => 'm2.xlarge',
+          :name                    => 'High-Memory Extra Large',
+          :bits                    => 64,
+          :cores                   => 6.5,
+          :disk                    => 420,
+          :ram                     => 17510.4,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      =>  'm2.2xlarge',
+          :name                    => 'High Memory Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 13,
+          :disk                    => 850,
+          :ram                     => 35020.8,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm2.4xlarge',
+          :name                    => 'High Memory Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 26,
+          :disk                    => 1690,
+          :ram                     => 70041.6,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'cr1.8xlarge',
+          :name                    => 'High Memory Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 88,
+          :disk                    => 240,
+          :ram                     => 249856,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'm3.medium',
+          :name                    => 'M3 Medium',
+          :bits                    => 64,
+          :cores                   => 3,
+          :disk                    => 4,
+          :ram                     => 3840,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'm3.large',
+          :name                    => 'M3 Large',
+          :bits                    => 64,
+          :cores                   => 6.5,
+          :disk                    => 32,
+          :ram                     => 7168,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'm3.xlarge',
+          :name                    => 'M3 Extra Large',
+          :bits                    => 64,
+          :cores                   => 13,
+          :disk                    => 80,
+          :ram                     => 15360,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'm3.2xlarge',
+          :name                    => 'M3 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 26,
+          :disk                    => 160,
+          :ram                     => 30720,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "hi1.4xlarge",
+          :name                    => "High I/O Quadruple Extra Large Instance",
+          :bits                    => 64,
+          :cores                   =>   35,
+          :disk                    => 2048,
+          :ram                     => 61952,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'cc1.4xlarge',
+          :name                    => 'Cluster Compute Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 33.5,
+          :disk                    => 1690,
+          :ram                     => 23552,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'cc2.8xlarge',
+          :name                    => 'Cluster Compute Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 88,
+          :disk                    => 3370,
+          :ram                     => 61952,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'cg1.4xlarge',
+          :name                    => 'Cluster GPU Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 33.5,
+          :disk                    => 1690,
+          :ram                     => 22528,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i2.xlarge',
+          :name                    => 'I2 Extra Large',
+          :bits                    => 64,
+          :cores                   => 14,
+          :disk                    => 800,
+          :ram                     => 31232,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i2.2xlarge',
+          :name                    => 'I2 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 27,
+          :disk                    => 1600,
+          :ram                     => 62464,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i2.4xlarge',
+          :name                    => 'I2 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 53,
+          :disk                    => 3200,
+          :ram                     => 124928,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'i2.8xlarge',
+          :name                    => 'I2 Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 104,
+          :disk                    => 6400,
+          :ram                     => 249856,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 8
+        }
       ]
 
       class Flavors < Fog::Collection
@@ -50,7 +318,7 @@ module Fog
         #
         # ==== Returns
         #
-        # Returns an array of all available instance sizes
+        # Returns an array of all available instances and their general information
         #
         #>> AWS.flavors.all
         #  <Fog::AWS::Compute::Flavors
@@ -61,7 +329,9 @@ module Fog
         #        cores=2,
         #        disk=0,
         #        name="Micro Instance",
-        #        ram=613
+        #        ram=613,
+        #        ebs_optimized_available=false,
+        #        instance_store_volumes=0
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="m1.small",
@@ -69,7 +339,9 @@ module Fog
         #        cores=1,
         #        disk=160,
         #        name="Small Instance",
-        #        ram=1740.8
+        #        ram=1740.8,
+        #        ebs_optimized_available=false,
+        #        instance_store_volumes=1
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="m1.medium",
@@ -77,7 +349,9 @@ module Fog
         #        cores=2,
         #        disk=400,
         #        name="Medium Instance",
-        #        ram=3750
+        #        ram=3750,
+        #        ebs_optimized_available=false,
+        #        instance_store_volumes=1
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="m1.large",
@@ -85,7 +359,9 @@ module Fog
         #        cores=4,
         #        disk=850,
         #        name="Large Instance",
-        #        ram=7680
+        #        ram=7680,
+        #        ebs_optimized_available=true
+        #        instance_store_volumes=2
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="m1.xlarge",
@@ -93,7 +369,10 @@ module Fog
         #        cores=8,
         #        disk=1690,
         #        name="Extra Large Instance",
-        #        ram=15360
+        #        ram=15360,
+        #        ebs_optimized_available=true,
+        #        instance_store_volumes=4
+        #
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="c1.medium",
@@ -101,7 +380,9 @@ module Fog
         #        cores=5,
         #        disk=350,
         #        name="High-CPU Medium",
-        #        ram=1740.8
+        #        ram=1740.8,
+        #        ebs_optimized_available=false,
+        #        instance_store_volumes=1
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="c1.xlarge",
@@ -109,7 +390,9 @@ module Fog
         #        cores=20,
         #        disk=1690,
         #        name="High-CPU Extra Large",
-        #        ram=7168
+        #        ram=7168,
+        #        ebs_optimized_available=true,
+        #        instance_store_volumes=4
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="m2.xlarge",
@@ -117,7 +400,9 @@ module Fog
         #        cores=6.5,
         #        disk=420,
         #        name="High-Memory Extra Large",
-        #        ram=17510.4
+        #        ram=17510.4,
+        #        ebs_optimized_available=false,
+        #        instance_store_volumes=1
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="m2.2xlarge",
@@ -125,7 +410,9 @@ module Fog
         #        cores=13,
         #        disk=850,
         #        name="High Memory Double Extra Large",
-        #        ram=35020.8
+        #        ram=35020.8,
+        #        ebs_optimized_available=true,
+        #        instance_store_volumes=1
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="m2.4xlarge",
@@ -133,7 +420,9 @@ module Fog
         #        cores=26,
         #        disk=1690,
         #        name="High Memory Quadruple Extra Large",
-        #        ram=70041.6
+        #        ram=70041.6,
+        #        ebs_optimized_available=true,
+        #        instance_store_volumes=2
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="cc1.4xlarge",
@@ -141,7 +430,9 @@ module Fog
         #        cores=33.5,
         #        disk=1690,
         #        name="Cluster Compute Quadruple Extra Large",
-        #        ram=23552
+        #        ram=23552,
+        #        ebs_optimized_available=false,
+        #        instance_store_volumes=0
         #      >,
         #      <Fog::Compute::AWS::Flavor
         #        id="m3.xlarge",
@@ -149,7 +440,9 @@ module Fog
         #        cores=13,
         #        disk=0,
         #        name="M3 Extra Large",
-        #        ram=15360
+        #        ram=15360,
+        #        ebs_optimized_available=true,
+        #        instance_store_volumes=2
         #      >,
         #      <Fog::Compute::AWS::Flavor
         #        id="m3.2xlarge",
@@ -157,7 +450,9 @@ module Fog
         #        cores=26,
         #        disk=0,
         #        name="M3 Double Extra Large",
-        #        ram=30720
+        #        ram=30720,
+        #        ebs_optimized_available=true,
+        #        instance_store_volumes=2
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="cc2.8xlarge",
@@ -165,7 +460,9 @@ module Fog
         #        cores=88,
         #        disk=3370,
         #        name="Cluster Compute Eight Extra Large",
-        #        ram=61952
+        #        ram=61952,
+        #        ebs_optimized_available=false,
+        #        instance_store_volumes=4
         #      >,
         #      <Fog::AWS::Compute::Flavor
         #        id="cg1.4xlarge",
@@ -173,7 +470,9 @@ module Fog
         #        cores=33.5,
         #        disk=1690,
         #        name="Cluster GPU Quadruple Extra Large",
-        #        ram=22528
+        #        ram=22528,
+        #        ebs_optimized_available=false,
+        #        instance_store_volumes=2
         #      >
         #    ]
         #  >
@@ -187,7 +486,20 @@ module Fog
         # Used to retrieve a flavor
         # flavor_id is required to get the associated flavor information.
         # flavors available currently:
-        # 't1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge'
+        #
+        # t1.micro
+        # m1.small, m1.medium, m1.large, m1.xlarge
+        # c1.medium, c1.xlarge
+        # c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge
+        # g2.2xlarge
+        # hs1.8xlarge
+        # m2.xlarge, m2.2xlarge, m2.4xlarge
+        # m3.xlarge, m3.2xlarge
+        # cr1.8xlarge
+        # cc1.4xlarge
+        # cc2.8xlarge
+        # cg1.4xlarge
+        # i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge
         #
         # You can run the following command to get the details:
         # AWS.flavors.get("t1.micro")
@@ -202,6 +514,8 @@ module Fog
         #  disk=0,
         #  name="Micro Instance",
         #  ram=613
+        #  ebs_optimized_available=false
+        #  instance_store_volumes=0
         #>
         #