Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,777 Commits 1 Branch 0 Tags 43 MiB
c95ab15268
Commit Graph

480 Commits

Author SHA1 Message Date
Alan Baldwin
b09c8034e6
Adding VPN Gateway filters (#3155) 
* Adding attchment.vpc-id, attachment.state, type, and vpn-gateway-id filters for VPN Gateways. fixes #3154

* Run formatting on tests

Co-authored-by: Alan Baldwin <alan.baldwin.jr@gmail.com>
 2020-07-21 16:08:49 +01:00
usmangani1
552b1294df
Fix : EC2 - Added ownerId filter for describe instances (#3149) 
* Fix : EC2 - Added ownerId filter for describe instances

* linting
 2020-07-19 10:44:58 +01:00
usmangani1
81be4b37a1
Fix: Ec2 - add destinationIpv6CIDR support. (#3106) 
* Fix: Ec2 - add destinationIpv6CIDR support.

* removing unneccessary debug statements

* modifying existing test case

* Linting

Co-authored-by: usmankb <usman@krazybee.com>
Co-authored-by: Bert Blommers <info@bertblommers.nl>
 2020-07-07 14:32:55 +01:00
Ninh Khong
b7671819df Update code lint 2020-07-05 23:04:34 +07:00
Ninh Khong
87eb8a21d6 Update unittest checking region response in accept_vpc_peering_connection and describe_vpc_peering_connects functions 2020-07-05 22:09:57 +07:00
Maxim Kirilov
610bf36f3b
Improve parsing of string values that represents booleans during block device mapping construction (#3073) 
* convert str into bool

* Fix python2

* Fix python2

* pylint
 2020-06-16 06:03:02 +01:00
usmangani1
5988e5efaa
EC2 : Fix - modified volume type in ec2 describe images. (#3074) 
* "modified volume type in ec2 describe images"

* removed unncessary comments

* Linting

Co-authored-by: usmankb <usman@krazybee.com>
Co-authored-by: Bert Blommers <info@bertblommers.nl>
 2020-06-15 10:32:43 +01:00
usmangani1
475f022b78
Enhancement: EC2 added create route with networkInterfaceId (#3063) 
* Enhancement:EC2- create route with network interfcaeID

* modifying existing test case

* Linting

Co-authored-by: usmankb <usman@krazybee.com>
Co-authored-by: Bert Blommers <info@bertblommers.nl>
 2020-06-12 16:16:55 +01:00
André Nardy
97a6e8d9e8
Enhancement/describe network acls (#3003) 
* update describe_network_acls and create unit test

* add fail test case

* adjustment after feedback

* fix result test
 2020-05-26 11:04:59 +01:00
Maxim Kirilov
2320e82647
Add support for detaching volumes upon instance termination (#2999) 2020-05-24 12:22:45 +01:00
Maxim Kirilov
1e0a7380d5
Add support for BlockDeviceMappings argument (#2949) 
* Add support for BlockDeviceMappings argument upon run_instances execution

* Remove redundant check for Ebs existence
 2020-05-11 13:23:45 +01:00
Bert Blommers
2d0087d500 Linting 2020-04-29 16:29:25 +01:00
usmankb
f4888da334 added test asserts and review comments 2020-04-29 18:02:02 +05:30
usmankb
84100c4483 enhancement Create-VPC-endpoint 2020-04-29 00:28:19 +05:30
Matthew Gladney
ff1beea280 Merge https://github.com/spulec/moto into support_optin_regions 2020-04-27 18:27:40 -04:00
Steve Pulec
fbc431dbff
Merge pull request #2837 from bblommers/bug/2810 
EC2 - Explicitly set ebs_optimized to false if not specified
 2020-04-25 18:44:48 -05:00
Steve Pulec
9c3f6c7592
Merge pull request #2825 from bblommers/feature/2699 
EC2 - Add option to add volumes using CloudFormation
 2020-04-25 18:36:26 -05:00
Matthew Gladney
59c1f0e131 black reformatting changes 2020-04-24 14:20:58 -04:00
Matthew Gladney
908468edb6 Support OptInStatus for EC2 describe_region calls 2020-04-24 14:15:22 -04:00
Mike Grima
bdeeeb701a
Merge pull request #2880 from bblommers/bugfix/2877 
EC2 - Ensure NCI always has a Subnet
 2020-04-16 15:02:45 -07:00
usmankb
7a9cdd4fd2 Adding missing Param zoneId in the describe-availability-zone 2020-04-11 08:37:00 +05:30
Bert Blommers
8475804a8b Simplify tests 2020-04-08 14:02:35 +01:00
Bert Blommers
5c7e0b56af #2877 - Ensure NetworkInterfaces are assigned to the default Subnet 2020-04-08 13:53:53 +01:00
Bert Blommers
aae49493c4 Linting 2020-04-07 08:52:37 +01:00
usmankb
81ca5c3ab0 Implemented describe_instance_credit_specifications function in ec2 #2150 localstack 2020-04-06 21:25:59 +05:30
mickeypash
a6864f483d Use Python 2 format 2020-04-03 14:17:55 +01:00
mickeypash
d3367b8a90 Black formatting 2020-04-03 02:27:46 +01:00
mickeypash
76b9cbe16d Fix test 2020-04-03 02:14:14 +01:00
mickeypash
231b100057 Add test scaffold. Currently broken 2020-04-03 01:58:14 +01:00
Bert Blommers
11526ced18 #2810 - EC2 - Explicitly set ebs_optimized to False if not specified 2020-03-24 09:24:38 +00:00
Bert Blommers
5b596c8a78 #2699 - EC2 - Add Volumes using CloudFormation 2020-03-20 15:17:55 +00:00
Bert Blommers
9eeb375911
Add region to test case 2020-03-10 09:26:44 +00:00
Bert Blommers
dc98fca853 #718 - Allow filtering by multiple tags 2020-03-09 15:14:51 +00:00
Steve Pulec
a92f862e86
Merge pull request #2764 from bblommers/feature/ec2-describe-instance-filters 
Feature  - EC2 describe_instance_status now uses filters
 2020-03-07 11:47:05 -06:00
aimannajjar
639c1abcb4 clarifying comment in test case 2020-03-01 08:23:31 -05:00
aimannajjar
5b9b965647 [ec2-sg] added logic to create a second default egress rule for ipv6 2020-02-29 21:05:05 -05:00
Bert Blommers
3aeb5f5043 Linting 2020-02-24 13:43:58 +00:00
Bert Blommers
939bd1cd86 EC2 - Add some filters for describe_instance_status 2020-02-24 13:43:19 +00:00
Steve Pulec
b252ab6675
Merge pull request #2173 from sthuber90/master 
Extending IoT Policy and Jobs functionality
 2020-02-17 17:55:03 -06:00
Bert Blommers
df031d0f33 #2732 - Created AMI should have AccountID as the OwnerID 2020-02-08 10:58:31 +00:00
Stephan Huber
5543a91cc1 Merge remote-tracking branch 'upstream/master' 2020-01-24 10:38:19 +01:00
Asher Foa
d9d055c75d Fix more typos. 2020-01-23 10:15:02 -08:00
Stephan Huber
84210f6011 Merge remote-tracking branch 'upstream/master' 2020-01-23 15:37:40 +01:00
gruebel
cd9b7072a2 Adjust ec2 regions tests 2019-12-28 21:22:16 +01:00
gruebel
d7ba355a65 Add missing regions to all services 2019-12-26 17:12:22 +01:00
Stephan Huber
0527e88d46 Merge remote-tracking branch 'upstream/master' 2019-12-23 08:38:53 +01:00
Fabio Dias
743dd46399 black linting 2019-12-16 21:25:20 -05:00
Fabio Dias
fd9ac4b9a5 ACCOUNT_ID moved to moto.core, MOTO_ACCOUNT_ID env var override 2019-12-16 21:05:29 -05:00
Fabio Dias
b83a750630 Added references to moto.iam.models.ACCOUNT_ID instead of hardcoded id 2019-12-16 19:56:11 -05:00
Mike Grima
4386999ea7
Merge pull request #2613 from levinine/add_nat_gateway_id_to_route_and_describe_route_tables 
Add nat_gateway_id to route and describe_route_tables
 2019-12-12 18:33:11 -08:00
Mike Grima
ab73ab3ff5
Merge pull request #2609 from levinine/describe_nat_gateway_filter_support 
Add describe_nat_gateway filters support
 2019-12-12 18:29:05 -08:00
Berislav Kovacki
43070a03ba Add nat_gateway_id to route and describe_route_tables 2019-12-02 19:20:00 +01:00
Berislav Kovacki
4322ecb254 Add describe_nat_gateway filters support 
Support describe_nat_gateway filters by using nat-gateway-id, vpc-id,
subnet-id and state filter parameters.
 2019-11-28 23:36:00 +01:00
gruebel
5895231b5c Fix ec2.revoke_security_group_egress for IpProtocol -1 2019-11-24 17:17:53 +01:00
Mike Grima
028aafd05b
Merge pull request #2555 from catherinetcai/feature/ec2-vpc-classic-link 
Adds basic implementations for vpc-classic-link and vpc-classic-link-dns-support - Redo
 2019-11-16 10:21:29 -08:00
Cat Cai
528cf0e21d Run black to fix linting 2019-11-12 14:51:31 -08:00
Cat Cai
9169b87748 Tests pass 2019-11-12 11:16:34 -08:00
Cat Cai
9cb105f5c2 Ensure test is sorted 2019-11-12 10:32:27 -08:00
Cat Cai
3398244f14 Fix styling problems 2019-11-11 12:09:52 -08:00
Wessel van der Veen
6d52cd06cb Adds support for enable/disable/describe vpc-classic-link-dns-support. 2019-11-11 10:55:09 -08:00
Wessel van der Veen
17cc46b91e adds basic support for vpc-classic-link 2019-11-11 10:54:36 -08:00
Bert Blommers
179bdd6caa #2002 - Take ElasticNetworkInterfaces into account when requesting available IP addresses 2019-11-08 16:40:17 +00:00
Asher Foa
96e5b1993d Run black on moto & test directories. 2019-10-31 10:36:05 -07:00
Chih-Hsuan Yen
18173a5951
Replace # flake8: noqa with # noqa 
The former syntax is actually a mis-use and rejected since Flake8 3.6
[1].

[1] https://gitlab.com/pycqa/flake8/merge_requests/219
 2019-10-27 20:41:22 +08:00
Stephan Huber
5a9c921d97 Merge remote-tracking branch 'upstream/master' 2019-08-30 14:39:29 +02:00
Stephan Huber
b94147a1d5 Merge remote-tracking branch 'upstream/master' 2019-08-30 14:18:01 +02:00
Don Kuntz
d2ce3a9e04
Flake8 fixes 2019-08-19 18:01:44 -05:00
Don Kuntz
4929298f1f
Test create_launch_template_version using launch_template id 2019-08-19 17:59:15 -05:00
Don Kuntz
a1aa087718
Add test for creating launch templates with TagSpecifications option 2019-08-19 17:58:19 -05:00
Don Kuntz
743e5be4d3
Confirm describe_launch_template_versions works with Versions, MinVersion, and MaxVersion options 2019-08-19 17:57:39 -05:00
Don Kuntz
1de63b1691 Specify region in launch template tests 2019-08-14 16:32:01 -05:00
Don Kuntz
aa3b6085d1 Add basic endpoints for EC2 Launch Templates 
Specifically, add the CreateLaunchTemplate, CreateLaunchTemplateVersion,
DescribeLaunchTemplates, and DescribeLaunchTemplateVersions endpoints.
 2019-08-14 16:11:07 -05:00
Don Kuntz
abf3db8d8a
Add a test to ensure that ec2.copy_image sets the proper owner id 
This test is useful because before the last commit using copy_image
would not set the owner_id to the same one used when calling
describe_images.

For example, this code

    conn = boto3.client("ec2")
    copy_resp = conn.copy_image(
        SourceImageId="ami-whatever",
        ...
    )

    describe_resp = conn.describe_images(
        Owners=["self"]
    )

Would result in describe_resp being empty, when it should contain the
image from the copy_resp before it.

By ensuring the owner ids are the same (see ce4059f6) the code example
now works as expected.
 2019-07-22 21:57:15 -05:00
Don Kuntz
ce4059f6d9
Use a consistent owner id between EC2 resources 
Previously there were a couple models which used different owner ids by
default, which could make tests relying on them fail if someone wasn't
expecting that. This change ensures a uniform owner id between
resources.
 2019-07-22 21:50:09 -05:00
Berislav Kovacki
e67e2deee4 Extend EC2 DescribeNetworkInterface filter support 
* add description property to EC2 NetworkInterface
* extend DescribeNetworkInterfaces filter support with description,
subnet-id, private-ip-address attributes
 2019-07-15 00:01:37 +02:00
acsbendi
7de0ef0f8b Fixed value is present in response even if it's None. 2019-07-05 15:24:16 +02:00
acsbendi
0b88dd1efb Fixed security group IDs not returned correctly. 2019-07-05 15:12:38 +02:00
acsbendi
7215b00466 Created test case for describe_instance_attribute. 2019-07-05 13:43:47 +02:00
Bendegúz Ács
8f53b16b9a Updates to create_subnet and describe_subnets responses (#2053) 
* Removed Tags field from create_subnet response.

* Added DefaultForAz to create_subnet response.

* Added MapPublicIpOnLaunch to create_subnet response.

* Added OwnerId to create_subnet response.

* Added AssignIpv6AddressOnCreation field for create_subnet and describe_subnet and implemented setting it in modify_subnet_attribute.

* Added SubnetArn to create_subnet response.

* Added AvailabilityZoneId to create_subnet and describe_subnet responses, and error for invalid availability zone.

* Added Ipv6CidrBlockAssociationSet to create_subnet response.

* Added missing fields to describe_subnets response.

* Added myself to list of contributors and marked describe_subnet as implemented.

* Fixed linting errors.

* Fixed blank line containing a tab.

* Fixed accidentally deleted ).

* Fixed broken tests.
 2019-05-28 16:33:25 +01:00
Stephan
d0de38601d Merge remote-tracking branch 'upstream/master' 2019-05-28 08:55:50 +02:00
Bendegúz Ács
21917c4b93 Bug fix for default network ACL entries (#2056) 
* Fixed a bug where default network ACL entries could not be deleted.

* Implemented throwing error when a network entry with the same rule number and egress value already exists.

* Fixed syntax errors.

* Added socket.timeout to possibly raised exceptions in wait_for for Python 3.
 2019-05-26 02:02:14 +01:00
Bendegúz Ács
f408709ef9 VPC IPv4 validation (#2026) 
* Implemented throwing invalid subnet range error and fixed breaking tests.

* Implemented throwing invalid CIDR block parameter error for vpcs and subnets.

* Implemented throwing invalid destination CIDR block error.

* IPv6 addresses not accepted, strict checking disabled.

* Implemented throwing invalid subnet conflict error and fixed breaking tests.

* Implemented throwing invalid VPC range error and fixed breaking tests.

* Fixed accidentally removed ).

* Fixed test case trying to create two subnets with the same CIDR range.
 2019-05-25 18:35:07 +01:00
David
868d0107bf Autoscaling instance azs (#2030) 
* Add instance AZ support in autoscaling

* Resolve py36-py27 format string error in test_autoscaling
 2019-05-25 11:18:16 +01:00
Daniel Miranda
fb2a76fd66 ec2: add support for creation and importing of real SSH keys (#2108) 
* ec2: add support for creation and importing of real SSH keys

* setup: lock PyYAML version to avoid incompatibilities
 2019-05-25 11:17:52 +01:00
Jeffery Smith
4a99dcddb2 Issue #2141 Adding owner-id to the filter for Snapshot (#2142) 
* Adding owner-id to the filter for Snapshot
 2019-05-25 10:34:59 +01:00
Hans
9b12ce6809 Fix #1842 Create cross region VPC peering connection in both region (#2195) 
Add a class level store in models/VPCPeeringConnectionBackend of ec2
for saving vpc peering connection.
Any instance can correctly save VPC peering connection info
on both region when it create vpc peering connection.

Update vpc_peering_connections in ec2/responses to meet new version:
DESCRIBE_VPC_PEERING_CONNECTIONS_RESPONSE,
ACCEPT_VPC_PEERING_CONNECTION_RESPONSE,

Previous code only create one region VPC peering connection but
doesn't create the other region VPC peering connection
when create cross region VPC peering connection.

Tested in real AWS environment at first
and create unit test case according to real AWS environment response.

Add 5 test cases
VPC cross region delete case
VPC cross region accept case
VPC cross region accept wrong region case
VPC cross region reject case
VPC cross region reject wrong region case

Related: #1842, #1830
 2019-05-25 10:21:57 +01:00
Stephan
5804441d38 Merge remote-tracking branch 'upstream/master' 2019-04-29 12:11:47 +02:00
Mike Grima
d8dbc6a49c
Merge pull request #2134 from ogckw/master 
Fix #2129 EC2 tag should raise ClientError when resource is empty
 2019-04-17 11:05:28 -07:00
hsuhans
6b7282f93c Fix #2129 EC2 tag should raise ClientError when resource is empty 
Raise MissingParameterError exception in models/validate_resource_ids of ec2.

Add ec2 create tag with empty resource test case.
Add ec2 delete tag with empty resource test case.

Related: #2129

Reference
boto3 create_tags
https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/ec2.html#EC2.Client.create_tags

boto3 delete_tags
https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/ec2.html#EC2.Client.delete_tags

Amazon EC2 API Reference Actions CreateTags
https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html

Amazon EC2 API Reference Actions DeleteTags
https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DeleteTags.html
 2019-03-30 23:26:50 +08:00
Hugo Lopes Tavares
7c62f4a75c Add test to CloudFormation and PrimaryPrivateIpAddress GetAtt 
This test would raise an error before d4e39146b7
 2019-03-27 16:28:18 -04:00
Hugo Lopes Tavares
d4e39146b7 Make sure every NetworkInterface has a private IP 
AWS always assigns a primary IP address to Network Interfaces.
Using a test account (modified the IP):

    >>> import boto
    >>> vpc = boto.connect_vpc()
    >>> eni = vpc.create_network_interface(subnet_id)
    >>> eni.private_ip_addresses
    [PrivateIPAddress(10.1.2.3, primary=True)]
 2019-03-27 16:27:10 -04:00
Tay Frost
15b3ede3cc Add test for case where ebs volume has no tags. 
This commit adds a test for a case where an EBS volume has no tags. When
an EBS volume has no tags, calls to the aws ec2 endpoints `create_volume`
and `describe_volumes` do not include the `Tags` key in the
`response.Volumes[]` object.

However, moto does include the `Tags` key in this case. This discrepancy
in behaviour can result in code passing a moto test but failing in
production.

Sample snippets that trigger this condition:

```
def create_volume_and_then_get_tags_from_response():
    client = boto3.client('ec2', region_name='us-east-1')
    volume_response = client.create_volume(
        Size=10,
        AvailabilityZone='us-east-1a'
    )
    keys = volume_response['Keys']
```

```
def create_volume_and_then_get_tags_from_describe_volumes():
    client = boto3.client('ec2', region_name='us-east-1')
    volume_response = client.create_volume(
        Size=10,
        AvailabilityZone='us-east-1a'
    )
    volume_describe_response = client.describe_volumes()
    keys = volume_describe_response['Volumes'][0]['Keys']
```

Both sample snippets will succeed in a moto test, but fail with a
`KeyError` when using the aws api.
 2019-03-07 17:25:18 -05:00
Mike Grima
09855801ba
Merge pull request #2019 from acsbendi/launch_index 
Correctly returning ami launch index
 2019-02-25 12:16:40 -08:00
Mike Grima
d652755f3b
Merge pull request #2032 from drmorr0/spot_fleet_tag_specifications 
tag specifications for spot fleet requests
 2019-02-01 11:47:36 -08:00
David Morrison
b4b63202d9 tag specifications for spot fleet requests 2019-01-24 11:38:07 -08:00
acsbendi
68b8e6b636 Implemented adding default entries to default network ACLs. 2019-01-21 15:36:49 +01:00
acsbendi
3c5ce6c09e Fixed new subnets associated with a network ACL from a different VPC. 2019-01-21 13:30:22 +01:00
acsbendi
6bd7e5941f Added test case for running multiple instances in the same command. 2019-01-15 17:34:22 +01:00
Steve Pulec
93f68090e3
Merge pull request #1989 from jrbeilke/bugfix-ec2_ami_is-public 
Bugfix for filtering EC2 AMIs with is-public (values should be lowercase)
 2018-12-28 21:22:28 -05:00
Stephan
e51d1bfade merge 2018-12-21 12:28:56 +01:00