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 2014/04/07 17:50:26 UTC
[1/2] git commit: Update EC2 instance and pricing information.
Repository: libcloud
Updated Branches:
refs/heads/trunk e36f05a5f -> dbe902715
Update EC2 instance and pricing information.
Closes #256
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/dc2c0dfa
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/dc2c0dfa
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/dc2c0dfa
Branch: refs/heads/trunk
Commit: dc2c0dfa4a0b8d3f5fcbafcaf572720e755ad78a
Parents: e36f05a
Author: Tomaz Muraus <to...@apache.org>
Authored: Mon Apr 7 09:48:13 2014 -0600
Committer: Tomaz Muraus <to...@apache.org>
Committed: Mon Apr 7 09:48:13 2014 -0600
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 14 ++++++++++++++
libcloud/data/pricing.json | 9 +++++++++
2 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dc2c0dfa/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index bac7f8d..ad51e00 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -247,6 +247,13 @@ INSTANCE_TYPES = {
'disk': 240,
'bandwidth': None
},
+ 'hs1.4xlarge': {
+ 'id': 'hs1.4xlarge',
+ 'name': 'High Storage Quadruple Extra Large Instance',
+ 'ram': 61952,
+ 'disk': 2048,
+ 'bandwidth': None
+ },
'hs1.8xlarge': {
'id': 'hs1.8xlarge',
'name': 'High Storage Eight Extra Large Instance',
@@ -316,6 +323,7 @@ REGION_DETAILS = {
'cg1.4xlarge',
'g2.2xlarge',
'cr1.8xlarge',
+ 'hs1.4xlarge',
'hs1.8xlarge',
'i2.xlarge',
'i2.2xlarge',
@@ -377,6 +385,8 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'hs1.4xlarge',
+ 'hs1.8xlarge',
'cc2.8xlarge',
'i2.xlarge',
'i2.2xlarge',
@@ -410,6 +420,8 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'hs1.4xlarge',
+ 'hs1.8xlarge',
'cc2.8xlarge',
'i2.xlarge',
'i2.2xlarge',
@@ -475,6 +487,8 @@ REGION_DETAILS = {
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
+ 'hs1.4xlarge',
+ 'hs1.8xlarge',
'i2.xlarge',
'i2.2xlarge',
'i2.4xlarge',
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dc2c0dfa/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index 1d862d4..d6202ba 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -90,6 +90,7 @@
"cc1.4xlarge": 1.3,
"cc2.8xlarge": 2.4,
"cr1.8xlarge": 3.50,
+ "hs1.4xlarge": 3.1,
"hs1.8xlarge": 4.6,
"i2.xlarge": 0.85,
"i2.2xlarge": 1.71,
@@ -118,6 +119,8 @@
"m3.large": 0.248,
"m3.xlarge": 0.495,
"m3.2xlarge": 0.990,
+ "hs1.4xlarge": 3.1,
+ "hs1.8xlarge": 4.6,
"i2.xlarge": 0.85,
"i2.2xlarge": 1.71,
"i2.4xlarge": 3.41,
@@ -145,6 +148,8 @@
"m3.large": 0.225,
"m3.xlarge": 0.45,
"m3.2xlarge": 0.90,
+ "hs1.4xlarge": 3.1,
+ "hs1.8xlarge": 4.6,
"cc2.8xlarge": 2.400,
"i2.xlarge": 0.85,
"i2.2xlarge": 1.71,
@@ -173,6 +178,8 @@
"m3.large": 0.248,
"m3.xlarge": 0.495,
"m3.2xlarge": 0.990,
+ "hs1.4xlarge": 3.1,
+ "hs1.8xlarge": 4.6,
"cc2.8xlarge": 2.7,
"i2.xlarge": 0.85,
"i2.2xlarge": 1.71,
@@ -228,6 +235,8 @@
"m3.large": 0.342,
"m3.xlarge": 0.684,
"m3.2xlarge": 1.368,
+ "hs1.4xlarge": 3.440,
+ "hs1.8xlarge": 5.670,
"i2.xlarge": 0.85,
"i2.2xlarge": 1.71,
"i2.4xlarge": 3.41,
[2/2] git commit: Update tox lint step to also verify syntax in the
pricing.json file.
Posted by to...@apache.org.
Update tox lint step to also verify syntax in the pricing.json file.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/dbe90271
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/dbe90271
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/dbe90271
Branch: refs/heads/trunk
Commit: dbe902715c9dacbec9d5495ebc6cc1e0de28bfb4
Parents: dc2c0df
Author: Tomaz Muraus <to...@apache.org>
Authored: Mon Apr 7 09:49:40 2014 -0600
Committer: Tomaz Muraus <to...@apache.org>
Committed: Mon Apr 7 09:49:40 2014 -0600
----------------------------------------------------------------------
tox.ini | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/dbe90271/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 4f581e2..66dc270 100644
--- a/tox.ini
+++ b/tox.ini
@@ -52,3 +52,4 @@ commands = flake8 --exclude="test" libcloud/
flake8 demos/
flake8 --ignore=E902 docs/examples/
flake8 --ignore=E902 contrib/
+ python -mjson.tool libcloud/data/pricing.json