From e49f7054a8bb19f795ade415a9a79ed541dc6967 Mon Sep 17 00:00:00 2001 From: Daniel Farina Date: Fri, 3 Jul 2015 01:43:59 -0700 Subject: [PATCH] Describe vpcPeeringConnectionId --- .../aws/parsers/compute/describe_route_tables.rb | 6 +++--- .../aws/requests/compute/describe_route_tables.rb | 1 + tests/requests/compute/route_tests.rb | 15 ++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/fog/aws/parsers/compute/describe_route_tables.rb b/lib/fog/aws/parsers/compute/describe_route_tables.rb index 924a51f1f..f920b6244 100644 --- a/lib/fog/aws/parsers/compute/describe_route_tables.rb +++ b/lib/fog/aws/parsers/compute/describe_route_tables.rb @@ -7,7 +7,7 @@ module Fog @association = { 'routeTableAssociationId' => nil, 'routeTableId' => nil, 'subnetId' => nil, 'main' => false } @in_association_set = false @in_route_set = false - @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'state' => nil, 'origin' => nil } + @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'state' => nil, 'origin' => nil } @response = { 'routeTableSet' => [] } @tag = {} @route_table = { 'associationSet' => [], 'tagSet' => {}, 'routeSet' => [] } @@ -54,11 +54,11 @@ module Fog end elsif @in_route_set case name - when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'state', 'origin' + when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'vpcPeeringConnectionId', 'state', 'origin' @route[name] = value when 'item' @route_table['routeSet'] << @route - @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'state' => nil, 'origin' => nil } + @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'state' => nil, 'origin' => nil } when 'routeSet' @in_route_set = false end diff --git a/lib/fog/aws/requests/compute/describe_route_tables.rb b/lib/fog/aws/requests/compute/describe_route_tables.rb index 19ce54d77..addd6044c 100644 --- a/lib/fog/aws/requests/compute/describe_route_tables.rb +++ b/lib/fog/aws/requests/compute/describe_route_tables.rb @@ -23,6 +23,7 @@ module Fog # * 'instanceId'<~String> - The ID of a NAT instance in your VPC. # * 'instanceOwnerId'<~String> - The owner of the instance. # * 'networkInterfaceId'<~String> - The network interface ID. + # * 'vpcPeeringConnectionId'<~String> - The peering connection ID. # * 'state'<~String> - The state of the route. The blackhole state indicates that the route's target isn't available. # * 'origin'<~String> - Describes how the route was created. # * 'associationSet'<~Array>: diff --git a/tests/requests/compute/route_tests.rb b/tests/requests/compute/route_tests.rb index dd50c99a7..de6022f65 100644 --- a/tests/requests/compute/route_tests.rb +++ b/tests/requests/compute/route_tests.rb @@ -25,13 +25,14 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do }], 'tagSet' => Hash, 'routeSet' => [{ - 'destinationCidrBlock' => String, - 'gatewayId' => Fog::Nullable::String, - 'instanceId' => Fog::Nullable::String, - 'instanceOwnerId' => Fog::Nullable::String, - 'networkInterfaceId' => Fog::Nullable::String, - 'state' => String, - 'origin' => String + 'destinationCidrBlock' => String, + 'gatewayId' => Fog::Nullable::String, + 'instanceId' => Fog::Nullable::String, + 'instanceOwnerId' => Fog::Nullable::String, + 'networkInterfaceId' => Fog::Nullable::String, + 'vpcPeeringConnectionId' => Fog::Nullable::String, + 'state' => String, + 'origin' => String }], 'routeTableId' => String, 'vpcId' => String,