You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2015/03/31 23:09:40 UTC
[1/4] libcloud git commit: Update scraping script so it handles new
regions and new instance types.
Repository: libcloud
Updated Branches:
refs/heads/trunk b8ae90653 -> c3420a9c5
Update scraping script so it handles new regions and new instance types.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f1550122
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f1550122
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f1550122
Branch: refs/heads/trunk
Commit: f1550122d30bfe1fb86005bb654f6dd14b8126a2
Parents: b8ae906
Author: Tomaz Muraus <to...@apache.org>
Authored: Tue Mar 31 21:20:31 2015 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Mar 31 21:20:31 2015 +0200
----------------------------------------------------------------------
contrib/scrape-ec2-prices.py | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/f1550122/contrib/scrape-ec2-prices.py
----------------------------------------------------------------------
diff --git a/contrib/scrape-ec2-prices.py b/contrib/scrape-ec2-prices.py
index 762e96d..d4d07b6 100755
--- a/contrib/scrape-ec2-prices.py
+++ b/contrib/scrape-ec2-prices.py
@@ -28,9 +28,9 @@ import demjson
LINUX_PRICING_URLS = [
# Deprecated instances (JSON format)
- 'http://aws.amazon.com/ec2/pricing/json/linux-od.json',
+ 'https://aws.amazon.com/ec2/pricing/json/linux-od.json',
# Previous generation instances (JavaScript file)
- 'http://a0.awsstatic.com/pricing/1/ec2/previous-generation/linux-od.min.js',
+ 'https://a0.awsstatic.com/pricing/1/ec2/previous-generation/linux-od.min.js',
# New generation instances (JavaScript file)
'https://a0.awsstatic.com/pricing/1/ec2/linux-od.min.js'
]
@@ -40,6 +40,7 @@ EC2_REGIONS = [
'us-west-1',
'us-west-2',
'eu-west-1',
+ 'eu-central-1',
'ap-southeast-1',
'ap-southeast-2',
'ap-northeast-1',
@@ -68,6 +69,10 @@ EC2_INSTANCE_TYPES = [
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'cg1.4xlarge',
'g2.2xlarge',
'cr1.8xlarge',
@@ -90,13 +95,21 @@ EC2_INSTANCE_TYPES = [
# Maps EC2 region name to region name used in the pricing file
REGION_NAME_MAP = {
'us-east': 'ec2_us_east',
+ 'us-east-1': 'ec2_us_east',
'us-west': 'ec2_us_west',
+ 'us-west-1': 'ec2_us_west',
'us-west-2': 'ec2_us_west_oregon',
+ 'eu-west-1': 'ec2_eu_west',
'eu-ireland': 'ec2_eu_west',
+ 'eu-central-1': 'ec2_eu_central',
'apac-sin': 'ec2_ap_southeast',
+ 'ap-southeast-1': 'ec2_ap_southeast',
'apac-syd': 'ec2_ap_southeast_2',
+ 'ap-southeast-2': 'ec2_ap_southeast_2',
'apac-tokyo': 'ec2_ap_northeast',
+ 'ap-northeast-1': 'ec2_ap_northeast',
'sa-east-1': 'ec2_sa_east',
+ 'us-gov-west-1': 'ec2_us_govwest'
}
BASE_PATH = os.path.dirname(os.path.abspath(__file__))
[3/4] libcloud git commit: Add new d4. instance types to the EC2
driver.
Posted by to...@apache.org.
Add new d4. instance types to the EC2 driver.
Also update affected tests.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fbc19273
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fbc19273
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fbc19273
Branch: refs/heads/trunk
Commit: fbc19273dc46deb9eac7767be2f06642693663fe
Parents: 50b754a
Author: Tomaz Muraus <to...@apache.org>
Authored: Tue Mar 31 21:25:21 2015 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Mar 31 21:26:55 2015 +0200
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 56 ++++++++++++++++++++++++++++++++++
libcloud/test/compute/test_ec2.py | 8 ++---
2 files changed, 60 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fbc19273/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 99c7419..5c4763e 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -303,6 +303,34 @@ INSTANCE_TYPES = {
'disk': 6400,
'bandwidth': None
},
+ 'd2.xlarge': {
+ 'id': 'd2.xlarge',
+ 'name': 'High Storage Optimized Extra Large Instance',
+ 'ram': 30050,
+ 'disk': 6000, # 3 x 2 TB
+ 'bandwidth': None
+ },
+ 'd2.2xlarge': {
+ 'id': 'd2.2xlarge',
+ 'name': 'High Storage Optimized Double Extra Large Instance',
+ 'ram': 61952,
+ 'disk': 12000, # 6 x 2 TB
+ 'bandwidth': None
+ },
+ 'd2.4xlarge': {
+ 'id': 'd2.4xlarge',
+ 'name': 'High Storage Optimized Quadruple Extra Large Instance',
+ 'ram': 122000,
+ 'disk': 24000, # 12 x 2 TB
+ 'bandwidth': None
+ },
+ 'd2.8xlarge': {
+ 'id': 'd2.8xlarge',
+ 'name': 'High Storage Optimized Eight Extra Large Instance',
+ 'ram': 244000,
+ 'disk': 48000, # 24 x 2 TB
+ 'bandwidth': None
+ },
# 1x SSD
'r3.large': {
'id': 'r3.large',
@@ -408,6 +436,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -492,6 +524,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -535,6 +571,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -565,6 +605,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -606,6 +650,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
't2.micro',
't2.small',
't2.medium'
@@ -643,6 +691,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
@@ -710,6 +762,10 @@ REGION_DETAILS = {
'i2.2xlarge',
'i2.4xlarge',
'i2.8xlarge',
+ 'd2.xlarge',
+ 'd2.2xlarge',
+ 'd2.4xlarge',
+ 'd2.8xlarge',
'r3.large',
'r3.xlarge',
'r3.2xlarge',
http://git-wip-us.apache.org/repos/asf/libcloud/blob/fbc19273/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index 9ad0a0b..6a5cdeb 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -382,7 +382,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
self.assertTrue('m2.4xlarge' in ids)
if region_name == 'us-east-1':
- self.assertEqual(len(sizes), 36)
+ self.assertEqual(len(sizes), 40)
self.assertTrue('cg1.4xlarge' in ids)
self.assertTrue('cc2.8xlarge' in ids)
self.assertTrue('cr1.8xlarge' in ids)
@@ -391,11 +391,11 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
if region_name == 'us-west-2':
self.assertEqual(len(sizes), 29)
elif region_name == 'ap-southeast-1':
- self.assertEqual(len(sizes), 27)
+ self.assertEqual(len(sizes), 31)
elif region_name == 'ap-southeast-2':
- self.assertEqual(len(sizes), 32)
+ self.assertEqual(len(sizes), 36)
elif region_name == 'eu-west-1':
- self.assertEqual(len(sizes), 34)
+ self.assertEqual(len(sizes), 38)
self.driver.region_name = region_old
[4/4] libcloud git commit: Update changelog.
Posted by to...@apache.org.
Update changelog.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/c3420a9c
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c3420a9c
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c3420a9c
Branch: refs/heads/trunk
Commit: c3420a9c53b0a971043469bb29554ccf3a560b58
Parents: fbc1927
Author: Tomaz Muraus <to...@apache.org>
Authored: Tue Mar 31 23:02:42 2015 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Mar 31 23:02:42 2015 +0200
----------------------------------------------------------------------
CHANGES.rst | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/c3420a9c/CHANGES.rst
----------------------------------------------------------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index eab9126..73da6ec 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -137,6 +137,10 @@ Compute
(GITHUB-442)
[Andrew Starr-Bochicchio]
+- Add new ``d4.`` instance types to the EC2 driver. Also update EC2 pricing data.
+ (GITHUB-490)
+ [Tomaz Muraus]
+
DNS
~~~
[2/4] libcloud git commit: Re-generate pricing file (scrape new
prices).
Posted by to...@apache.org.
Re-generate pricing file (scrape new prices).
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/50b754ab
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/50b754ab
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/50b754ab
Branch: refs/heads/trunk
Commit: 50b754abdd2dc031215be8a6a45786229fce0620
Parents: f155012
Author: Tomaz Muraus <to...@apache.org>
Authored: Tue Mar 31 21:21:08 2015 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Tue Mar 31 21:21:16 2015 +0200
----------------------------------------------------------------------
libcloud/data/pricing.json | 136 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 135 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/50b754ab/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index 9c0c0ee..f86411a 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -43,8 +43,17 @@
"c3.8xlarge": "2.043",
"c3.large": "0.128",
"c3.xlarge": "0.255",
+ "c4.2xlarge": "0.588",
+ "c4.4xlarge": "1.176",
+ "c4.8xlarge": "2.352",
+ "c4.large": "0.147",
+ "c4.xlarge": "0.294",
"cc2.8xlarge": "2.349",
"cr1.8xlarge": "4.105",
+ "d2.2xlarge": "1.688",
+ "d2.4xlarge": "3.376",
+ "d2.8xlarge": "6.752",
+ "d2.xlarge": "0.844",
"g2.2xlarge": "0.898",
"hi1.4xlarge": "3.276",
"hs1.8xlarge": "5.400",
@@ -81,7 +90,17 @@
"c3.8xlarge": "2.117",
"c3.large": "0.132",
"c3.xlarge": "0.265",
+ "c4.2xlarge": "0.608",
+ "c4.4xlarge": "1.216",
+ "c4.8xlarge": "2.432",
+ "c4.large": "0.152",
+ "c4.xlarge": "0.304",
+ "d2.2xlarge": "1.740",
+ "d2.4xlarge": "3.480",
+ "d2.8xlarge": "6.960",
+ "d2.xlarge": "0.870",
"g2.2xlarge": "1.000",
+ "hi1.4xlarge": "N/A",
"hs1.8xlarge": "5.570",
"i2.2xlarge": "2.035",
"i2.4xlarge": "4.070",
@@ -116,7 +135,17 @@
"c3.8xlarge": "2.117",
"c3.large": "0.132",
"c3.xlarge": "0.265",
+ "c4.2xlarge": "0.608",
+ "c4.4xlarge": "1.216",
+ "c4.8xlarge": "2.432",
+ "c4.large": "0.152",
+ "c4.xlarge": "0.304",
+ "d2.2xlarge": "1.740",
+ "d2.4xlarge": "3.480",
+ "d2.8xlarge": "6.960",
+ "d2.xlarge": "0.870",
"g2.2xlarge": "0.898",
+ "hi1.4xlarge": "N/A",
"hs1.8xlarge": "5.570",
"i2.2xlarge": "2.035",
"i2.4xlarge": "4.070",
@@ -143,6 +172,39 @@
"t2.micro": "0.020",
"t2.small": "0.040"
},
+ "ec2_eu_central": {
+ "c3.2xlarge": "0.516",
+ "c3.4xlarge": "1.032",
+ "c3.8xlarge": "2.064",
+ "c3.large": "0.129",
+ "c3.xlarge": "0.258",
+ "c4.2xlarge": "0.592",
+ "c4.4xlarge": "1.184",
+ "c4.8xlarge": "2.368",
+ "c4.large": "0.148",
+ "c4.xlarge": "0.296",
+ "d2.2xlarge": "1.588",
+ "d2.4xlarge": "3.176",
+ "d2.8xlarge": "6.352",
+ "d2.xlarge": "0.794",
+ "g2.2xlarge": null,
+ "i2.2xlarge": "2.026",
+ "i2.4xlarge": "4.051",
+ "i2.8xlarge": "8.102",
+ "i2.xlarge": "1.013",
+ "m3.2xlarge": "0.665",
+ "m3.large": "0.166",
+ "m3.medium": "0.083",
+ "m3.xlarge": "0.332",
+ "r3.2xlarge": "0.842",
+ "r3.4xlarge": "1.684",
+ "r3.8xlarge": "3.369",
+ "r3.large": "0.210",
+ "r3.xlarge": "0.421",
+ "t2.medium": "0.060",
+ "t2.micro": "0.015",
+ "t2.small": "0.030"
+ },
"ec2_eu_west": {
"c1.medium": "0.148",
"c1.xlarge": "0.592",
@@ -151,9 +213,18 @@
"c3.8xlarge": "1.912",
"c3.large": "0.120",
"c3.xlarge": "0.239",
+ "c4.2xlarge": "0.528",
+ "c4.4xlarge": "1.056",
+ "c4.8xlarge": "2.112",
+ "c4.large": "0.132",
+ "c4.xlarge": "0.264",
"cc2.8xlarge": "2.250",
"cg1.4xlarge": "2.360",
"cr1.8xlarge": "3.750",
+ "d2.2xlarge": "1.470",
+ "d2.4xlarge": "2.940",
+ "d2.8xlarge": "5.880",
+ "d2.xlarge": "0.735",
"g2.2xlarge": "0.702",
"hi1.4xlarge": "3.100",
"hs1.8xlarge": "4.900",
@@ -190,6 +261,8 @@
"c3.8xlarge": "2.600",
"c3.large": "0.163",
"c3.xlarge": "0.325",
+ "hi1.4xlarge": "N/A",
+ "hs1.8xlarge": "N/A",
"m1.large": "0.233",
"m1.medium": "0.117",
"m1.small": "0.058",
@@ -214,9 +287,18 @@
"c3.8xlarge": "1.680",
"c3.large": "0.105",
"c3.xlarge": "0.210",
+ "c4.2xlarge": "0.464",
+ "c4.4xlarge": "0.928",
+ "c4.8xlarge": "1.856",
+ "c4.large": "0.116",
+ "c4.xlarge": "0.232",
"cc2.8xlarge": "2.000",
"cg1.4xlarge": "2.100",
"cr1.8xlarge": "3.500",
+ "d2.2xlarge": "1.380",
+ "d2.4xlarge": "2.760",
+ "d2.8xlarge": "5.520",
+ "d2.xlarge": "0.690",
"g2.2xlarge": "0.650",
"hi1.4xlarge": "3.100",
"hs1.8xlarge": "4.600",
@@ -245,6 +327,42 @@
"t2.micro": "0.013",
"t2.small": "0.026"
},
+ "ec2_us_govwest": {
+ "c1.medium": "0.157",
+ "c1.xlarge": "0.628",
+ "c3.2xlarge": "0.504",
+ "c3.4xlarge": "1.008",
+ "c3.8xlarge": "2.016",
+ "c3.large": "0.126",
+ "c3.xlarge": "0.252",
+ "cc2.8xlarge": "2.250",
+ "hi1.4xlarge": "N/A",
+ "hs1.8xlarge": "5.520",
+ "i2.2xlarge": "2.046",
+ "i2.4xlarge": "4.092",
+ "i2.8xlarge": "8.184",
+ "i2.xlarge": "1.023",
+ "m1.large": "0.211",
+ "m1.medium": "0.106",
+ "m1.small": "0.053",
+ "m1.xlarge": "0.423",
+ "m2.2xlarge": "0.586",
+ "m2.4xlarge": "1.171",
+ "m2.xlarge": "0.293",
+ "m3.2xlarge": "0.672",
+ "m3.large": "0.168",
+ "m3.medium": "0.084",
+ "m3.xlarge": "0.336",
+ "r3.2xlarge": "0.840",
+ "r3.4xlarge": "1.680",
+ "r3.8xlarge": "3.360",
+ "r3.large": "0.210",
+ "r3.xlarge": "0.420",
+ "t1.micro": "0.024",
+ "t2.medium": "0.062",
+ "t2.micro": "0.015",
+ "t2.small": "0.031"
+ },
"ec2_us_west": {
"c1.medium": "0.148",
"c1.xlarge": "0.592",
@@ -253,7 +371,14 @@
"c3.8xlarge": "1.912",
"c3.large": "0.120",
"c3.xlarge": "0.239",
+ "c4.2xlarge": "0.552",
+ "c4.4xlarge": "1.104",
+ "c4.8xlarge": "2.208",
+ "c4.large": "0.138",
+ "c4.xlarge": "0.276",
"g2.2xlarge": "0.702",
+ "hi1.4xlarge": "N/A",
+ "hs1.8xlarge": "N/A",
"i2.2xlarge": "1.876",
"i2.4xlarge": "3.751",
"i2.8xlarge": "7.502",
@@ -287,8 +412,17 @@
"c3.8xlarge": "1.680",
"c3.large": "0.105",
"c3.xlarge": "0.210",
+ "c4.2xlarge": "0.464",
+ "c4.4xlarge": "0.928",
+ "c4.8xlarge": "1.856",
+ "c4.large": "0.116",
+ "c4.xlarge": "0.232",
"cc2.8xlarge": "2.000",
"cr1.8xlarge": "3.500",
+ "d2.2xlarge": "1.380",
+ "d2.4xlarge": "2.760",
+ "d2.8xlarge": "5.520",
+ "d2.xlarge": "0.690",
"g2.2xlarge": "0.650",
"hi1.4xlarge": "3.100",
"hs1.8xlarge": "4.600",
@@ -587,5 +721,5 @@
}
},
"storage": {},
- "updated": 1410030750
+ "updated": 1427829652
}
\ No newline at end of file