Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use same structure as delete_route() for determining cidr string

Browse Source
This commit is contained in:
Lewis Gaul 2023-06-22 04:29:05 -07:00
parent b21131c4f6
commit 1d8ca4a852
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moto/ec2/models/route_tables.py
View File

@ -448,6 +448,11 @@ class RouteBackend:
interface_id: Optional[str] = None, interface_id: Optional[str] = None,
vpc_peering_connection_id: Optional[str] = None, vpc_peering_connection_id: Optional[str] = None,
) -> Route: ) -> Route:
cidr = destination_cidr_block
if destination_ipv6_cidr_block:
cidr = destination_ipv6_cidr_block
if destination_prefix_list_id:
cidr = destination_prefix_list_id
route_table = self.get_route_table(route_table_id) route_table = self.get_route_table(route_table_id)
route_id = generate_route_id( route_id = generate_route_id(
route_table.id, destination_cidr_block, destination_ipv6_cidr_block route_table.id, destination_cidr_block, destination_ipv6_cidr_block
@ -455,11 +460,6 @@ class RouteBackend:
try: try:
route = route_table.routes[route_id] route = route_table.routes[route_id]
except KeyError: except KeyError:
cidr = (
destination_cidr_block
if destination_cidr_block
else destination_ipv6_cidr_block
)
# This should be 'raise InvalidRouteError(route_table_id, cidr)' in # This should be 'raise InvalidRouteError(route_table_id, cidr)' in
# line with the delete_route() equivalent, but for some reason AWS # line with the delete_route() equivalent, but for some reason AWS
# returns InvalidParameterValue instead in this case. # returns InvalidParameterValue instead in this case.