Commit Graph

456 Commits

Author SHA1 Message Date
Steve Pulec
5371044b6f Spot fleet (#760)
* initial spot fleet.

* Add cloudformation spot fleet support.

* If no spot fleet ids, return all.
2016-11-07 09:53:44 -05:00
Steve Pulec
44636d1f73 Merge pull request #755 from dtenenba/master
bump tag limit from 10 to 50 to align with actual AWS limit
2016-11-06 09:52:20 -05:00
Dan Tenenbaum
37f643ecb4 bump tag limit from 10 to 50 to align with actual AWS limit 2016-11-03 14:12:20 -07:00
Costy Petrisor
8689b40d23 made the security group endpoints that authorize or revoke firewall rules
to support batch rules (boto doesn't expose this, but botocore/boto3 does)
2016-10-20 19:34:11 +00:00
rocky4570fft
57ab70b05c fix up indentation 2016-10-16 00:56:49 +10:00
rocky4570fft
d6f76cbb43 Add dry_run to a number of EC2 services 2016-10-16 00:34:52 +10:00
Steve Pulec
4a92f9fdb0 Fix IP setting. 2016-10-12 22:14:45 -04:00
Steve Pulec
27f1bece9b Fix assigning public ip to instances. Closes #729. 2016-10-12 22:02:13 -04:00
Rene Martin
bd9e7deb95 Merge branch 'master' of https://github.com/spulec/moto 2016-10-10 07:47:11 +01:00
Steve Pulec
fef3437db2 Throw error on terminating empty instance list. Closes #697. 2016-10-09 21:20:53 -04:00
Rene Martin
4fa838e9fd Keep default dhcp_options id backwards compatiblity 2016-10-08 10:37:57 +01:00
Rene Martin
b06d439a81 Set the right dhcp_options id in the response
If the vpc has a dhcp_options associated with it the response should
include the right association.
2016-10-08 10:34:55 +01:00
Jeff Albert
6d7b0c9a15 Fixed issue when invalid resource type is used it would return all tags. Behavoir differed from that of AWS behavior 2016-09-15 14:52:57 -04:00
Mervyn Russell
27495e01e5 Added support for creation date to Ami 2016-08-26 13:43:17 +01:00
rocky4570fft
0161422d21 additional filters to get_all_vpcs 2016-08-14 16:58:35 +10:00
Andrew Gross
b4176050e2 Add volume attachment status 2016-07-22 14:23:42 -04:00
Steve Pulec
3e797d9c50 Merge pull request #658 from kierandoonan/master
Add encrypted attribute to Volumes/Snapshots
2016-07-09 21:11:52 -04:00
Steve Pulec
c34481a476 Merge pull request #659 from kierandoonan/fix-tag-filter
Fix tag filter
2016-07-09 21:11:12 -04:00
Kieran Doonan
619255e25a tag-key and tag-value filters now do a regex match 2016-07-05 11:44:39 +01:00
Kieran Doonan
d3dcb8d3b5 tag_filter_matches now uses regex for key/value matches 2016-07-05 11:28:35 +01:00
Kieran Doonan
af0007ad2b volumes are now encrypted if snapshots are encrypted 2016-07-04 14:40:13 +01:00
Kieran Doonan
44195a9151 added encrypted attribute to snapshots 2016-07-04 14:29:33 +01:00
Kieran Doonan
a3c16bcc77 updated ebs response 2016-07-04 14:09:41 +01:00
Kieran Doonan
f9f0d4b7d9 encrypted attribute now respected in create_volume 2016-07-04 11:30:17 +01:00
Kieran Doonan
957678d33d create volume response updated 2016-07-04 11:25:51 +01:00
Kieran Doonan
9ea06399ba describe instances response now shows encrypted status 2016-07-04 11:24:13 +01:00
Kieran Doonan
e8a564b6b4 ebs model now supports encrpyted volumes 2016-07-04 11:23:46 +01:00
Paul Cieslar
706868c7f8 describe_security_groups() support for Boto3
Support for list of filters
2016-06-23 11:59:58 +01:00
Riccardo M. Cefala
0ea9823397 add generate_instance_identity_document in ec2 utils 2016-06-11 12:48:01 +02:00
Yann Lambret
52a5346c9e Add support for VPC attributes management, and fix a bug about the default - not default status of a VPC 2016-05-12 22:36:09 +02:00
Steve Pulec
076a6a7055 Better defaults for AMIs. 2016-05-11 18:28:34 -04:00
Yann Lambret
fdadd24ad3 Extend filtering support for elastic network interfaces 2016-05-08 00:19:01 +02:00
Steve Pulec
d82d64b8bd Add EBS snapshot filter. Closes #525. 2016-05-01 22:24:49 -04:00
Steve Pulec
a600deb96a Fix merge conflicts and add EC2 Instance delete. Closes #576. 2016-04-28 09:22:31 -04:00
Adam Romanek
b32fbf090a Fix security group ingress authorization for all protocols with no port spec 2016-04-26 11:00:04 +02:00
Steve Pulec
6be53cf8c2 Merge pull request #594 from yannlambret/fix-security-groups
Fix security groups
2016-04-23 19:43:19 -04:00
Steve Pulec
224e92ba17 Merge pull request #592 from aiell0/hotifx/add-additional-instance-filters-issue-581
Added ec2 describe-instances filter: 'architecture'
2016-04-23 19:40:15 -04:00
Yann Lambret
5a5f2f12c7 Remove useless statement 2016-04-22 19:12:26 +02:00
Yann Lambret
f9267cff6c Fix egress rules management to autorize or revoke a security group 2016-04-20 23:01:09 +02:00
Yann Lambret
de68c94a0a Add the default outboud rule for security groups 2016-04-19 23:50:46 +02:00
Yann Lambret
0882174126 Replace exception message by the one sent by boto, because it is used for bot ingress and egress rules 2016-04-19 23:50:12 +02:00
Lawrence Aiello
cf529ec3f9 Filter dicts have not been implemented in Moto for '%s' yet - mock_ec2 2016-04-18 16:41:57 -04:00
Yann Lambret
c793e0a23d Filtering implementation for DHCP options sets 2016-04-13 23:19:46 +02:00
Steve Pulec
100ec4e7c8 Merge pull request #579 from roger-lai/instance-az-filter
Added availability-zone filtering to instance collections
2016-04-09 22:28:04 -04:00
RogerLai
d759f3a1ad Added availability-zone filtering to instance collections 2016-04-05 12:55:38 -04:00
Yann Lambret
6d4a48b019 Add support for 'ModifySubnetAttribute' action 2016-04-05 00:17:56 +02:00
Steve Pulec
1ece813131 Merge pull request #570 from digital-abyss/feature/add-private-ip-filter
Add ip-address and private-ip-address to the list of filters for instance filtering
2016-03-28 23:53:16 -04:00
igartley
4bfb522020 Add ip-address and private-ip-address to the list of filters for
instance filtering.

These are described in
http://boto3.readthedocs.org/en/latest/reference/services/ec2.html#EC2.Client.describe_instances

and map to the instance methods of public_ip() and private_ip()
respectively
2016-03-22 18:11:20 -04:00
Lars Fronius
c94f49cc1e Only count user-assigned tags for TagLimitExceeded
According to
http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html
"Reserved prefix—aws:
AWS-assigned tag names and values are automatically assigned the aws:
prefix, which the user cannot assign. AWS-assigned tag names do not
count towards the tag limit of 10. User-assigned tag names have the
prefix user: in the Cost Allocation Report."
2016-03-15 16:50:57 +01:00
Steve Pulec
d8a277ed55 Merge pull request #555 from yannlambret/fix-describe-route-tables-response
Fix a typo in DESCRIBE_ROUTE_TABLES_RESPONSE
2016-03-02 15:10:33 -05:00
Yann Lambret
3afd4e0ea9 Correct a typo in DESCRIBE_ROUTE_TABLES_RESPONSE string (duplicate tagSet) that causes buggy responses 2016-03-02 00:34:45 +01:00
Hugo Lopes Tavares
6222f335f3 Refactor NatGateways methods to use _get_param() 2016-03-01 13:57:41 -05:00
Hugo Lopes Tavares
c689816337 Add CloudFormation support to NatGateway model 2016-03-01 12:02:57 -05:00
Hugo Lopes Tavares
21fb961c6a Implement NAT Gateway resource 2016-03-01 12:02:57 -05:00
Steve Pulec
b9df567445 Merge pull request #536 from andyjones/task/ec2-placement
Support placement when starting new instances
2016-02-14 16:54:05 -05:00
Steve Pulec
800f2403cf Merge pull request #533 from kevgliss/boto3DescribeInstancesSecurityGroups
Ensuring boto3 can correctly identify instance security groups
2016-02-14 16:47:01 -05:00
andy
7120b5e4b1 Support placement when starting new instances 2016-02-10 17:59:48 +00:00
kevgliss
c5016d9ddb ensuring boto3 can correctly identify instance security groups 2016-02-04 16:03:20 -08:00
gigimon
1ff24981ee * add filter by instance-id for describeAdresses 2016-02-03 18:05:25 +03:00
gigimon
cd062fc5fa * fix one place 2016-02-03 14:53:18 +03:00
gigimon
52eb16d765 * change api version to 2013-10-15 2016-02-02 16:15:18 +03:00
Steve Pulec
f35986b3fc Merge pull request #517 from DenverJ/volume_snapshot_filters
Add filter for volume-id on volumes.
2016-01-24 16:19:55 -05:00
Denver Janke
ee33ff582c Add filter for volume-id on volumes. 2016-01-20 12:24:33 +10:00
kevgliss
093a64c1c8 adding error checking on cidrs 2016-01-15 12:57:43 -08:00
kevgliss
6bc4a8b38a Adds support for authorizing and revoking egress permissions 2016-01-15 12:36:11 -08:00
Steve Pulec
defd106523 Merge pull request #506 from DenverJ/volume_snapshot_filters
Add filters for describeVolumes and describeSnapshots.
2016-01-11 13:30:56 -05:00
Denver Janke
82b0b12e45 Add filters for describeVolumes and describeSnapshots. 2016-01-11 15:46:30 +10:00
Steve Pulec
35478f3a44 Fix AZs for run_instances. Closes #490. 2016-01-10 00:54:53 -05:00
Steve Pulec
d2302bae21 Add Customer Gateway Support. Closes #465 2016-01-08 16:48:01 -05:00
Steve Pulec
42423f47e7 Merge pull request #466 from EarthmanT/support_get_all_dhcp_options_set
Adding Support for Get All DHCP Options
2015-12-21 15:18:41 -05:00
Steve Pulec
39fef4d367 Merge pull request #468 from EarthmanT/add_support_for_vpn_connections
Adding Support for VPN Connections
2015-12-21 15:18:05 -05:00
Marco Rucci
284641e8cf Add support for default VPCs and subnets.
The first VPC created will be elected as default.
All subnets of the default VPC are considered default for their availability zone.
2015-12-06 20:58:54 +01:00
earthmant
c5bf9d8c94 replacing the usage
of dhcp_opt_ids_from_querystring with sequence_from_querystring
2015-12-03 13:49:08 +02:00
earthmant
76a939cee6 making requested fix
used sequence_from_querystring and removed added functon vpn_connection_ids_from_query_string
added tests
2015-12-03 13:35:48 +02:00
Steve Pulec
44f0377cc4 Fix root volume to show up in other EC2 volume API calls. Closes 470 2015-11-28 09:19:45 -05:00
earthmant
39c3c5c8aa Adding Support for VPN Connections
support create, delete, describe
2015-11-25 16:38:02 +02:00
earthmant
41873b59f7 Adding Support for Get All DHCP Options
add DescribeDhcpOptionsResponse
support filtering describe_dhcp_options
add get_all_dhcp_options
2015-11-25 11:50:58 +02:00
earthmant
18fe3e41e9 Support default ACL in a VPC
a vpc usually has a default acl
this makes sure that moto flags it
and that the describe response has it in there
2015-11-23 18:07:51 +02:00
earthmant
4b59c6b907 Support Associate Network ACL
add the new_association_id property to NetworkACL object so that the template render for replace adds the ID and the associate_network_acl receives a response
2015-11-23 15:16:46 +02:00
Steve Pulec
cddf139bbc Add ability to create EBS volumes from snapshots. Closes #447. 2015-11-03 09:37:02 -05:00
Steve Pulec
d3e4c2c4b5 Add ability for specific backends to enable template escaping. Closes #441. 2015-11-03 09:25:47 -05:00
Steve Pulec
73452c79f7 Add milliseconds to EC2 launch time. Closes #445. 2015-11-02 23:33:39 -05:00
Steve Pulec
1d58aae42a Merge pull request #438 from ZuluPro/instancetypes
Added describe instance types
2015-11-01 14:30:32 -05:00
Enis Afgan
e07894c6e4 When adding security group rules, allow a source group only to be specified - as per boto docs & functionality 2015-10-29 07:27:35 +01:00
nuwan_ag
0b3ad166c0 Set snapshots to be in a completed state after being created and added
test case
2015-10-14 02:34:36 +11:00
Steve Pulec
37f86626cc Merge pull request #425 from ZuluPro/random_key_pair
Remade ec2.utils.random_key_pair for be really random
2015-10-05 18:25:17 -04:00
ZuluPro
b85b415977 Implemented import key pair 2015-09-24 17:34:08 +02:00
Anthony Monthe
0999a49b5b Added describe instance types 2015-09-23 14:50:47 +02:00
ZuluPro
23c2e7835e Remade ec2.utils.random_key_pair for be really random 2015-09-15 20:09:35 -04:00
Steve Pulec
92c96b6788 Fix bug in creating SecurityGroups for nics. Closes #391. 2015-08-03 20:56:05 -04:00
Steve Pulec
ac4aef87a1 Unused exception. 2015-08-01 19:44:37 -04:00
Rob Walker
e33777b60c tidy up imports. 2015-07-26 09:51:37 +10:00
Rob Walker
2bb79824ce Volume attachments to show in instance.
Volumes and Snapshots to be searchable by their id
Placement of instance to match region connection
Times for creation and attachment to show based on api call
2015-07-26 09:37:20 +10:00
Steve Pulec
4020141478 Fix cloudformation subnet tagging. 2015-07-13 19:27:00 -04:00
Steve Pulec
20306c9b24 Set more default datetimes. 2015-06-22 17:02:10 -04:00
Steve Pulec
640cd2ce44 Better EC2 NIC Attachment datetimes. 2015-06-22 16:52:12 -04:00
Jeffrey Gelens
e722b67f36 Merge branch 'master' of https://github.com/spulec/moto into 0.4.1-threadsafe
* 'master' of https://github.com/spulec/moto: (25 commits)
  Add @zkourouma to authors.
  0.4.2
  Fix bug where listener certificate was not being saved correctly when creating an elb. Added test to cover that case.
  [dynamodb2] adds lookup method to Table class
  Add IAM list_groups and list_groups_for_user. Closes #343.
  Fix for deleting Route53 record sets with set identifiers. Closes #342.
  Use dummy date instead of an invalid date
  Adding support for comments on hosted zones.
  Add availability zone support to Subnets created via CloudFormation
  Make availability zone dynamic in Subnet Response templates
  Add filter "availabilityZone" to DescribeSubnets and add availability zone support too
  allow starting without reseting
  Fix bug with empty string for instance vpc_id. Closes #337.
  Fix default security group description.
  Update responses.py
  Add @mrucci to authors.
  Fix merge conflicts.
  Add support for ELB attributes.
  cast to int when doing math.
  General cleanup.
  ...
2015-05-29 11:35:14 +02:00
Jeffrey Gelens
f5c4ac0b44 Merge branch 'master' of https://github.com/silveregg/moto into 0.4.1-threadsafe
* 'master' of https://github.com/silveregg/moto: (22 commits)
  filtering the items is needed because of defaultdict is not threadsafe and returns an empty dict which results in an exception here
  add tests for list_endpoints_by_platform_application
  add mock for list_endpoints_by_platform_application method
  [S3]Only add multipart part_id to partlist if it is not already in there. Closes #324.
  Fix etag for reduced min part size.
  Add test_multipart_duplicate_upload
  Fix reduced_min_part_size so that tests run
  Fix authors
  Add @mikegrima to authors
  Fixed how parameters are passed in following clarification on GitHub comments.
  Added in test for the boto IAM method: list_instance_profiles_for_role()
  Change SecurityGroupBackend.{authorize,revoke}_security_group_ingress() methods to receive group name or id, never both
  Add support to AWS::EC2::SecurityGroupIngress creation
  Add @aaltepet to authors.
  Add publish command.
  Add support to tag filtering to Security Groups
  slight change in formatting
  fix test for ec2 instance type filter
  Update minimum support boto version.
  support 'instance_type' filter
  ...
2015-05-29 11:34:23 +02:00
Francisco De Freitas
e320190b42 Use dummy date instead of an invalid date 2015-04-28 13:39:48 +02:00
Hugo Lopes Tavares
5160fac9b7 Add availability zone support to Subnets created via CloudFormation 2015-04-08 16:48:02 -04:00
Hugo Lopes Tavares
65d51a5844 Make availability zone dynamic in Subnet Response templates 2015-04-08 16:47:43 -04:00
Hugo Lopes Tavares
56cb06041c Add filter "availabilityZone" to DescribeSubnets and add availability zone support too 2015-04-08 15:07:29 -04:00
Steve Pulec
82214d2bc2 Fix bug with empty string for instance vpc_id. Closes #337. 2015-03-28 14:30:30 -04:00
Steve Pulec
bdfbdd8b1c Fix default security group description. 2015-03-28 14:13:28 -04:00
Jeffrey Gelens
c2f2c16892 Fixed non threadsafe code 2015-03-16 13:13:40 +01:00
Steve Pulec
c0d19ab178 General cleanup. 2015-03-14 18:55:44 -04:00
Steve Pulec
6c9bba2ca1 Cleanup EC2 classic default security group. 2015-03-14 18:50:41 -04:00
Hugo Lopes Tavares
4beda26007 Change SecurityGroupBackend.{authorize,revoke}_security_group_ingress() methods to receive group name or id, never both 2015-02-25 18:11:00 -05:00
Hugo Lopes Tavares
dc351dfc9e Add support to AWS::EC2::SecurityGroupIngress creation 2015-02-25 12:20:25 -05:00
Steve Pulec
c0e80de4d3 Merge pull request #317 from spulec/ec2-security-group-tag-filtering
Add support to tag filtering to Security Groups
2015-02-24 18:00:51 -05:00
Hugo Lopes Tavares
20d8318997 Add support to tag filtering to Security Groups 2015-02-24 17:56:26 -05:00
Andy Altepeter
e17c7bbd7a support 'instance_type' filter 2015-02-23 11:03:59 -06:00
Andy Altepeter
53ec30e3ba support 'tag-key' instance type 2015-02-23 10:45:16 -06:00
Steve Pulec
747563e4ff Cleanup tag escape testing. 2015-02-17 22:18:40 -05:00
Dennis Brandenburg
3bd1a62fe3 Escaping tags individually for building the describe_tags template to support get_all_tags 2015-02-17 10:23:15 +01:00
Steve Pulec
136873d49e Cleanup public IPs for EC2 classic instances and fix some default ENI things. 2015-02-14 14:42:20 -05:00
Steve Pulec
5ededbb297 Fix security group tags. Closes #301. 2015-02-14 08:57:14 -05:00
Steve Pulec
4d4cb39769 Merge pull request #297 from kouk/multipart_errors
Support for client supplied part order in multipart uploads
2015-02-14 08:30:10 -05:00
Hugo Lopes Tavares
1546635fcd Attach internet gateway to VPC when it is created through CloudFormation 2015-02-11 18:19:40 -05:00
Konstantinos Koukopoulos
7c719269be create a base RESTError exception 2015-02-10 15:31:28 +02:00
dreadpirateshawn
d631f869c1 ModifyImageAttribute: Added support for user permissions. 2015-01-23 09:43:54 -08:00
Steve Pulec
dd5cab8c63 Return random IP addresses for instances. 2015-01-21 21:58:38 -05:00
Steve Pulec
b1c41820f7 Cleanup EC2 launch time code a bit. 2015-01-19 13:44:15 -05:00
Chris Henry
6743a41b26 Fix merge conflict, 2015-01-18 16:37:56 -05:00
Chris Henry
1f2a913d3a Merge branch 'master' of github.com:behanceops/moto into feature-instance-launch-time
Conflicts:
	moto/ec2/models.py
2015-01-18 16:37:27 -05:00
Chris Henry
19a1b74c5b Change timestamp format to ISO 8601, as per http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html 2015-01-18 16:20:59 -05:00
Chris Henry
77185f9bee Change timestamp format to ISO 8601, as per http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html 2015-01-18 16:18:34 -05:00
Chris Henry
062256ada3 Use the current time when launching an instance. 2015-01-18 15:53:59 -05:00
Steve Pulec
adb26986eb Add route53 ResourceSet to Cloudformation. 2015-01-17 15:37:46 -05:00
Steve Pulec
166f4893ba Add cloudformation for RDS. 2015-01-11 16:15:08 -05:00
Steve Pulec
56007660d8 Cleanup parameter parsing. 2014-12-31 13:23:08 -05:00
dreadpirateshawn
7ce83082ca Merge remote-tracking branch 'origin/master' into ImproveTemplatePerformance
Conflicts:
	moto/s3/responses.py
2014-12-12 12:51:29 -08:00
dreadpirateshawn
9affa7753d Performance: Leverage jinja2's Environment to cache compiled Templates. 2014-12-12 12:46:07 -08:00
Steve Pulec
845c468f32 Merge pull request #278 from cameron-r/master
Add filtering of instances by security group id
2014-12-10 20:11:25 -05:00
Cameron Rowshanbin
573a73aa01 With @ethome, add filtering of instances by security group id 2014-12-10 11:53:40 -06:00
Tyler Sanders
b513d69313 Add support for route table routes to target virtual private gateways. 2014-12-09 12:07:14 -06:00
Tyler Sanders
db7757347a Detach virtual private gateway support 2014-12-02 10:40:05 -06:00
Tyler Sanders
166fd69515 Virtual Private Gateway functionality 2014-12-02 10:28:09 -06:00
Tyler Sanders
7476c63119 Update upstream branch 'master' into instance_modify_security_groups 2014-11-27 11:14:46 -06:00
Tyler Sanders
9cbe8d57f4 Support instance security group/groupSet attribute modification and description 2014-11-27 11:05:39 -06:00
Kyohei Akiyama
1a61b973e4 The filter condition was added to VPC and RouteTable class. 2014-11-27 03:54:42 +00:00
Steve Pulec
ef3e5448ea Add cluster subnet group CRUD. 2014-11-23 21:36:19 -05:00
Tyler Sanders
1fc32fa5cb Add support for Route Table tagging 2014-11-20 14:08:38 -06:00
Tyler Sanders
d511fd829b Add support for Network ACL tagging 2014-11-20 12:04:34 -06:00
Steve Pulec
8954242086 Better is_public support for AMIs including filtering. Closes #263. 2014-11-19 20:09:46 -05:00
Tyler Sanders
2a6c4c89bf Fix conflict with subnet/network ACL association during subnet creation. 2014-11-17 09:37:38 -06:00
Tyler Sanders
d89dce2583 Use items() instead of iteritems() for Python 3 compatibility 2014-11-17 08:54:06 -06:00
Steve Pulec
1f8253a1a1 Cleanup the default region backends. 2014-11-15 14:21:58 -05:00
Steve Pulec
bd847bd941 Cleanup multi-region support for ELB, SQS, Cloudformation, EC2, Autoscaling. 2014-11-15 13:34:52 -05:00
Steve Pulec
c77207a8b8 More flake8. 2014-11-15 09:53:45 -05:00