libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthonys...@apache.org
Subject [3/8] libcloud git commit: Corrected EC2 region mapping names
Date Sat, 01 Apr 2017 04:39:35 GMT
Corrected EC2 region mapping names


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/c9ffae13
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c9ffae13
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c9ffae13

Branch: refs/heads/trunk
Commit: c9ffae13b9e1f28bd2488e4fbf7fa447a0b9668f
Parents: b5d6854
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Mon Mar 6 16:36:15 2017 -0800
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Mon Mar 6 16:36:15 2017 -0800

----------------------------------------------------------------------
 contrib/scrape-ec2-prices.py |   4 +-
 libcloud/data/pricing.json   | 131 +++++++++++++++++++++++++++++++-------
 2 files changed, 110 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/c9ffae13/contrib/scrape-ec2-prices.py
----------------------------------------------------------------------
diff --git a/contrib/scrape-ec2-prices.py b/contrib/scrape-ec2-prices.py
index 4f3ff9b..a4a12f9 100755
--- a/contrib/scrape-ec2-prices.py
+++ b/contrib/scrape-ec2-prices.py
@@ -110,12 +110,12 @@ EC2_INSTANCE_TYPES = [
 REGION_NAME_MAP = {
     'us-east': 'ec2_us_east',
     'us-east-1': 'ec2_us_east',
-    'us-east-2': 'ec2_us_east',
+    'us-east-2': 'ec2_us_east_ohio',
     '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-west-2': 'ec2_eu_west',
+    'eu-west-2': 'ec2_eu_west_2',
     'eu-ireland': 'ec2_eu_west',
     'eu-central-1': 'ec2_eu_central',
     'ca-central-1': 'ec2_ca_central',

http://git-wip-us.apache.org/repos/asf/libcloud/blob/c9ffae13/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index ba92fd6..bf6eecb 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -389,18 +389,18 @@
             "c3.2xlarge": 0.478,
             "c3.4xlarge": 0.956,
             "c3.8xlarge": 1.912,
-            "c4.large": 0.119,
-            "c4.xlarge": 0.237,
-            "c4.2xlarge": 0.476,
-            "c4.4xlarge": 0.95,
-            "c4.8xlarge": 1.902,
+            "c4.large": 0.113,
+            "c4.xlarge": 0.226,
+            "c4.2xlarge": 0.453,
+            "c4.4xlarge": 0.905,
+            "c4.8xlarge": 1.811,
             "cc2.8xlarge": 2.25,
             "cg1.4xlarge": 2.36,
             "cr1.8xlarge": 3.75,
-            "d2.xlarge": 0.772,
-            "d2.2xlarge": 1.544,
-            "d2.4xlarge": 3.087,
-            "d2.8xlarge": 6.174,
+            "d2.xlarge": 0.735,
+            "d2.2xlarge": 1.47,
+            "d2.4xlarge": 2.94,
+            "d2.8xlarge": 5.88,
             "g2.2xlarge": 0.702,
             "g2.8xlarge": 2.808,
             "hi1.4xlarge": 3.1,
@@ -409,12 +409,12 @@
             "i2.2xlarge": 1.876,
             "i2.4xlarge": 3.751,
             "i2.8xlarge": 7.502,
-            "i3.large": 0.181,
-            "i3.xlarge": 0.362,
-            "i3.2xlarge": 0.724,
-            "i3.4xlarge": 1.448,
-            "i3.8xlarge": 2.896,
-            "i3.16xlarge": 5.792,
+            "i3.large": 0.172,
+            "i3.xlarge": 0.344,
+            "i3.2xlarge": 0.688,
+            "i3.4xlarge": 1.376,
+            "i3.8xlarge": 2.752,
+            "i3.16xlarge": 5.504,
             "m1.small": 0.047,
             "m1.medium": 0.095,
             "m1.large": 0.19,
@@ -426,12 +426,12 @@
             "m3.large": 0.146,
             "m3.xlarge": 0.293,
             "m3.2xlarge": 0.585,
-            "m4.large": 0.125,
-            "m4.xlarge": 0.25,
-            "m4.2xlarge": 0.499,
-            "m4.4xlarge": 0.998,
-            "m4.10xlarge": 2.496,
-            "m4.16xlarge": 3.993,
+            "m4.large": 0.119,
+            "m4.xlarge": 0.238,
+            "m4.2xlarge": 0.475,
+            "m4.4xlarge": 0.95,
+            "m4.10xlarge": 2.377,
+            "m4.16xlarge": 3.803,
             "p2.xlarge": 0.972,
             "p2.8xlarge": 7.776,
             "p2.16xlarge": 15.552,
@@ -440,13 +440,51 @@
             "r3.2xlarge": 0.741,
             "r3.4xlarge": 1.482,
             "r3.8xlarge": 2.964,
+            "r4.large": 0.148,
+            "r4.xlarge": 0.296,
+            "r4.2xlarge": 0.593,
+            "r4.4xlarge": 1.186,
+            "r4.8xlarge": 2.371,
+            "r4.16xlarge": 4.742,
+            "t1.micro": 0.02,
+            "t2.micro": 0.013,
+            "t2.small": 0.025,
+            "t2.medium": 0.05,
+            "t2.large": 0.101,
+            "t2.xlarge": 0.202,
+            "t2.nano": 0.0063,
+            "t2.2xlarge": 0.404,
+            "x1.16xlarge": 8.003,
+            "x1.32xlarge": 16.006
+        },
+        "ec2_eu_west_2": {
+            "c4.large": 0.119,
+            "c4.xlarge": 0.237,
+            "c4.2xlarge": 0.476,
+            "c4.4xlarge": 0.95,
+            "c4.8xlarge": 1.902,
+            "d2.xlarge": 0.772,
+            "d2.2xlarge": 1.544,
+            "d2.4xlarge": 3.087,
+            "d2.8xlarge": 6.174,
+            "i3.large": 0.181,
+            "i3.xlarge": 0.362,
+            "i3.2xlarge": 0.724,
+            "i3.4xlarge": 1.448,
+            "i3.8xlarge": 2.896,
+            "i3.16xlarge": 5.792,
+            "m4.large": 0.125,
+            "m4.xlarge": 0.25,
+            "m4.2xlarge": 0.499,
+            "m4.4xlarge": 0.998,
+            "m4.10xlarge": 2.496,
+            "m4.16xlarge": 3.993,
             "r4.large": 0.156,
             "r4.xlarge": 0.312,
             "r4.2xlarge": 0.624,
             "r4.4xlarge": 1.248,
             "r4.8xlarge": 2.496,
             "r4.16xlarge": 4.992,
-            "t1.micro": 0.02,
             "t2.micro": 0.014,
             "t2.small": 0.026,
             "t2.medium": 0.052,
@@ -589,6 +627,53 @@
             "x1.16xlarge": 6.669,
             "x1.32xlarge": 13.338
         },
+        "ec2_us_east_ohio": {
+            "c4.large": 0.1,
+            "c4.xlarge": 0.199,
+            "c4.2xlarge": 0.398,
+            "c4.4xlarge": 0.796,
+            "c4.8xlarge": 1.591,
+            "d2.xlarge": 0.69,
+            "d2.2xlarge": 1.38,
+            "d2.4xlarge": 2.76,
+            "d2.8xlarge": 5.52,
+            "i2.xlarge": 0.853,
+            "i2.2xlarge": 1.705,
+            "i2.4xlarge": 3.41,
+            "i2.8xlarge": 6.82,
+            "i3.large": 0.156,
+            "i3.xlarge": 0.312,
+            "i3.2xlarge": 0.624,
+            "i3.4xlarge": 1.248,
+            "i3.8xlarge": 2.496,
+            "i3.16xlarge": 4.992,
+            "m4.large": 0.108,
+            "m4.xlarge": 0.215,
+            "m4.2xlarge": 0.431,
+            "m4.4xlarge": 0.862,
+            "m4.10xlarge": 2.155,
+            "m4.16xlarge": 3.447,
+            "r3.large": 0.166,
+            "r3.xlarge": 0.333,
+            "r3.2xlarge": 0.665,
+            "r3.4xlarge": 1.33,
+            "r3.8xlarge": 2.66,
+            "r4.large": 0.133,
+            "r4.xlarge": 0.266,
+            "r4.2xlarge": 0.532,
+            "r4.4xlarge": 1.064,
+            "r4.8xlarge": 2.128,
+            "r4.16xlarge": 4.256,
+            "t2.micro": 0.012,
+            "t2.small": 0.023,
+            "t2.medium": 0.047,
+            "t2.large": 0.094,
+            "t2.xlarge": 0.188,
+            "t2.nano": 0.0059,
+            "t2.2xlarge": 0.376,
+            "x1.16xlarge": 6.669,
+            "x1.32xlarge": 13.338
+        },
         "ec2_us_govwest": {
             "c1.medium": 0.157,
             "c1.xlarge": 0.628,
@@ -1288,5 +1373,5 @@
         }
     },
     "storage": {},
-    "updated": 1488413064
+    "updated": 1488846859
 }
\ No newline at end of file


Mime
View raw message