Revert some changes made by scrape-ec2-prices.py
These changes caused multiple tests to fail.
Closes #790
Signed-off-by: Tomaz Muraus <tomaz@tomaz.me>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/2cdcb243
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/2cdcb243
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/2cdcb243
Branch: refs/heads/trunk
Commit: 2cdcb243a2292e0fe9b7683384059a93fec092dc
Parents: ef54e1b
Author: Anže Pečar <ensmotko@gmail.com>
Authored: Wed May 18 23:10:47 2016 +0200
Committer: Tomaz Muraus <tomaz@tomaz.me>
Committed: Fri May 20 11:21:37 2016 +0200
----------------------------------------------------------------------
libcloud/data/pricing.json | 46 ++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/2cdcb243/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index b9ee18f..0ec17f1 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -29,60 +29,60 @@
"standard-small": 0.0796
},
"ec2_ap_northeast": {
- "c1.medium": "N/A",
- "c1.xlarge": "N/A",
+ "c1.medium": "0.158",
+ "c1.xlarge": "0.632",
"c3.large": "0.128",
"c3.xlarge": "0.255",
"c3.2xlarge": "0.511",
"c3.4xlarge": "1.021",
"c3.8xlarge": "2.043",
- "c4.large": "0.12",
+ "c4.large": "0.120",
"c4.xlarge": "0.239",
"c4.2xlarge": "0.478",
"c4.4xlarge": "0.955",
- "c4.8xlarge": "1.91",
- "cc2.8xlarge": "N/A",
+ "c4.8xlarge": "1.910",
+ "cc2.8xlarge": "2.349",
"cg1.4xlarge": "N/A",
- "cr1.8xlarge": "N/A",
+ "cr1.8xlarge": "4.105",
"d2.xlarge": "0.844",
"d2.2xlarge": "1.688",
"d2.4xlarge": "3.376",
"d2.8xlarge": "6.752",
"g2.2xlarge": "0.898",
"g2.8xlarge": "3.592",
- "hi1.4xlarge": "N/A",
- "hs1.8xlarge": "N/A",
+ "hi1.4xlarge": "3.276",
+ "hs1.8xlarge": "5.4",
"i2.xlarge": "1.001",
"i2.2xlarge": "2.001",
"i2.4xlarge": "4.002",
"i2.8xlarge": "8.004",
- "m1.small": "N/A",
- "m1.medium": "N/A",
- "m1.large": "N/A",
- "m1.xlarge": "N/A",
- "m2.xlarge": "N/A",
- "m2.2xlarge": "N/A",
- "m2.4xlarge": "N/A",
+ "m1.small": "0.061",
+ "m1.medium": "0.122",
+ "m1.large": "0.243",
+ "m1.xlarge": "0.486",
+ "m2.xlarge": "0.287",
+ "m2.2xlarge": "0.575",
+ "m2.4xlarge": "1.15",
"m3.medium": "0.096",
"m3.large": "0.193",
"m3.xlarge": "0.385",
"m3.2xlarge": "0.77",
"m4.large": "0.165",
"m4.xlarge": "0.331",
- "m4.2xlarge": "0.66",
+ "m4.2xlarge": "0.660",
"m4.4xlarge": "1.321",
"m4.10xlarge": "3.303",
- "r3.large": "0.2",
+ "r3.large": "0.200",
"r3.xlarge": "0.399",
"r3.2xlarge": "0.798",
"r3.4xlarge": "1.596",
"r3.8xlarge": "3.192",
- "t1.micro": "N/A",
- "t2.micro": "0.02",
- "t2.small": "0.04",
- "t2.medium": "0.08",
- "t2.large": "0.16",
- "t2.nano": "0.01",
+ "t1.micro": "0.026",
+ "t2.micro": "0.020",
+ "t2.small": "0.040",
+ "t2.medium": "0.080",
+ "t2.large": "0.160",
+ "t2.nano": "0.010",
"x1.32xlarge": "19.341"
},
"ec2_ap_southeast": {
|