Return-Path: X-Original-To: apmail-libcloud-commits-archive@www.apache.org Delivered-To: apmail-libcloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1E294100D7 for ; Tue, 15 Oct 2013 07:55:13 +0000 (UTC) Received: (qmail 99632 invoked by uid 500); 15 Oct 2013 07:55:12 -0000 Delivered-To: apmail-libcloud-commits-archive@libcloud.apache.org Received: (qmail 99573 invoked by uid 500); 15 Oct 2013 07:55:11 -0000 Mailing-List: contact commits-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list commits@libcloud.apache.org Received: (qmail 99543 invoked by uid 99); 15 Oct 2013 07:55:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Oct 2013 07:55:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DB2928B442F; Tue, 15 Oct 2013 07:55:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tomaz@apache.org To: commits@libcloud.apache.org Date: Tue, 15 Oct 2013 07:55:06 -0000 Message-Id: <359cc6da63a04261b00b447f1483bc3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Update EC2 instance type map and pricing data. High Storage instances are now also available in Sydney and Singapore region. Updated Branches: refs/heads/trunk e74c131d8 -> 05a4a2094 Update EC2 instance type map and pricing data. High Storage instances are now also available in Sydney and Singapore region. Reference: http://aws.typepad.com/aws/2013/10/amazon-ec2-high-storage-hs1-instances-now-available-in-sydney-and-singapore.html Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/25f9b0bf Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/25f9b0bf Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/25f9b0bf Branch: refs/heads/trunk Commit: 25f9b0bf7a0d65d4dc77b5cf809c7f20d0442a58 Parents: e74c131 Author: Tomaz Muraus Authored: Tue Oct 15 09:43:01 2013 +0200 Committer: Tomaz Muraus Committed: Tue Oct 15 09:46:32 2013 +0200 ---------------------------------------------------------------------- CHANGES | 4 ++++ libcloud/compute/drivers/ec2.py | 8 +++++--- libcloud/data/pricing.json | 6 ++++-- libcloud/test/compute/test_ec2.py | 3 ++- 4 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/25f9b0bf/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8c6f82e..47bfc0e 100644 --- a/CHANGES +++ b/CHANGES @@ -119,6 +119,10 @@ Changes with Apache Libcloud in development - Add pricing information for Rackspace Cloud Sydney region. [Tomaz Muraus] + - Update EC2 instance type map and pricing data. High Storage instances are + now also available in Sydney and Signapore region. + [Tomaz Muraus] + *) Storage - Deprecate CLOUDFILES_US and CLOUDFILES_UK storage provider constant and http://git-wip-us.apache.org/repos/asf/libcloud/blob/25f9b0bf/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index aed6a15..8fcb055 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -266,7 +266,8 @@ REGION_DETAILS = { 'm3.xlarge', 'm3.2xlarge', 'c1.medium', - 'c1.xlarge' + 'c1.xlarge', + 'hs1.8xlarge' ] }, 'ap-northeast-1': { @@ -322,7 +323,8 @@ REGION_DETAILS = { 'm3.xlarge', 'm3.2xlarge', 'c1.medium', - 'c1.xlarge' + 'c1.xlarge', + 'hs1.8xlarge' ] }, 'nimbus': { @@ -1588,7 +1590,7 @@ class EC2APSESydneyNodeDriver(EC2NodeDriver): """ Driver class for EC2 in the Southeast Asia Pacific (Sydney) Region. """ - name = 'Amazon EC2 (ap-southeast-1)' + name = 'Amazon EC2 (ap-southeast-2)' _region = 'ap-southeast-2' http://git-wip-us.apache.org/repos/asf/libcloud/blob/25f9b0bf/libcloud/data/pricing.json ---------------------------------------------------------------------- diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json index 6fc7eb2..900d8ad 100644 --- a/libcloud/data/pricing.json +++ b/libcloud/data/pricing.json @@ -135,7 +135,8 @@ "m2.2xlarge": 1.14, "m2.4xlarge": 2.28, "m3.xlarge": 0.70, - "m3.2xlarge": 1.40 + "m3.2xlarge": 1.40, + "hs1.8xlarge": 5.570 }, "ec2_ap_northeast": { @@ -178,7 +179,8 @@ "m2.2xlarge": 1.012, "m2.4xlarge": 2.024, "m3.xlarge": 0.70, - "m3.2xlarge": 1.40 + "m3.2xlarge": 1.40, + "hs1.8xlarge": 5.570 }, "nephoscale" : { http://git-wip-us.apache.org/repos/asf/libcloud/blob/25f9b0bf/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index c51dc5a..ffbf93b 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -280,7 +280,8 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertTrue('cc1.4xlarge' in ids) self.assertTrue('cc2.8xlarge' in ids) self.assertTrue('cr1.8xlarge' in ids) - elif region_name == 'eu-west-1': + elif region_name in ['eu-west-1', 'ap-southeast-1', + 'ap-southeast-2']: self.assertEqual(len(sizes), 13) else: self.assertEqual(len(sizes), 12)