add 'end' to ec2 reserved_node Closes #1099
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/d47adca1 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/d47adca1 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/d47adca1 Branch: refs/heads/trunk Commit: d47adca1be13aceb909217104f061d89c1d99da1 Parents: dad12ee Author: xofer <[email protected]> Authored: Wed Aug 30 16:15:48 2017 -0400 Committer: Anthony Shaw <[email protected]> Committed: Mon Sep 4 08:40:31 2017 +1000 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 4 ++++ .../test/compute/fixtures/ec2/describe_reserved_instances.xml | 1 + libcloud/test/compute/test_ec2.py | 1 + 3 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/d47adca1/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index f2526b0..2a5ed4c 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -2765,6 +2765,10 @@ RESOURCE_EXTRA_ATTRIBUTES_MAP = { 'xpath': 'start', 'transform_func': str }, + 'end': { + 'xpath': 'end', + 'transform_func': str + }, 'duration': { 'xpath': 'duration', 'transform_func': int http://git-wip-us.apache.org/repos/asf/libcloud/blob/d47adca1/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml b/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml index 29d7f3f..6c5ac71 100644 --- a/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml +++ b/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml @@ -6,6 +6,7 @@ <instanceType>t1.micro</instanceType> <availabilityZone>us-east-1b</availabilityZone> <start>2013-06-18T12:07:53.161Z</start> + <end>2014-06-18T12:07:53.161Z</end> <duration>31536000</duration> <fixedPrice>23.0</fixedPrice> <usagePrice>0.012</usagePrice> http://git-wip-us.apache.org/repos/asf/libcloud/blob/d47adca1/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index f8a2687..1fe4183 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -282,6 +282,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertEqual(node.extra['instance_type'], 't1.micro') self.assertEqual(node.extra['availability'], 'us-east-1b') self.assertEqual(node.extra['start'], '2013-06-18T12:07:53.161Z') + self.assertEqual(node.extra['end'], '2014-06-18T12:07:53.161Z') self.assertEqual(node.extra['duration'], 31536000) self.assertEqual(node.extra['usage_price'], 0.012) self.assertEqual(node.extra['fixed_price'], 23.0)
