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

432 Commits

Author SHA1 Message Date
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
Jon Beilke
a744adbcc5 AWS is case-sensitive when using is-public to filter for AMIs and expects lower-case values 2018-12-06 12:18:59 -06:00
Mark Challoner
6e6f23a1b0
Set deleted status on vpc peer deletion. 2018-11-14 14:48:57 +00:00
Stephan Huber
0ba213ffcc Merge branch 'master' of https://github.com/spulec/moto into spulec-master 2018-10-16 15:29:56 +02:00
Jon Beilke
c1ebec1b35 remove start_time from attrib comparison in test_copy_snapshot() 2018-10-08 10:17:51 -05:00
hans
cedb89dc3b Fix #1830 Add support for cross-region VPC peering 
Add a class level store in models/VPCBackend of ec2
for saving vpcs of all regions info. Any instance can correctly find vpc in another region
when connecting vpc of cross-region or vpc of same region.

Modify vpc_peering_connections in ec2/responses to handle
vpc peering of same region or cross region.

Update vpc_peering_connections response
template content to latest (2016-11-15) .

Add vpc cross region peering successful test case.
Add vpc cross region peering fail test case.

Related: https://github.com/spulec/moto/issues/1830

Reference
CreateVpcPeeringConnection Sample Response
https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateVpcPeeringConnection.html
 2018-09-21 23:29:04 +08:00
Gary Donovan
2e5e7e7f5e Fix typo in test name (#1729) 2018-07-24 23:11:04 +01:00
Steve Pulec
b26d233820
Merge pull request #1565 from spulec/fix-1522 
Fix security group rules for single rule case. Closes #1522.
 2018-06-08 17:58:30 -04:00
Steve Pulec
96aba00242 Add freeze_time for ebs test. 2018-05-30 20:39:37 -04:00
zane
12188733b7 adding Address reallocate capability for EIP 2018-05-10 23:39:19 -07:00
Phil Christensen
ae2650ffc7 copy snapshot unit test 2018-04-15 17:08:54 -04:00
Steve Pulec
af8697c9a7 Fix security group rules for single rule case. Closes #1522. 2018-04-13 15:03:07 -04:00
Tom Elliff
e2af8bc836 Allow tagging snapshots on creation 
Largely copying what was done for volume creation in https://github.com/spulec/moto/pull/1432
 2018-04-04 17:46:51 +01:00
Rob Walker
4b3469292a Enable Extended CIDR Associations on VPC (#1511) 
* Enable Extended CIDR Associations on VPC

* Ooops missed the utils, try to be more flakey?, remove unnecessary part in tests

* try to be even more flakey
 2018-03-21 09:10:38 -07:00
keirbadger
fecdf388c2 Add in filtering of EBS volumes on availability-zone (#1468) 2018-03-21 08:58:32 -07:00
Graham Lyons
5d51329c34 Don't create volumes for AMIs (#1456) 
* Delete the volume used during AMI creation

Creating an AMI doesn't actually result in the creation of an EBS
volume, although the associated snapshot does reference one. To that
end, delete the volume once we've used it.

* Add `owner_id` to `Snapshot`, verify AMI snapshots

The default AMIs which are created by moto have EBS volume mappings
but the snapshots associated with those don't have the correct
owners set.

This adds the owner to the snapshot model and passes it through from
the JSON data.
 2018-03-21 08:55:58 -07:00
Steve Pulec
924c99bcea
Merge pull request #1448 from grahamlyons/fix-ebs-tagging 
Change `'image'` for `'volume'` when getting tags
 2018-03-06 22:16:59 -05:00
Steve Pulec
6826b82cfb
Merge pull request #1455 from grahamlyons/snapshot-search-bug 
Snapshot search bug
 2018-03-06 22:06:33 -05:00
Hugo Lopes Tavares
5f61950096 Make SpotPrice optional when requesting a spot fleet 
When price is omitted, AWS will default to the on-demand price
 2018-02-01 18:07:35 -05:00
grahamlyons
f3debf8f6f Test and fix bug for snapshot searching 
The logic which contructed a list of values for parameters with
multiple values was flawed in that e.g. `Subnet.1` and `Subnet.10`
would be have their values counted against `Subnet.1` because they
share a prefix.

This now checks for a starting `.` before counting that name as
having the requested prefix.
 2018-01-29 14:30:21 +00:00
grahamlyons
3ce57644cd Change 'image' for 'volume' when getting tags 
The AWS docs say that: "Currently, the resource types that support
tagging on creation are instance and volume." Calling `create_volume`
and passing `image` as the resource type in tag specifications causes
an `InvalidParameterValue` error.
 2018-01-26 11:12:50 +00:00
Jack Danger
4520cd930f
Merge pull request #1378 from william-richard/start-running-ami-tests 
Make test_amis not executable, so nose runs it
 2018-01-24 18:28:40 -08:00
dbfr3qs
597676c59c add tags when creating ebs volume 2018-01-15 21:52:32 +13:00
William Richard
09c5407b86
Fix tests that were introduced in PR #1398 2018-01-11 15:02:03 -05:00
William Richard
e0d4728c5d
Fix ami tests 
- missing and malformed image ids
- test_ami_filters

- test_ami_copy tests

- test_ami_create_and_delete test

- test_ami_filter_wildcard test

- the rest of the tests by using the non-deprecated mock_ec2
 2018-01-11 15:02:01 -05:00
William Richard
00a4249b74
Make test_amis not executable, so nose runs it 
In trying to debug changes to the ami mock introduced in 1.1.25,
I noticed that the ami tests were not running.  Turns out that nose does not
run test files that are executable.

http://nose.readthedocs.io/en/latest/finding_tests.html

The ami test file was the only test file I could find that had the executable bit set.
 2018-01-11 15:00:38 -05:00
Nuwan Goonasekera
56ce26a728 Added support for filtering AMIs by self (#1398) 
* Added support for filtering AMIs by self

Closes: https://github.com/spulec/moto/issues/1396

* Adjusted regex to also match signature v4 and fixed py3 compatibility
 2018-01-04 10:01:17 +00:00
Gordon Irving
4d9833b972 add test for descrie_regions with args 2017-12-28 21:02:58 +00:00
Nuwan Goonasekera
c68cd650e7 Make sure invalid or malformed AMIs raise an exception 
Closes: https://github.com/spulec/moto/issues/1408
 2017-12-22 18:50:22 +05:30
Archa91
474023f9a1 fix EC2 instances ebsOptimized not handled (#1340) 
* fix EC2 instances ebsOptimized not handled

* add test_create_instance_ebs_optimized
 2017-11-14 14:31:54 +00:00
Terry Cain
bd8c1e4567
adding owner id to amis v2 (#1331) 
* Adding owner-id/OwnerId to the AMI classes to allow the value to be specified to test filtering images based on owner.

* Added default AMIs and filtering by owner-id

* Fixed some tests

* Fixed more random tests

* Updated MANIFEST

* .
 2017-11-12 11:18:25 +00:00
Terry Cain
9ddf7fe436
Fixed some tests. 
Some subnets were bogus so fixed that. Fixed issue where EC2-Classic was not respected.
RDS Deepcopy was breaking on subnet generator
 2017-10-25 19:29:56 +01:00
Terry Cain
5b0e463554
Fixed a few ip issues 
Fixes #1175
 2017-10-24 23:57:43 +01:00
Terry Cain
f3623e3cd3 Fix for #1258 (#1260) 
* Fix for #1258

* Updated doc link
 2017-10-12 13:59:02 -07:00
William Johansson
88fb732302 Support wildcard tag filters on SecurityGroups 2017-10-06 21:55:01 +02:00
David Morrison
fa3268b7b7 fix tests 2017-10-06 08:07:21 -07:00
David Morrison
3d3d0e916e minor bugfixes and added tests 2017-10-05 18:46:58 -07:00
David Morrison
8ca7ccfcb5 add support for the modify_spot_fleet_request operation 2017-10-05 12:50:42 -07:00
Nuwan Goonasekera
5b01071bd4 Fix for regression in get_console_output() 2017-09-27 20:26:45 +05:30
Nuwan Goonasekera
ca56955a97 Added invalid id exceptions when filtering vpcs and subnets 2017-09-18 23:38:39 +05:30
Nuwan Goonasekera
08c4eff0b2 Added invalid id exceptions when filtering snapshots and volumes 2017-09-18 23:38:04 +05:30
Nuwan Goonasekera
298772ca92 Raise InvalidGroup.NotFound in DescribeSecurityGroups 2017-09-18 19:51:01 +05:30
Nuwan Goonasekera
0953ddde51 Fix for instance public ip not being cleared on eip disassociation 2017-09-16 12:26:43 +05:30
Jack Danger
b3ce255eee Merge pull request #1148 from gvlproject/vpc_address_filtering 
Improved support for VPC Address filtering
 2017-09-15 14:22:21 -07:00
Nuwan Goonasekera
8776129816 Improved support for VPC Address filtering 2017-09-16 01:49:57 +05:30
Nuwan Goonasekera
c116c57eb8 Ensure root device is listed in block device mappings 2017-09-15 21:30:32 +05:30
Nuwan Goonasekera
d0c610c5ac Added keypair filtering 2017-09-14 14:59:13 +05:30
Jack Danger
d2a234f75d falling back to use nic' 2017-09-08 16:30:21 -07:00
Jack Danger
5a03497367 rendering vpc_id in ec2 responses 2017-09-08 15:07:44 -07:00
Daniel Lutsch
1f6b1b8c4a Add list support to filters (#1083) 
* initial pass with TODOs

* add list support to get_object_value

* fix group-id filters

* add tests for sg name and id filters
 2017-08-25 23:43:29 -07:00
Daniel Lutsch
945b984538 Add private-dns-name filter and fix regional DNS (#1076) 
* add private-dns-name to filter_dict_attribute_mapping

* add region_name attribute to Instance and InstanceResponse

* set dns name based on region

* test private-dns-name and network-interface.private-dns-name filters. checking both regional dns formats

* update test_ec2_classic_has_public_ip_address to use correct dns values
 2017-08-23 01:39:50 -07:00
Christian Hellman
63b09eae13 Added DescribeAccountAttributes 2017-07-17 23:33:40 +00:00
Jeff Hardy
4e2f775c1f Use region list from Boto. 
Boto can be configured with extra regions, but moto will fail to import
if they are not in the hardcoded list in ec2/models.py. Instead, use the
region list from boto to build the ec2_backends dict to ensure all
regions are available.
 2017-05-26 12:47:28 -07:00
Jerome Bosman
b6d9b4f584 Replace and delete Network ACL Entries 2017-05-14 13:03:43 +01:00
Steve Pulec
97b920f6cf Fix ec2 tags in instance create. Closes #938. 2017-05-12 19:48:24 -04:00
Steve Pulec
0adebeed24 Merge #913. 2017-05-10 21:58:42 -04:00
Steve Pulec
408a70992c Fix filter wildcards. Closes #910. 2017-05-10 21:33:34 -04:00
Valentín Gutiérrez
6e209bb14c Implement availability-zone filter for DescribeNetworkInterfaces 2017-03-22 14:36:20 +01:00
Steve Pulec
3c0c4c2996 Fix tests for py3. 2017-02-23 22:28:09 -05:00
Steve Pulec
f37bad0e00 Lints. 2017-02-23 21:37:43 -05:00
Steve Pulec
81836b6981 Get standalone server mode working for all tests. 2017-02-23 19:43:48 -05:00
Steve Pulec
fde721bed7 Testing new version of decorator. 2017-02-15 22:35:45 -05:00
David Wilcox
012dd497f2 make get_all_security_groups filter AND match group ids, not OR them (#822) 2017-02-08 21:29:37 -05:00
Jason DeTiberus
1045dca7b2 make instanceTenancy configurable for VPCs (#819) 
* make instanceTenancy configurable for VPCs

* fix issue with setting tenenancy
 2017-02-08 21:23:49 -05:00
Jesse Szwedko
55f39265dd Upgrade to boto 2.45 (#803) 
Adds support for additional regions:

* ca-central-1
* eu-west-2

Signed-off-by: Andrew Harris <andrew.harris@getbraintree.com>
 2017-01-18 22:55:22 -05:00
costypetrisor
a967ec0d39 made the Security Group backend throw the same error as AWS if the nb of sec groups limit is hit (#742) 
* made the Security Group backend throw the same error as AWS if the security group limit is hit

* included in the security group limit the count of grants to other security groups & updated the unit tests to cover these

* refactored a few things about the sec group rule count limit
 2017-01-18 21:37:55 -05:00
Steve Pulec
a292150087 Throw exception if same security group rule added twice. Closes #737. 2017-01-11 22:35:27 -05:00
Taro Sato
02324ad708 Add more availability regions and implement default VPC (#773) 
Fix filter name for availability zone

Fix bug assuming dict keys are ordered

Fix tests

Fix tests

Fix bug
 2017-01-11 20:37:57 -05:00
Steve Pulec
05c6fc6738 Fix tests for py3. 2016-11-11 17:22:45 -05:00
Steve Pulec
5c3d9b4ae1 Have spot requests launch instances. 2016-11-07 23:08:30 -05:00
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
Steve Pulec
721d1b3a3f Merge pull request #736 from okomestudio/ts/botocore_update 
Remove botocore version pinning
 2016-11-06 09:50:28 -05:00
Dan Tenenbaum
ed7ea86f7b add positional argument for python 2.6 compatiblity 2016-11-03 14:42:23 -07:00
Dan Tenenbaum
de0a741309 syntax fix 2016-11-03 14:30:35 -07:00
Dan Tenenbaum
ffa6b1d9c1 should pass unit tests 2016-11-03 14:24:47 -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
Costy Petrisor
6f622b9689 an unit test for the bulk authorization and revokation of security group 
rules
 2016-10-20 18:14:22 +00:00
Taro Sato
ed91b093cd Ignore RetryAttempts field generated by recent botocore versions 2016-10-16 21:50:21 -07:00
rocky4570fft
95e9ce2d42 fixup merge issue with test_elastic_ip_addresses.py 2016-10-16 00:37:14 +10:00
rocky4570fft
d6f76cbb43 Add dry_run to a number of EC2 services 2016-10-16 00:34:52 +10:00
rocky4570fft
015c92ac44 Add dry_run to a number of EC2 services 2016-10-15 23:08:44 +10: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
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
Mervyn Russell
43ff874b68 Amended test_ami_create_and_delete to include test for existence of creation date 2016-08-26 15:14:04 +01:00
rocky4570fft
0161422d21 additional filters to get_all_vpcs 2016-08-14 16:58:35 +10:00
Steve Pulec
ae938223d4 Cleanup headers popping. 2016-07-24 09:50:39 -04:00
Steve Pulec
8e8f3d99f6 Merge pull request #655 from 2rs2ts/work-around-httpheaders 
Remove HTTPHeaders from ResponseMetadata in some tests
 2016-07-24 09:36:58 -04: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
5f770ffabb added more wildcard test for tags 2016-07-05 11:31:47 +01:00
Kieran Doonan
20e00dd095 added tests for broken tag filter 2016-07-05 11:20:28 +01:00
Kieran Doonan
e9af4c9065 changed equal to be for booleans 2016-07-04 14:21:31 +01:00
Kieran Doonan
2d73052eef added tests for encrypted snapshots 2016-07-04 14:19:29 +01:00
Kieran Doonan
bf73cb603d added tests for unencrypted filter 2016-07-04 14:09:15 +01:00
Kieran Doonan
8ccc210eef added tests for encrypted ec2 volumes 2016-07-04 11:01:48 +01:00
Andrew Garrett
aab137ae66 Remove HTTPHeaders from ResponseMetadata in some tests 
botocore 1.4.29 started adding this. I'd match against it, but it
contains a date object and it's just not worth rewriting the assertions
for a key-by-key approach.
 2016-06-29 23:45:21 +00:00
Paul Cieslar
8e6dd13738 Addition of region to test_security_group_tagging_boto3 2016-06-23 12:38:17 +01:00
Paul Cieslar
35d200c420 Update to test for security group tagging 
Support for describe_security_groups() in boto3
 2016-06-23 12:03:29 +01: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
Yann Lambret
864594ab91 Add tests for new filters 2016-05-08 00:19:47 +02: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
232b832563 Change type for IpProtocol key 2016-04-20 23:21:39 +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
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
Yann Lambret
6d4a48b019 Add support for 'ModifySubnetAttribute' action 2016-04-05 00:17:56 +02: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
a06fa082a4 Add two tests for both boto and boto3 as the problem only affects boto3 client 2016-03-02 12:15:47 +01:00
Hugo Lopes Tavares
21fb961c6a Implement NAT Gateway resource 2016-03-01 12:02:57 -05:00
andy
7120b5e4b1 Support placement when starting new instances 2016-02-10 17:59:48 +00: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
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
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
Steve Pulec
5d421dc343 Cleanup querying missing ELB error. 2015-12-13 22:41:17 -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
e98dfb1648 corrected unused import in test_vpn_connectins 2015-12-03 13:51:48 +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
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
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
ZuluPro
23c2e7835e Remade ec2.utils.random_key_pair for be really random 2015-09-15 20:09:35 -04:00
Ilya Sukhanov
6a89786007 Remove hardcoded region in ebs test 2015-08-03 10:45:01 -04:00
Rob Walker
7b3f17e8f0 add modified tests for volume and snapshot changes. 2015-07-26 09:53:03 +10:00
Steve Pulec
4020141478 Fix cloudformation subnet tagging. 2015-07-13 19:27:00 -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
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
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
b987914c72 slight change in formatting 2015-02-24 07:43:43 -06:00
Andy Altepeter
b66ee09abe fix test for ec2 instance type filter 2015-02-24 07:39:50 -06:00