fog-aws 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3973a7b70a274c20de34e9d05a1a848c2d93fcef
-  data.tar.gz: 73a49e9277d918bc99701d78c9482d5c7d6b302f
+  metadata.gz: 1333d97b46328c7d155dadd9e011bcd0ff22aa27
+  data.tar.gz: 175d6c62b9edd36d1283ed6b278f6fafdaf549cd
 SHA512:
-  metadata.gz: 3701fda2e9477f984781026b92b19643c54be23780e9b404f7cd767a42013333c9924eb9d15a7c14e1c1015a90d50e675f384813da0a2c56fbb349bf865b300e
-  data.tar.gz: 55536ba768289f268e29150fd78d0cc01cbd434f0b51c8080839d14c179130c9f37dc67bb12e5a5f291d5c100a6f77914a8423c01f229a8ed31e7db4b510e233
+  metadata.gz: adb1c6076ad3a0aadb5b57f1e89a4ec30f96207536364769e9a97cd5f71a25fae0f9e59b42075c2f3177be1473930ba8e660b16968d1e749d19150f23b8eadac
+  data.tar.gz: f9662b2eaefb2c14033db0a8c6657ae89039cb92c9a329b40a3d3a7c26c0053f1f3996e95f073b5b5e8dcc30abb23c35d66d9efec1c8f87b68238e8343a2fca8

data/.travis.yml

@@ -7,10 +7,6 @@ branches:
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    gemfile: gemfiles/Gemfile-ruby-1.8.7
-  - rvm: 1.9.3
-    gemfile: gemfiles/Gemfile-ruby-1.9
   - rvm: 2.0.0
     gemfile: gemfiles/Gemfile-ruby-2.0
   - rvm: 2.1.0
@@ -27,14 +23,17 @@ matrix:
     gemfile: gemfiles/Gemfile-edge
   - rvm: 2.3.0
     gemfile: Gemfile
-  - rvm: jruby-18mode
-    gemfile: gemfiles/Gemfile-ruby-1.8.7
-  - rvm: jruby-19mode
-    gemfile: gemfiles/Gemfile-ruby-1.9
   - rvm: jruby-head
     gemfile: Gemfile
   allow_failures:
   - rvm: jruby-head
+    gemfile: Gemfile
+  - rvm: 2.2.0
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.3.0
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.1.1
+    gemfile: gemfiles/Gemfile-edge
 notifications:
   email: false
   irc:
@@ -47,6 +46,8 @@ notifications:
     on_success: always
     on_failure: always
     use_notice: false
+before_install:
+  - gem update bundler
 env:
   global:
     secure: LlDKdKSRo3sEjQ55XesbOXhKZ3RrOtqoD1ZL8Wx39K3iVzeEV3Kc8HjDfEvo7R4pOc3BMTNJcputklVEPN0FkWGN7Py+OEtbHj3IZl0MX+KEWNk0gU+4+sgPrL1eXUQyMUSkCrBsKg08rPel4KMYUOXbtnLyUU9PDbBwm4LJYOc=

data/CHANGELOG.md

@@ -2,7 +2,44 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v1.4.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.4.1...HEAD)
+
+**Closed issues:**
+
+- connect\_write timeout on AWS CodeBuild [\#413](https://github.com/fog/fog-aws/issues/413)
+- cannot load such file -- fog \(LoadError\) [\#401](https://github.com/fog/fog-aws/issues/401)
+- Missing file for extraction? [\#390](https://github.com/fog/fog-aws/issues/390)
+-  Regression: IO stream sent to AWS fails [\#388](https://github.com/fog/fog-aws/issues/388)
+- Stack Level Too Deep on YAML Serialization [\#385](https://github.com/fog/fog-aws/issues/385)
+- models/elb/model\_tests does not properly cleanup [\#347](https://github.com/fog/fog-aws/issues/347)
+- Generates wrong url when region is not DEFAULT\_REGION [\#214](https://github.com/fog/fog-aws/issues/214)
+
+**Merged pull requests:**
+
+- upgrade rubyzip to \>= 1.2.1 [\#416](https://github.com/fog/fog-aws/pull/416) ([lanej](https://github.com/lanej))
+- correction in iam/list\_access\_keys parser: Username should be UserName [\#415](https://github.com/fog/fog-aws/pull/415) ([patleb](https://github.com/patleb))
+- Avoid creating connection if region is not nil [\#414](https://github.com/fog/fog-aws/pull/414) ([hideto0710](https://github.com/hideto0710))
+- Resolving issue where `Fog::Json` was called instead of `Fog::JSON`. [\#412](https://github.com/fog/fog-aws/pull/412) ([mgarrick](https://github.com/mgarrick))
+- Add t2.micro in flavors list [\#411](https://github.com/fog/fog-aws/pull/411) ([KevinLoiseau](https://github.com/KevinLoiseau))
+- Adding AWS P3 Tesla GPU instance types [\#409](https://github.com/fog/fog-aws/pull/409) ([hamelsmu](https://github.com/hamelsmu))
+- Add jitter to exponential backoff [\#408](https://github.com/fog/fog-aws/pull/408) ([masstamike](https://github.com/masstamike))
+- Add emulation of default VPC to mocked mode. [\#407](https://github.com/fog/fog-aws/pull/407) ([rzaharenkov](https://github.com/rzaharenkov))
+- Update rds instance options model [\#406](https://github.com/fog/fog-aws/pull/406) ([carloslima](https://github.com/carloslima))
+- Drop Ruby\<2.0 support [\#405](https://github.com/fog/fog-aws/pull/405) ([tbrisker](https://github.com/tbrisker))
+- allow Gemfile-edge travis builds to fail [\#403](https://github.com/fog/fog-aws/pull/403) ([lanej](https://github.com/lanej))
+- Add `default\_for\_az` attribute to subnet [\#402](https://github.com/fog/fog-aws/pull/402) ([rzaharenkov](https://github.com/rzaharenkov))
+- bundler ~\> 1.15 [\#399](https://github.com/fog/fog-aws/pull/399) ([lanej](https://github.com/lanej))
+- Fix detaching instances from auto scaling group. [\#397](https://github.com/fog/fog-aws/pull/397) ([rzaharenkov](https://github.com/rzaharenkov))
+- Issue \#387 Fog::Compute::AWS::Vpcs returns VPCs with nil ids [\#396](https://github.com/fog/fog-aws/pull/396) ([maguec](https://github.com/maguec))
+- feat\(CONTRIBUTORS\): Update [\#394](https://github.com/fog/fog-aws/pull/394) ([plribeiro3000](https://github.com/plribeiro3000))
+- fix\(Tests\):Remove debugging [\#393](https://github.com/fog/fog-aws/pull/393) ([plribeiro3000](https://github.com/plribeiro3000))
+- Migrate Service mapper from Fog [\#392](https://github.com/fog/fog-aws/pull/392) ([plribeiro3000](https://github.com/plribeiro3000))
+- Add ability to encrypt a copy of an unencrypted snapshot [\#391](https://github.com/fog/fog-aws/pull/391) ([nodecarter](https://github.com/nodecarter))
+- Fix VPC parser [\#389](https://github.com/fog/fog-aws/pull/389) ([ddiachkov](https://github.com/ddiachkov))
+- fix default\_security\_group detection [\#348](https://github.com/fog/fog-aws/pull/348) ([lanej](https://github.com/lanej))
+
+## [v1.4.1](https://github.com/fog/fog-aws/tree/v1.4.1) (2017-08-23)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.4.0...v1.4.1)
 
 **Closed issues:**
 
@@ -13,6 +50,7 @@
 
 **Merged pull requests:**
 
+- Update changelog for 1.4.0 [\#383](https://github.com/fog/fog-aws/pull/383) ([greysteil](https://github.com/greysteil))
 - Allow specifying kms key id to use [\#382](https://github.com/fog/fog-aws/pull/382) ([fcheung](https://github.com/fcheung))
 - added support to retrieve and create vpc with ipv6 cidr block [\#381](https://github.com/fog/fog-aws/pull/381) ([chanakyacool](https://github.com/chanakyacool))
 - Add MaxResults filter to describe reserved instances offerings [\#376](https://github.com/fog/fog-aws/pull/376) ([KevinLoiseau](https://github.com/KevinLoiseau))
@@ -305,7 +343,7 @@
 - Allow region to be set for STS [\#189](https://github.com/fog/fog-aws/pull/189) ([fcheung](https://github.com/fcheung))
 - add cn support for s3 [\#187](https://github.com/fog/fog-aws/pull/187) ([ming-relax](https://github.com/ming-relax))
 - mock instance stop and start properly [\#184](https://github.com/fog/fog-aws/pull/184) ([ehowe](https://github.com/ehowe))
-- Disable idempotent option when block is passed to get\_object [\#183](https://github.com/fog/fog-aws/pull/183) ([wangteji](https://github.com/wangteji))
+- Disable idempotent option when block is passed to get\_object [\#183](https://github.com/fog/fog-aws/pull/183) ([ghost](https://github.com/ghost))
 - Yield arguments to Mock\#get\_object block more similar to Excon [\#182](https://github.com/fog/fog-aws/pull/182) ([tdg5](https://github.com/tdg5))
 - add IAM role paging [\#178](https://github.com/fog/fog-aws/pull/178) ([lanej](https://github.com/lanej))
 - properly mock rds name update [\#170](https://github.com/fog/fog-aws/pull/170) ([ehowe](https://github.com/ehowe))

data/CONTRIBUTING.md

@@ -5,14 +5,14 @@ New contributors are always welcome, when it doubt please ask questions. We stri
 ### Coding
 
 * Pick a task:
-  * Offer feedback on open [pull requests](https://github.com/fog/fog/pulls).
-  * Review open [issues](https://github.com/fog/fog/issues) for things to help on.
-  * [Create an issue](https://github.com/fog/fog/issues/new) to start a discussion on additions or features.
+  * Offer feedback on open [pull requests](https://github.com/fog/fog-aws/pulls).
+  * Review open [issues](https://github.com/fog/fog-aws/issues) for things to help on.
+  * [Create an issue](https://github.com/fog/fog-aws/issues/new) to start a discussion on additions or features.
 * Fork the project, add your changes and tests to cover them in a topic branch.
-* Commit your changes and rebase against `fog/fog` to ensure everything is up to date.
-* [Submit a pull request](https://github.com/fog/fog/compare/).
+* Commit your changes and rebase against `fog/fog-aws` to ensure everything is up to date.
+* [Submit a pull request](https://github.com/fog/fog-aws/compare/).
 
 ### Non-Coding
 
-* Offer feedback on open [issues](https://github.com/fog/fog/issues).
+* Offer feedback on open [issues](https://github.com/fog/fog-aws/issues).
 * Organize or volunteer at events.

data/CONTRIBUTORS.md

@@ -1,5 +1,108 @@
+* Aakash Shah <ashah@pivotal.io>
+* Aaron Stone <aaron@serendipity.cx>
+* Akira Matsuda <ronnie@dio.jp>
+* Alessandro Lepore <lepore.ale@gmail.com>
+* Alex Coomans <alex@alexcoomans.com>
+* Alexander Stuart-Kregor <easkay@me.com>
+* Andrew Kane <acekane1@gmail.com>
+* Anthony Mangano <anthony@backupify.com>
+* Ayumi Yu <ayumi@ayumiyu.com>
+* Ben Balter <ben.balter@github.com>
+* Benjamin Pillet <ben_pillet@yahoo.com>
+* Brett Cave <brett@cave.za.net>
+* Brian Nelson <mrpoundsign@gmail.com>
+* Caged <justin@labratrevenge.com>
+* Carlos Lima <carlos@cpan.org>
+* Chanakya Devraj <chanakya.devraj@cuelogic.co.in>
+* Corey Donohoe <atmos@atmos.org>
+* Craig Genner <craig.genner@piksel.com>
+* Damien Mathieu <damien@heroku.com>
+* Dan Brooking <dbrooking@datapipe.com>
+* Dan Rogers <drogers@popsugar.com>
+* Daniel Farina <daniel@heroku.com>
+* Danny Guinther <danny@backupify.com>
+* David Judd <david@academia.edu>
+* David Vaz <david.ferd.vaz@gmail.com>
+* Decklin Foster <decklin@red-bean.com>
+* Duarte Henriques <duarte.henriques@seedrs.com>
+* Ed Healy <ehealy@gmail.com>
+* Eddie Johnston <eddie@beanstalk.ie>
+* Eric Herot <eric.github@herot.com>
+* Esther Villars <esthervillars@gmail.com>
+* Eugene Howe <eugene@xtreme-computers.net>
+* Freddy Chu <freddy@expressvpn.com>
 * Frederick Cheung <frederick.cheung@gmail.com>
+* GitHub <noreply@github.com>
+* Greg Burek <greg.burek@gmail.com>
+* Grey Baker <greysteil@gmail.com>
+* Huang Yaming <yumminhuang@gmail.com>
+* ICHII Takashi <ichii386@schweetheart.jp>
+* Jack Thomas <jack@scalefactory.com>
+* Jacob Burkhart <jburkhart@engineyard.com>
+* James Muscat <james.muscat@alces-software.com>
+* James Myers <jfmyers9@gmail.com>
+* James Rucker <james.rucker@legitscript.com>
+* Jon-Erik Schneiderhan <jon-erik.schneiderhan@meyouhealth.com>
+* Jonathan Hanson <jonathan@jonathan-hanson.org>
+* Jose Luis Salas <josacar@gmail.com>
+* Josh Lane & Michelle Noorali <jlane@engineyard.com>
+* Josh Lane & Michelle Noorali <michellemolu@gmail.com>
+* Josh Lane <jlane@engineyard.com>
 * Josh Lane <lanej@users.noreply.github.com>
 * Josh Lane <me@joshualane.com>
+* Joshua Lane <me@joshualane.com>
+* Kevin Loiseau <k.loiseauand@gmail.com>
+* KevinLoiseau <k.loiseauand@gmail.com>
+* Khoa Nguyen <khoan@Khoas-MacBook-Pro.local>
+* Kirk Haines <khaines@engineyard.com>
+* Kristoffer Roupé <kitofr@gmail.com>
+* Liu zhitong <z.liu@linkbynet.com>
+* Luciano Sousa <ls@lucianosousa.net>
+* Martin Forssen <maf@recordedfuture.com>
+* Mathew Kamkar <matkam@gmail.com>
+* Matthew O'Riordan <matthew.oriordan@gmail.com>
+* Michael Hale <mike@hales.ws>
+* Michael Sawyer <michael.sawyer@veeva.com>
+* Michal Tekel <mtekel@gmail.com>
+* Michelle Noorali & Josh Lane <mnoorali@engineyard.com>
+* Michelle Noorali <michellemolu@gmail.com>
+* Miguel Landaeta <miguel@miguel.cc>
+* Miguel Landaeta <miguel@restorando.com>
+* Miguel Landaeta <nomadium@gmail.com>
+* Milad Rastian <milad@sam-media.com>
+* Moritz Siuts <m.siuts@emetriq.com>
+* Nawaid Shamim <me@nawaidshamim.com>
+* Neill Turner <neill.turner@immediate.co.uk>
+* Nicholas Fowler <nbfowler@gmail.com>
+* Nicholas Klick <nicholas.klick@gmail.com>
+* Nilanjan Roy <nilanjan.roy@nosto.com>
+* Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
+* Paulo Ribeiro <plribeiro3000@gmail.com>
+* Pedro Matos Monteiro <pedro.matos.monteiro@gmail.com>
+* Puneet Loya <ploya@Asperas-Master-MacBook-Pro.local>
+* Robert von Massow <r.vonmassow@emetriq.com>
+* Rocco Galluzzo <rocco@galluzzo.me>
+* Rodrigo de Almeida Pereira <contato@rodrigo-pereira.net>
+* Ryan Schlesinger <ryan@ryanschlesinger.com>
+* Ryunosuke SATO <tricknotes.rs@gmail.com>
+* Sergey Bahchissaraitsev <sergey@bahchis.com>
+* Shai Rosenfeld <shai.rosenfeld@autodesk.com>
+* Shuhei Kagawa <shuhei.kagawa@gmail.com>
+* Suraj Shirvankar <surajshirvankar@gmail.com>
+* Todd Willey <xtoddx@gmail.com>
+* Ville Lautanala <lautis@gmail.com>
+* Vlad Yarotsky <vlad@remind101.com>
+* Vít Ondruch <vondruch@redhat.com>
 * Wesley Beary <geemus@gmail.com>
-* geemus <geemus@gmail.com>
+* Yaming Huang <yumminhuang@gmail.com>
+* Yusuke Ebihara <biibiebi1234@gmail.com>
+* chanakya devraj <chanakya.devraj@cuelogic.co.in>
+* chanakyad-cuelogic <chanakya.devraj@cuelogic.co.in>
+* ddoc <bgalura@gmail.com>
+* geemus <geemus@gmail.com>
+* huming <humings@gmail.com>
+* miliao <mliao@adobe.com>
+* mrloop <ewan@mrloop.com>
+* nob.murakita <nobmurakita@users.noreply.github.com>
+* solud <jon@joncole.com>
+* starbelly <starbelly@pobox.com>

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 [CONTRIBUTORS.md](https://github.com/fog/fog/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2014-2017 [CONTRIBUTORS.md](https://github.com/fog/fog-aws/blob/master/CONTRIBUTORS.md)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/fog-aws.gemspec

@@ -19,10 +19,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake',    '~> 10.0'
   spec.add_development_dependency 'shindo',  '~> 0.3'
-  spec.add_development_dependency 'rubyzip', '~> 0.9.9'
+  spec.add_development_dependency 'rubyzip', '~> 1.2.1'
 
   spec.add_dependency 'fog-core',  '~> 1.38'
   spec.add_dependency 'fog-json',  '~> 1.0'

data/lib/fog/aws.rb

@@ -27,6 +27,7 @@ module Fog
     autoload :CredentialFetcher, File.expand_path('../aws/credential_fetcher', __FILE__)
     autoload :Errors, File.expand_path('../aws/errors', __FILE__)
     autoload :Mock, File.expand_path('../aws/mock', __FILE__)
+    autoload :ServiceMapper, File.expand_path('../aws/service_mapper', __FILE__)
     autoload :SignatureV4, File.expand_path('../aws/signaturev4', __FILE__)
 
     # Services

data/lib/fog/aws/compute.rb

@@ -196,6 +196,8 @@ module Fog
           'vpc'  => 'vpc'
         }
 
+        VPC_BLANK_VALUE = 'none'
+
         include Fog::AWS::CredentialFetcher::ConnectionMethods
 
         def self.data
@@ -284,7 +286,7 @@ module Fog
                     "attributeName" => "supported-platforms"
                   },
                   {
-                    "values"        => ["none"],
+                    "values"        => [VPC_BLANK_VALUE],
                     "attributeName" => "default-vpc"
                   },
                   {
@@ -375,6 +377,79 @@ module Fog
           self.data[:account_attributes].find { |h| h["attributeName"] == "supported-platforms" }["values"] = values
         end
 
+        def default_vpc
+          vpc_id = describe_account_attributes.body["accountAttributeSet"].find{ |h| h["attributeName"] == "default-vpc" }["values"].first
+          vpc_id == VPC_BLANK_VALUE ? nil : vpc_id
+        end
+
+        def default_vpc=(value)
+          self.data[:account_attributes].find { |h| h["attributeName"] == "default-vpc" }["values"] = [value]
+        end
+
+        def setup_default_vpc!
+          return if default_vpc.present?
+
+          disable_ec2_classic
+
+          vpc_id = Fog::AWS::Mock.default_vpc_for(region)
+          self.default_vpc = vpc_id
+
+          data[:vpcs] << {
+            'vpcId' => vpc_id,
+            'state' => 'available',
+            'cidrBlock' => '172.31.0.0/16',
+            'dhcpOptionsId' => Fog::AWS::Mock.dhcp_options_id,
+            'tagSet' => {},
+            'instanceTenancy' => 'default',
+            'enableDnsSupport' => true,
+            'enableDnsHostnames' => true,
+            'isDefault' => true
+          }
+
+          internet_gateway_id = Fog::AWS::Mock.internet_gateway_id
+          data[:internet_gateways][internet_gateway_id] = {
+            'internetGatewayId' => internet_gateway_id,
+            'attachmentSet' => {
+              'vpcId' => vpc_id,
+              'state' => 'available'
+            },
+            'tagSet' => {}
+          }
+
+          data[:route_tables] << {
+            'routeTableId' => Fog::AWS::Mock.route_table_id,
+            'vpcId' => vpc_id,
+            'routes' => [
+              {
+                'destinationCidrBlock' => '172.31.0.0/16',
+                'gatewayId' => 'local',
+                'state' => 'active',
+                'origin' => 'CreateRouteTable'
+              },
+              {
+                'destinationCidrBlock' => '0.0.0.0/0',
+                'gatewayId' => internet_gateway_id,
+                'state' => 'active',
+                'origin' => 'CreateRoute'
+              }
+            ]
+          }
+
+          describe_availability_zones.body['availabilityZoneInfo'].map { |z| z['zoneName'] }.each_with_index do |zone, i|
+            data[:subnets] << {
+              'subnetId'                 => Fog::AWS::Mock.subnet_id,
+              'state'                    => 'available',
+              'vpcId'                    => vpc_id,
+              'cidrBlock'                => "172.31.#{i}.0/16",
+              'availableIpAddressCount'  => '251',
+              'availabilityZone'         => zone,
+              'tagSet'                   => {},
+              'mapPublicIpOnLaunch'      => true,
+              'defaultForAz'             => true
+            }
+          end
+        end
+
         def tagged_resources(resources)
           Array(resources).map do |resource_id|
             if match = resource_id.match(/^(\w+)-[a-z0-9]{8}/i)
@@ -560,7 +635,16 @@ module Fog
                   Fog::Compute::AWS::NotFound.slurp(error, match[:message])
                 when 'RequestLimitExceeded'
                   if retries < max_retries
-                    sleep (2.0 ** (1.0 + retries) * 100) / 1000.0
+                    jitter = rand(100)
+                    waiting = true
+                    start_time = Time.now
+                    wait_time = ((2.0 ** (1.0 + retries) * 100) + jitter) / 1000.0
+                    Fog::Logger.warning "Waiting #{wait_time} seconds to retry."
+                    while waiting
+                      if Time.now - start_time >= wait_time
+                        waiting = false
+                      end
+                    end
                     retries += 1
                     retry
                   else

data/lib/fog/aws/credential_fetcher.rb

@@ -23,8 +23,10 @@ module Fog
                 credential_path = options[:credential_path] || ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
                 role_data = connection.get(:path => credential_path, :idempotent => true, :expects => 200).body
 
-                connection = options[:metadata_connection] || Excon.new(INSTANCE_METADATA_HOST)
-                region ||= connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body[0..-2]
+                if region.nil?
+                  connection = options[:metadata_connection] || Excon.new(INSTANCE_METADATA_HOST)
+                  region = connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body[0..-2]
+                end
               else
                 connection = options[:connection] || Excon.new(INSTANCE_METADATA_HOST)
                 role_name = connection.get(:path => INSTANCE_METADATA_PATH, :idempotent => true, :expects => 200).body

data/lib/fog/aws/mock.rb

@@ -145,6 +145,9 @@ module Fog
       def self.zone_id
         "zone-#{Fog::Mock.random_hex(8)}"
       end
+      def self.route_table_id
+        "rtb-#{Fog::Mock.random_hex(8)}"
+      end
       def self.change_id
         Fog::Mock.random_letters_and_numbers(14)
       end
@@ -181,6 +184,11 @@ module Fog
           'SUSE Linux'
         ]
       end
+
+      def self.default_vpc_for(region)
+        @default_vpcs ||= {}
+        @default_vpcs[region] ||= vpc_id
+      end
     end
   end
 end

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

@@ -14,6 +14,16 @@ module Fog
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
+        {
+          :id                      => 't2.nano',
+          :name                    => 'Nano Instance',
+          :bits                    => 64,
+          :cores                   => 1,
+          :disk                    => 0,
+          :ram                     => 512,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
         {
           :id                      => 't2.micro',
           :name                    => 'Micro Instance',
@@ -713,6 +723,36 @@ module Fog
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "p3.2xlarge",
+          :name                    => "Tesla GPU Two Extra Large",
+          :bits                    => 64,
+          :cores                   => 5120,
+          :ram                     => 6100,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "p3.8xlarge",
+          :name                    => "Tesla GPU Eight Extra Large",
+          :bits                    => 64,
+          :cores                   => 204080,
+          :ram                     => 244000,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "p3.16xlarge",
+          :name                    => "Tesla GPU Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 408160,
+          :ram                     => 488000,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         }
       ]