Commit Graph

403 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Konstantinos Koukopoulos
fa8485b599 provide SpotRequestBackend with model accessor 2014-06-18 10:46:58 +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
Steve Pulec
955b4c6c4a Add tagging to all applicable EC2 objects. Closes #66. 2014-05-11 19:00:28 -04:00
Steve Pulec
06481ebe7e Require a GroupDescription for security group creation. Closes #112. 2014-05-11 17:37:00 -04:00
Chris St. Pierre
fab37942c4 Consistent _get_multi_param() function in responses
This abstracts _get_multi_param() into BaseResponse and makes it
always ensure that the string it has been given ends with a '.'.  It
had been implemented in three different places, and in use it rarely
postpended a trailing period, which could make it match parameters it
shouldn't have.
2014-05-08 10:44:41 -04:00
Chris St. Pierre
745368242e Allow passing security groups by ID when creating instances 2014-05-07 10:04:07 -04:00
Chris St. Pierre
b244457c4f Added key_name support to instances 2014-05-07 10:04:07 -04:00
Chris St. Pierre
4ba4dd5e26 Added subnet_id support to instances 2014-05-07 10:04:07 -04:00
Chris St. Pierre
5ba2b3cb9a Added instance_type support to instances 2014-05-07 10:04:07 -04:00
Ilya Sukhanov
15b750a277 Implement ec2 dhcp_options 2014-04-22 17:47:40 -04:00
Steve Pulec
815bb8846c Change subnets to only have a reference to the vpc_id. 2014-03-28 16:37:55 -04:00
Steve Pulec
1c10d887c0 Fix bug with Gateway Id not being required for Routes 2014-03-28 16:17:43 -04:00
Steve Pulec
ef876dd27e Fix merge conflicts. Add basic cloudformation support. Closes #111. 2014-03-27 19:12:53 -04:00
Steve Pulec
140f1c2000 Add ability to launch instances with security groups. 2014-03-22 14:02:47 -04:00
Jon Haddad
77ab6d2022 removed unnecessary itertools chain.
added success test case around authorize & revoke
2014-03-21 13:31:00 -07:00
Jon Haddad
ecaf53fd28 fix for VPC revoking of rules related to groups 2014-03-20 17:53:39 -07:00
Jon Haddad
2b4fe552d1 VPC support for adding rules improving 2014-03-20 17:52:49 -07:00
Jon Haddad
cbdc8ba183 We're getting back the correct group from get_security_group_from_id,
but hitting another issue with the source_group_name also using an id
rather than a name
2014-03-20 17:26:08 -07:00
Konstantinos Koukopoulos
8db4097861 raise NotImplementedError when Filters are used in describe_key_pairs 2014-02-24 16:35:03 +02:00
Konstantinos Koukopoulos
e19967b7d5 support names in DescribeKeyPairs 2014-02-24 15:22:08 +02:00
Konstantinos Koukopoulos
72ae98128c really delete key pair 2014-02-24 13:38:46 +02:00
Konstantinos Koukopoulos
e7d2c2687a implement delete_key_pair, test zero case 2014-02-24 13:34:39 +02:00
Konstantinos Koukopoulos
99c6b8acbe test DescribeKeyPairs with more than one key pair 2014-02-24 13:20:47 +02:00
Konstantinos Koukopoulos
35063ca743 make duplicate key pair test pass 2014-02-24 13:13:23 +02:00
Konstantinos Koukopoulos
ddfe478479 implement test for create_key_pair 2014-02-24 13:03:26 +02:00
Konstantinos Koukopoulos
65beb30054 create KeyPairBackend in ec2 model, use in keypair test 2014-02-24 12:42:50 +02:00
Konstantinos Koukopoulos
d438b05d41 return empty key pairs response 2014-02-24 12:18:52 +02:00
sgarcialaguna
e1366165d1 Fixed typo in REQUEST_POST_INSTANCES_TEMPLATE 2014-01-29 19:41:47 +01:00
Hugo Lopes Tavares
4e88d79da2 Refactor AmiBackend.describe_images: make logic of missing image simpler 2014-01-28 18:53:12 -05:00
Hugo Lopes Tavares
90aa87d53e Fix DescribeImages to throw error if AMI requested does not exist 2014-01-28 18:15:29 -05:00
Steve Pulec
262b698149 Fix for security groups with other security source groups. Closes #80. 2014-01-19 06:54:25 -05:00
Steve Pulec
c1f224954e Cleanup some style 2013-12-29 08:59:07 -05:00
Steve Pulec
74e2c19865 Cleanup unused imports 2013-12-29 08:40:38 -05:00
Steve Pulec
f3890ffc31 Fix for EC2Response MRO 2013-12-29 08:34:07 -05:00
Steve Pulec
ec938ef904 Convert all EC2Response Mixins to subclasses. 2013-12-29 08:25:13 -05:00
Jon Haddad
48ee4b600b updated SC methods to work with a group_id, which must be used if it's a group in a VPC 2013-12-06 14:34:13 -08:00
Jon Haddad
0e316d8fc3 fixed spot instances creation 2013-12-05 16:45:18 -08:00
Jon Haddad
0712d40f71 added vpc_id to deletion 2013-12-05 16:39:25 -08:00
Jon Haddad
c2dad5357f correctly passing vpc_id through to revoke 2013-11-01 12:56:53 -07:00
Jon Haddad
9cbac9bbf4 reworked internals, groups is now a dict of dicts. need to fix errors coming back from revoking and deleting groups 2013-10-30 20:11:15 -07:00
Jon Haddad
6ad8e109e4 more concise jinja 2013-10-30 18:59:21 -07:00
Jon Haddad
9ae144bad8 correctly getting the vpc address back 2013-10-30 18:50:42 -07:00
Ilya Sukhanov
f8f8d25426 Implement Elastic IP 2013-10-08 22:30:21 -04:00
Ilya Sukhanov
a63601e481 Implement ImageId parameter in DescribeImages 2013-10-08 22:30:21 -04:00
Ilya Sukhanov
b5a454e0da When manipulating instance save end states instead of transitional
When starting an instance it should eventually enter running state. At
least in the normal case. So we report pending but save running, this
way when client requests state of instance a second time, we reply with
running.

Similar thing for stop/terminate/reboot.
2013-10-08 22:30:21 -04:00
Steve Pulec
3bddbb4af3 Test out py26 with new HTTPretty 2013-10-03 20:34:13 -04:00
Steve Pulec
a0e2cb3d98 Add EC2 spot instances 2013-08-17 18:11:29 -04:00
Steve Pulec
421a5e60af Fix EC2 response tags. Closes #37. 2013-07-17 12:48:21 -04:00
Steve Pulec
af31744dbd If ec2 filtering exclude all instances for a reservation, remove the reservation from the results. 2013-07-08 22:25:25 -04:00
Steve Pulec
46f9430bdd Fix bug with modifying original reservations 2013-07-08 22:20:55 -04:00
Steve Pulec
257ca9f771 Add ec2 filtering by instance state 2013-07-08 21:18:05 -04:00
Steve Pulec
76ea9172da Clean up ec2 instance state 2013-07-08 20:29:13 -04:00
Steve Pulec
fda5f83f87 Properly implement ec2.get_all_instances filtering by instance id 2013-07-08 19:25:47 -04:00
Steve Pulec
9f19662d1c allow passing user data to run_instances 2013-05-17 19:35:53 -04:00
Steve Pulec
47bd4c49a3 attempting to move to upstream httpretty 2013-05-03 19:33:13 -04:00
Steve Pulec
8fe0c91853 Fix services to work better with other regions. Closes #17. 2013-04-13 18:22:26 -04:00
Steve Pulec
cd518d060e move to httpretty fork instead of bundling it. 2013-03-17 18:13:21 -04:00
Steve Pulec
2d98a9caef some more tests to bump coverage 2013-03-11 00:12:22 -04:00
Steve Pulec
316418df55 add subnets 2013-03-05 22:53:53 -05:00
Steve Pulec
584f1f01b6 add vpc commands 2013-03-05 22:33:41 -05:00
Steve Pulec
0d51349662 add get_console_output 2013-03-05 22:11:58 -05:00
Steve Pulec
e993917d4c pep8 2013-03-05 08:35:18 -05:00
Steve Pulec
a728b2581a Adding server mode 2013-03-05 08:14:43 -05:00
Steve Pulec
98fc1eeab9 update ec2 calls for boto 2.5 compat 2013-02-28 00:08:35 -05:00
Steve Pulec
459697508e remove extra newline 2013-02-27 01:20:10 -05:00
Steve Pulec
51c5f66aac change all mocking to include http and https 2013-02-27 01:15:26 -05:00
Steve Pulec
d32059f301 pep8 2013-02-26 00:31:01 -05:00
Steve Pulec
935e6bd95d fix tag deletion 2013-02-25 23:37:01 -05:00
Steve Pulec
1b3eca72b0 clean up old ec2 code 2013-02-25 23:09:45 -05:00
Steve Pulec
89364ed864 Adding sqs queue creation 2013-02-23 22:26:46 -05:00
Steve Pulec
e261b82f29 add most of the snapshot implementation 2013-02-23 18:01:41 -05:00
Steve Pulec
f92a3ec00f volume attaching and detaching working 2013-02-23 17:37:55 -05:00
Steve Pulec
7464fcbbe9 clean up ec2 response init 2013-02-23 16:35:25 -05:00
Steve Pulec
0927e107fb when things arent implemented yet raise exception, not pdb 2013-02-23 16:32:40 -05:00
Steve Pulec
1c8af2881a add security group ingress rules 2013-02-23 16:27:43 -05:00
Steve Pulec
31f992fbe5 add, delete, describe security groups 2013-02-23 15:26:54 -05:00
Steve Pulec
fbd9206f23 add basic zone and region endpoints 2013-02-23 14:51:19 -05:00
Steve Pulec
351aca3c68 clean up instance attribute modification and add base AMI stuff 2013-02-23 14:22:09 -05:00
Steve Pulec
0bd4d57ef2 raise NotImplementedError if not implemented 2013-02-22 07:55:48 -05:00
Steve Pulec
27a086409e adding ec2 stubs 2013-02-21 23:13:01 -05:00
Steve Pulec
0df2864f99 convert ugly camelcase methods to nice, clean underscores 2013-02-21 19:34:57 -05:00
Steve Pulec
f824110ceb add ec2 tags 2013-02-20 23:19:43 -05:00
Steve Pulec
568d99dd42 refactor ec2 response structure 2013-02-20 22:21:55 -05:00
Steve Pulec
1d42cc3f53 add instance rebooting 2013-02-19 23:55:01 -05:00
Steve Pulec
1af038290d add instance attribute description and modification 2013-02-19 23:01:19 -05:00
Steve Pulec
7907585b65 make instance id parsing more generic 2013-02-18 23:06:23 -05:00
Steve Pulec
3a9c757e46 add instance stop/start 2013-02-18 21:56:22 -05:00
Steve Pulec
4283cca63c clean up urls. start to clean up responses 2013-02-18 21:22:03 -05:00
Steve Pulec
f8633cbab7 rename backends 2013-02-18 16:31:42 -05:00
Steve Pulec
d1bb638ec7 remove .pyc 2013-02-18 16:28:08 -05:00
Steve Pulec
77d6df6531 basic ec2 and s3 working 2013-02-18 16:09:40 -05:00