Commit Graph

506 Commits

Author SHA1 Message Date
Steve Pulec
d77bc3ed39 Merge pull request #243 from djmitche/regionalize_instances
Pass ec2_backend to Instance constructor
2014-10-23 23:02:15 -04:00
Dustin J. Mitchell
66c8fb2b52 Pass ec2_backend to Instance constructor
This value is used to look up things like nics and subnets in that
backend.
2014-10-23 22:44:42 -04:00
Dustin J. Mitchell
465629902c use the current ec2 backend, not the default, for subnets 2014-10-23 22:36:05 -04:00
Dustin J. Mitchell
ad200286a5 use the current ec2 backend, not necessarily us-east-1, for vpc operations 2014-10-23 22:26:52 -04:00
Joseph Lawson
0aec1d0f92 create_stack returns stack_id 2014-10-23 14:55:40 -04:00
Joseph Lawson
90191675a2 Deleted Stack Fix and ValidationError for DescribeStacks.
* stop backed from trying to iterate over empty list of deleted stacks.
  * Update DescribeStacks to throw ValidationError if stack name or id doesn't exist.
2014-10-23 14:39:15 -04:00
Joseph Lawson
94e969fed5 Enhance DescribeStacks. Keep track of deleted stacks. Stack status.
Made describe_stacks more in line with http://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_DescribeStackResource.html
2014-10-22 23:58:42 -04:00
Steve Pulec
ef3fcecc87 Merge pull request #238 from DreadPirateShawn/ModifyInstanceAttributeSourceDestCheck
ModifyInstanceAttribute: Added support for 'SourceDestCheck.Value'.
2014-10-22 20:25:09 -04:00
dreadpirateshawn
4f847cfb4b ModifyInstanceAttribute: Added support for 'SourceDestCheck.Value'. 2014-10-22 15:11:37 -07:00
Joseph Lawson
ff27ef9e91 XML escape body of sqs message body prior to encoding to XML 2014-10-22 16:05:26 -04:00
Steve Pulec
c02ed667d5 Merge pull request #235 from joekiller/enhance/cloudformation_getatt_tags_and_resource_naming
Enhance/cloudformation getatt tags and resource naming
2014-10-21 22:37:01 -04:00
Steve Pulec
bcef13700d Merge pull request #234 from DataDog/add_instance_reason
EC2: Add instance state reason
2014-10-21 22:11:23 -04:00
Joseph Lawson
184d5be54a remove debug exception catch 2014-10-21 21:58:39 -04:00
Steve Pulec
9559c6f746 Merge pull request #230 from joekiller/fix_unsupported_metadata
raise NotImplementedError on unknown metadata path
2014-10-21 19:02:41 -04:00
Joseph Lawson
d4cbc71b0a fix eip physical_resource_id not returning an public_ip if it is in EC2 classic. 2014-10-21 16:37:54 -04:00
Joseph Lawson
54794651d3 implement Fn::Join 2014-10-21 16:29:51 -04:00
Joseph Lawson
d55a0b6ef0 default eip domain to 'standard' for cloudformation creations 2014-10-21 15:59:28 -04:00
Joseph Lawson
a8b967eab0 eip resources have no required properties. 2014-10-21 15:53:38 -04:00
Joseph Lawson
20a69255c3 tweak Fn::GetAtt to return resource_json if resource is not implemented. DRY
This is better than failing out with a misleading Boto 400 error which should only happen when get_cfn_attribute is called but fails.
2014-10-21 14:51:26 -04:00
Joseph Lawson
1d9ffafaa5 create CloudFormation outputs and enable 'Fn::GetAtt' to work. 2014-10-21 12:45:03 -04:00
Arthur Wang
c0049578cb Test filtering get_instances by reason code 2014-10-20 21:00:33 +00:00
Arthur Wang
6963866c7e Add ec2 instance state reason
- Add instance.reason and instance.state_reason
(http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-Item
Type-StateReasonType.html)
- Add ec2 filtering by state-reason-code and state-reason-message
2014-10-20 19:56:34 +00:00
Joseph Lawson
832769b8a7 Name resources via CloudFormation naming convention and tag EC2 resources.
* Make sure taggable resources are tagged per convention: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack-parameters.html
  * Update CloudFormation parsing to use logical resource ids and name resources as CloudFomation would.
  * Fix tests for CloudFormation stack integration.
2014-10-20 15:16:39 -04:00
Joseph Lawson
91a74424e5 Handle Name Type resources for CloudFormation 2014-10-20 11:45:47 -04:00
Joseph Lawson
cb88b8783d raise NotImplementedError on unknown metadata path 2014-10-15 13:43:38 -04:00
dreadpirateshawn
89fd71eb16 Route Tables: Added support for associate/disassociate subnets. (fixed idempotency) 2014-10-14 14:23:14 -07:00
dreadpirateshawn
db044df0a9 Route Tables: Added support for associate/disassociate subnets. (added replace route table association) 2014-10-14 11:23:42 -07:00
dreadpirateshawn
5d046c76e5 Route Tables: Added support for associate/disassociate subnets. 2014-10-13 16:19:54 -07:00
Steve Pulec
68d2db55d4 Add VPC state. 2014-10-12 21:51:12 -04:00
Hugo Lopes Tavares
aee47395f7 Implement "name" filter to ec2.models.AMI 2014-10-10 15:14:46 -04:00
Joseph Lawson
b9f747fb4f test ip_ranges when authorizing security group ingress rules 2014-10-06 14:49:37 -04:00
Steve Pulec
b82507e41b Add instance_id to spot instance requests. Closes #210. 2014-10-05 22:55:36 -04:00
Steve Pulec
9de7969d2b Fix merge conflicts. 2014-10-05 21:55:23 -04:00
Steve Pulec
8ab284a9d2 Merge pull request #222 from ralfas/master
Added basic support for SQS MessageAttributes.
2014-10-05 21:10:48 -04:00
Ralfas
76aa9a8b22 Added basic support for SQS MessageAttributes. 2014-10-05 19:10:49 +01:00
Steve Pulec
f0724d458e Merge pull request #216 from DreadPirateShawn/ImplementCopyImage
AMI: Implement copy_image.
2014-10-05 10:55:48 -04:00
dreadpirateshawn
2dfd1799ae AMI: Implement copy_image. (part 4, minor refactor for clarity) 2014-10-01 07:59:02 -07:00
Omer Katz
efa687f41d Added tag filters to some of the entities. 2014-10-01 16:18:46 +03:00
Omer Katz
4ec95bac74 Merge branch 'feature/vpc-filters' 2014-10-01 15:56:23 +03:00
Omer Katz
298cf65569 Added the ability to filter by tag-value and refactored the filters to be generic. 2014-10-01 15:44:54 +03:00
Omer Katz
444ab96b4f Added the ability to filter by tag-key. 2014-10-01 15:33:12 +03:00
Steve Pulec
27ef345b64 Merge pull request #218 from thedrow/feature/vpc-filters
Added the cider block, dhcp options id and tag filter to the VPC backend
2014-10-01 08:04:12 -04:00
Steve Pulec
b0fd12dc35 Merge pull request #219 from joekiller/ami_filter_state
allow get_filter_value to return state of ami and test
2014-09-30 22:25:34 -04:00
Joseph Lawson
7fca88e732 Test Fixes and tag: filter.
* fixed test_ec2.test_amis.test_ami_filters to test for AMIs in the state of 'available'
  * enhanced AMI's to be able to take `tag:` filter.
  * added tag: tests for AMIs
2014-09-30 16:42:52 -04:00
Joseph Lawson
866d8b4ea8 allow get_filter_value to return state of ami and test
* updated Ami.get_filter_value to return the state value of the AMI
  * updated test_ec2.test_amis.test_ami_filters to test for AMIs in the state of 'available'
2014-09-30 16:12:23 -04:00
Omer Katz
89bd78b927 Added the ability to filter vpcs by tags. 2014-09-30 17:58:02 +03:00
Omer Katz
ecb23485d0 VPCs can now be filtered by cider block and dhcp options id 2014-09-30 17:29:50 +03:00
Omer Katz
a1be4b7f61 VPCs can now be filtered by id. 2014-09-30 17:08:36 +03:00
dreadpirateshawn
1940f7c17a AMI: Implement copy_image. (part 2, tweaked launch_permission_groups init) 2014-09-29 12:18:39 -07:00
dreadpirateshawn
a4fdce2e55 AMI: Implement copy_image. 2014-09-29 12:06:36 -07:00
Omer Katz
a63e6d2459 netbios type should be coerced to integer.
Otherwise the check always fails.
2014-09-29 18:41:50 +03:00
Steve Pulec
2650d9981f Merge pull request #208 from clorenz7/master
Make S3 Model Timestamps Consistent By Using UTC
2014-09-15 20:53:35 -04:00
Cory Lorenz
5320b39912 Make S3 Model Timestamps Consistent By Using UTC
UTC seems to be default timezone for AWS, and the time strings are reporting as GMT, yet the date time is the local time zone.
2014-09-12 15:37:22 -07:00
dreadpirateshawn
04a4ae88bf Network Interfaces: Added attach/detach support. 2014-09-12 10:53:37 -07:00
dreadpirateshawn
f4d2623a4c DescribeInstances: Added block_device_mapping to XML 2014-09-11 11:29:20 -07:00
Steve Pulec
b8afb3be90 Merge pull request #198 from DreadPirateShawn/VPCDefaultSecurityGroup
VPC: Added default security group upon creation.
2014-09-10 20:57:47 -04:00
Steve Pulec
85f9193dc7 Merge pull request #196 from DreadPirateShawn/SecurityGroupsFilteringFix
Security Groups: Fix for filtering support.
2014-09-10 20:55:47 -04:00
Steve Pulec
a703bc0dd9 Merge pull request #200 from DreadPirateShawn/CleanupDuplicateImport
Cleanup: Removed duplicate import.
2014-09-10 20:52:52 -04:00
Shawn Falkner-Horine
c2cd5b346f Routes: Fixed vpc_peering_connection_id in describe route tables. 2014-09-10 12:22:01 -07:00
Shawn Falkner-Horine
de69a58cf8 Cleanup: Removed duplicate import. 2014-09-10 11:43:27 -07:00
Shawn Falkner-Horine
2cf97ef193 VPC: Added default security group upon creation. 2014-09-10 11:15:43 -07:00
Shawn Falkner-Horine
3f266ebc2b Security Groups: Fix for filtering support. 2014-09-10 09:42:38 -07:00
Konstantinos Koukopoulos
0502427ac1 treat request.headers as a more general list of dicts 2014-09-10 17:37:20 +03:00
Steve Pulec
11dbe5c10f Fix for vpc id in eni template. 2014-09-09 21:14:16 -04:00
Steve Pulec
f0a6510ca3 Merge pull request #191 from DreadPirateShawn/ImplementNetworkInterfaces
Network Interfaces: Initial implementation.
2014-09-09 21:12:06 -04:00
Steve Pulec
1bbb7a70ad Merge pull request #188 from DreadPirateShawn/ImplementRouteTables
Route Tables / Routes: Initial implementation.
2014-09-09 20:48:43 -04:00
Steve Pulec
2cbdef663f Merge pull request #186 from bobbyi/spot_instance_tags
Spot instance tags
2014-09-08 23:22:13 -04:00
Steve Pulec
3feaa39bd3 Merge pull request #185 from bobbyi/filter_instances_by_tag
Support filtering instances by tag
2014-09-08 23:19:43 -04:00
Steve Pulec
c1497886f2 Small IAM param parsing cleanup. 2014-09-08 23:11:20 -04:00
Steve Pulec
2f66709583 Merge pull request #184 from invenia/master
Additional IAM endpoints
2014-09-08 23:06:37 -04:00
Steve Pulec
79e31e7287 Fix route53 hosted zone id parsing.
The zone id previously contained hostedzone/<zone_id>
2014-09-08 22:00:55 -04:00
Shawn Falkner-Horine
9296779999 Network Interfaces: Initial implementation. (fixed ElasticAddress cloudformation 'associate_address' call) 2014-09-08 17:02:37 -07:00
Shawn Falkner-Horine
42f8cea5e6 Network Interfaces: Initial implementation. 2014-09-08 16:50:18 -07:00
Shawn Falkner-Horine
8e330f43b2 Route Tables / Routes: Initial implementation. (Fixed iteritems reference.) 2014-09-05 08:48:44 -07:00
Shawn Falkner-Horine
02f1dc0b3e Route Tables / Routes: Initial implementation. (Fixed deletion of main route table via deletion of VPC.) 2014-09-05 08:45:36 -07:00
Shawn Falkner-Horine
534039f465 Route Tables / Routes: Initial implementation. (Fixed modification of dict while looping said dict.) 2014-09-04 17:07:00 -07:00
Shawn Falkner-Horine
22e6166e4e Route Tables / Routes: Initial implementation. 2014-09-04 16:23:59 -07:00
Bobby Impollonia
8ac549569e Add support for filtering spot instance requests 2014-09-04 12:39:14 -07:00
Bobby Impollonia
f029fe672d Add support for getting spot instance request tags 2014-09-04 12:38:09 -07:00
Rory-Finnegan
f1227e396a Fixed stupid "random_alphanumeric" typo that got repeated due to tab completion. 2014-09-04 10:34:01 -04:00
Bobby Impollonia
4403ea955f Support filtering instances by tag 2014-09-04 07:30:19 -07:00
Rory-Finnegan
c2dd4a7ee4 Fixed py33 errors. 2014-09-03 19:52:23 -04:00
Rory-Finnegan
bf996f1461 Fixed py26 errors related to using assert_raises in tests. 2014-09-03 19:24:05 -04:00
Rory-Finnegan
665beda466 Added support to get_all_security_groups endpoint to actually filter groups.
- Filters by groupnames, group_ids and a filters. However, the filters option doesn't
   support owner-id and tags since neither attribute was readily available via the SecurityGroup object.

 - Also included a basic test to confirm it works.
2014-09-03 16:57:51 -04:00
Rory-Finnegan
a3b02f3f8b Added get_user and delete_access_key endpoints. 2014-09-03 16:57:51 -04:00
Rory-Finnegan
ac74af4085 Added several new endpoints for accessing iam groups and users,
include unit tests.
2014-09-03 16:57:03 -04:00
Steve Pulec
22d9141122 Cleanup route53 local variable names. 2014-08-29 21:14:24 -04:00
Steve Pulec
c6cb503b61 Make _get_multi_param smarter. 2014-08-29 20:31:02 -04:00
Steve Pulec
ae2898b382 Merge pull request #181 from ghalib/create-existing-queue-noop
Creating a queue with existing name is now a no-op
2014-08-29 19:50:21 -04:00
Ghalib Suleiman
18bad6994d Creating a queue with existing name is now a no-op
This is more in line with Amazon's CreateQueue API
(http://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_CreateQueue.html).

Previously, calling create_queue with a name that already existed
would cause moto to overwrite the existing queue with a new empty one.
2014-08-29 15:13:59 -06:00
David Baumgold
eedb4c4b73 Support Python 3 using six 2014-08-28 10:57:43 -04:00
Steve Pulec
cfda83dcba Merge pull request #180 from DreadPirateShawn/AMIsModifyAndDescribe
AMIs: Added ModifyImageAttribute and DescribeImages filtering.
2014-08-27 21:28:15 -04:00
Steve Pulec
ca13c141d3 Merge pull request #176 from singingwolfboy/unicode_literals
Unicode literals
2014-08-27 21:19:50 -04:00
Shawn Falkner-Horine
f9246def75 AMIs: Added ModifyImageAttribute and DescribeImages filtering. 2014-08-27 11:53:44 -07:00
Shawn Falkner-Horine
acaad7026b Remove VIM swap files. 2014-08-27 08:59:51 -07:00
David Baumgold
4201e6b430 from __future__ import unicode_literals 2014-08-27 11:33:55 -04:00
Steve Pulec
b69179818c Merge pull request #175 from DreadPirateShawn/SnapshotAttributes
Implementation for ModifySnapshotAttribute and DescribeSnapshotAttribute.
2014-08-26 20:53:46 -04:00
Steve Pulec
8f79d71f3f Merge pull request #172 from DreadPirateShawn/CreateSubnetVPCValidation
Create subnet vpc validation
2014-08-26 20:36:26 -04:00
Steve Pulec
1846f28b41 Merge pull request #170 from DreadPirateShawn/DescribeSubnetsFiltering
DescribeSubnets: Added support for 'filters' parameter.
2014-08-26 20:35:19 -04:00
Hugo Lopes Tavares
bce64599f7 Get region names in a backward compatible way 2014-08-26 18:21:26 -04:00
Shawn Falkner-Horine
ebc0037659 Implementation for ModifySnapshotAttribute and DescribeSnapshotAttribute. 2014-08-26 15:16:58 -07:00
Hugo Lopes Tavares
7e69c69ae0 Add multi-region support to Autoscaling 2014-08-26 17:56:56 -04:00
Hugo Lopes Tavares
82eef28937 Add multi-region support to EC2 Instances 2014-08-26 17:56:56 -04:00
Shawn Falkner-Horine
0ecae450a1 CreateSubnet: Added VPC ID validation. 2014-08-26 14:04:34 -07:00
Shawn Falkner-Horine
c89e7c6de1 DescribeSubnets: Added support for 'filters' parameter. (fixed NotImplemented error message) 2014-08-26 13:31:08 -07:00
Shawn Falkner-Horine
d683c3b291 DescribeSubnets: Added support for 'filters' parameter. 2014-08-26 13:25:37 -07:00
Shawn Falkner-Horine
d160f2c6d6 Error handling: Model-level validations, proper error responses. (removed deprecated error template) 2014-08-25 14:02:02 -07:00
Shawn Falkner-Horine
9938995e05 Error handling: Model-level validations, proper error responses. (added coverage for new instance status call) 2014-08-25 14:00:35 -07:00
Shawn Falkner-Horine
5c46898b17 Merge remote-tracking branch 'upstream/master'
Conflicts:
	moto/ec2/responses/instances.py
2014-08-25 13:43:23 -07:00
Shawn Falkner-Horine
071c03e216 Error handling: Model-level validations, proper error responses. 2014-08-25 10:54:47 -07:00
Andres Riancho
c65ff170b2 Fix NotImplementedError: The describe_instance_status action has not been implemented #163 2014-08-20 14:52:23 -03:00
Andres Riancho
4b1b0f8514 Minor refactoring to avoid code duplication 2014-08-20 14:51:24 -03:00
Steve Pulec
195505948b Merge pull request #162 from andresriancho/master
Fix block device mapping #160
2014-08-20 07:39:24 -04:00
Steve Pulec
9d06ccf0cd Merge pull request #156 from DreadPirateShawn/VPCPeeringConnections
Add support for VPCPeeringConnections.
2014-08-20 07:38:28 -04:00
Andres Riancho
9c1032da58 Fix #160, implemented blockDeviceMapping modify_attribute set 2014-08-20 08:20:08 -03:00
Steve Pulec
64ed605c14 Ignore S3 ACL for now since we do not implement it. 2014-08-13 22:13:23 -04:00
Ghalib Suleiman
f4a2f1a51f Turn on threading for Werkzeug's run_simple()
This is now default behavior. Without this, moto is unable to deal
with simultaneous requests.
2014-08-12 15:07:29 -07:00
Steve Pulec
d2fc7bb7f9 Merge pull request #139 from kouk/backendaccess
general support for access to backend models
2014-08-02 10:43:35 -04:00
Shawn Falkner-Horine
42a305239c Add support for VPCPeeringConnections. 2014-07-31 14:41:30 -07:00
Colin Johnson
853d6768ce moto-152 - return vpc.id if exists else return nothing 2014-07-25 05:16:53 +00:00
Steve Pulec
4b5b072b27 Merge pull request #150 from kevgliss/enhanced_ssl_support
Enhanced ssl support
2014-07-18 20:55:02 -04:00
Kevin Glisson
fc30f5ba1f adding tests 2014-07-18 17:31:57 -07:00
Kevin Glisson
c8d8f00241 adding ability to delete elb listeners 2014-07-18 16:06:37 -07:00
Steve Pulec
3a063862a7 Merge pull request #148 from mrucci/fix-describe-asg
Fix retrieval of autoscaling group instances.
2014-07-14 20:37:26 -04:00
Marco Rucci
ada20cea61 Fix retrieval of autoscaling group instances. 2014-07-13 20:47:35 +02:00
Marco Rucci
9f092e6192 Route 53 GET request honors the Name parameter.
Now record sets can be retrieved by name via get_all_rrsets.
2014-07-13 19:48:20 +02:00
Steve Pulec
5e35348c0d Cleanup S3 model methods to better deal with missing buckets. 2014-07-08 21:20:29 -04:00
Steve Pulec
be25a2ba99 Fix S3 to work with other regions. 2014-07-08 20:35:48 -04:00
Steve Pulec
dc11f71ff0 Add NextToken element to appropriate SNS responses. cc #144 2014-07-01 21:14:28 -04:00
Richard Eames
4cc45c3ac5 Implementation of bucket.list_versions 2014-06-27 16:21:32 -06:00
Richard Eames
e972000bb4 Keep track of previous versions of keys 2014-06-27 15:37:51 -06:00
Richard Eames
5409d99ca2 Added basic implementation of key/bucket versioning 2014-06-27 11:34:00 -06:00
Clint Ecker
ca6a9bad4f use proper message encoding 2014-06-23 13:53:46 -05:00
Clint Ecker
a9ef2eaaf4 typos 2014-06-22 13:34:32 -05:00
Clint Ecker
67933574b9 Formatting indices for python2.6 2014-06-22 13:33:49 -05:00
Clint Ecker
0d2991d733 forgot to add new exceptions file 2014-06-20 16:31:19 -05:00
Clint Ecker
049b73485f test changing visibility improperly 2014-06-20 16:29:40 -05:00
Clint Ecker
cb52ad6da3 get total seconds that works in >2.3 2014-06-20 16:14:22 -05:00
Clint Ecker
c18e0cc82e Enhanced SQS support
- Support for delaying messages
- Support for visibility timeouts
- Support for actually deleting messages
- Support for message bodies longer than 27 characters
- Support for message attributes
- Support for accurate queue attributes

Caveats:

- All message attributes are returned regardless of whether or not
attributes were requested when reading messages
- I’m not sure why messages longer than 27 characters were breaking in
my tests. Boto seems to expect the body to be base64 encoded and bodies
less than 27 characters would be fine, but if I attempted to use a
larger body it would mangle the content. I now base64 encode the body
if the raw string is longer than 27 characters and all is fine.
2014-06-20 15:00:36 -05:00
Konstantinos Koukopoulos
fa8485b599 provide SpotRequestBackend with model accessor 2014-06-18 10:46:58 +03:00
Konstantinos Koukopoulos
76a6a86eac add Model metaclass to collect model accessor methods from backend classes 2014-06-18 10:46:20 +03:00
Steve Pulec
aec7d8e998 Merge pull request #138 from IlyaSukhanov/master
Implement internet gateway mocking
2014-06-17 22:28:16 -04:00
Konstantinos Koukopoulos
60bba47624 switch to using boto's SpotInstanceRequest in backend 2014-06-17 19:04:38 +03:00
Ilya Sukhanov
bcb0e7a3d4 Implement internet gateway mocking 2014-06-08 09:45:18 -04:00
Christian Wittwer
96843fdfe8 Attribute instance-id added to filter dict 2014-06-05 10:52:41 +02:00
Kevin Glisson
d2029c3fa3 adding - get all certificates, get certificate, and upload certificates endpoints 2014-05-29 14:25:26 -07:00
Steve Pulec
0fbe7a3940 Merge pull request #133 from kouk/server_response_headers
don't provide request headers as response headers in server
2014-05-20 08:48:48 -04:00
Konstantinos Koukopoulos
2b186511e8 don't provide request headers as response headers in server 2014-05-20 14:43:57 +03:00
Steve Pulec
e38f7d4662 Fix string formatting for py26 2014-05-11 23:07:05 -04:00
Steve Pulec
216750c05b Add basic SNS support. 2014-05-11 22:56:44 -04:00