libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthonys...@apache.org
Subject [1/3] libcloud git commit: adding m4 pricing and information
Date Wed, 18 Nov 2015 22:42:28 GMT
Repository: libcloud
Updated Branches:
  refs/heads/trunk 8abaf891c -> f13b236ef


adding m4 pricing and information

Signed-off-by: Anthony Shaw <anthony.p.shaw@gmail.com>


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

Branch: refs/heads/trunk
Commit: 9753b510898d64073e8c74936893a873f35a6eb3
Parents: 8abaf89
Author: Benjamin Zaitlen <quasiben@gmail.com>
Authored: Mon Nov 16 10:05:41 2015 -0500
Committer: Anthony Shaw <anthony.p.shaw@gmail.com>
Committed: Thu Nov 19 06:38:34 2015 +0800

----------------------------------------------------------------------
 libcloud/compute/drivers/ec2.py | 75 ++++++++++++++++++++++++++++++++++++
 libcloud/data/pricing.json      | 42 +++++++++++++++++++-
 2 files changed, 116 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/9753b510/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 77d9686..312ec44 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -189,6 +189,41 @@ INSTANCE_TYPES = {
         'disk': 160000,
         'bandwidth': None
     },
+    'm4.large': {
+        'id': 'm4.large',
+        'name': 'Large Instance',
+        'ram': 8192,
+        'disk': 0,
+        'bandwidth': None
+    },
+    'm4.xlarge': {
+        'id': 'm4.xlarge',
+        'name': 'Extra Large Instance',
+        'ram': 16384,
+        'disk': 0,
+        'bandwidth': None
+    },
+    'm4.2xlarge': {
+        'id': 'm4.2xlarge',
+        'name': 'Double Extra Large Instance',
+        'ram': 32768,
+        'disk': 0,
+        'bandwidth': None
+    },
+    'm4.4xlarge': {
+        'id': 'm4.4xlarge',
+        'name': 'Quadruple Extra Large Instance',
+        'ram': 65536,
+        'disk': 0,
+        'bandwidth': None
+    },
+    'm4.10xlarge': {
+        'id': 'm4.10xlarge',
+        'name': '10 Extra Large Instance',
+        'ram': 163840,
+        'disk': 0,
+        'bandwidth': None
+    },
     'cg1.4xlarge': {
         'id': 'cg1.4xlarge',
         'name': 'Cluster GPU Quadruple Extra Large Instance',
@@ -420,6 +455,11 @@ REGION_DETAILS = {
             'm3.large',
             'm3.xlarge',
             'm3.2xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
             'c1.medium',
             'c1.xlarge',
             'cc2.8xlarge',
@@ -469,6 +509,11 @@ REGION_DETAILS = {
             'm3.large',
             'm3.xlarge',
             'm3.2xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
             'c1.medium',
             'c1.xlarge',
             'g2.2xlarge',
@@ -510,6 +555,11 @@ REGION_DETAILS = {
             'm3.large',
             'm3.xlarge',
             'm3.2xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
             'c1.medium',
             'c1.xlarge',
             'g2.2xlarge',
@@ -557,6 +607,11 @@ REGION_DETAILS = {
             'm3.large',
             'm3.xlarge',
             'm3.2xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
             'c1.medium',
             'c1.xlarge',
             'g2.2xlarge',
@@ -600,6 +655,11 @@ REGION_DETAILS = {
             'c3.xlarge',
             'c3.2xlarge',
             'c3.4xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
             'c3.8xlarge',
             'i2.xlarge',
             'i2.2xlarge',
@@ -638,6 +698,11 @@ REGION_DETAILS = {
             'm3.large',
             'm3.xlarge',
             'm3.2xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
             'c1.medium',
             'c1.xlarge',
             'c3.large',
@@ -686,6 +751,11 @@ REGION_DETAILS = {
             'c3.2xlarge',
             'c3.4xlarge',
             'c3.8xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
             'hs1.8xlarge',
             'i2.xlarge',
             'i2.2xlarge',
@@ -750,6 +820,11 @@ REGION_DETAILS = {
             'm3.large',
             'm3.xlarge',
             'm3.2xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
             'c1.medium',
             'c1.xlarge',
             'c3.large',

http://git-wip-us.apache.org/repos/asf/libcloud/blob/9753b510/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index 5cb17e3..e173999 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -72,6 +72,11 @@
             "m3.large": "0.203",
             "m3.medium": "0.101",
             "m3.xlarge": "0.405",
+            "m4.large": "0.183",
+            "m4.xlarge": "0.366",
+            "m4.2xlarge": "0.732",
+            "m4.4xlarge": "1.464",
+            "m4.10xlarge": "3.660",
             "r3.2xlarge": "0.840",
             "r3.4xlarge": "1.680",
             "r3.8xlarge": "3.360",
@@ -117,6 +122,11 @@
             "m3.large": "0.196",
             "m3.medium": "0.098",
             "m3.xlarge": "0.392",
+            "m4.large": "0.131",
+            "m4.xlarge": "0.262",
+            "m4.2xlarge": "0.524",
+            "m4.4xlarge": "1.048",
+            "m4.10xlarge": "2.621",
             "r3.2xlarge": "0.840",
             "r3.4xlarge": "1.680",
             "r3.8xlarge": "3.360",
@@ -162,6 +172,11 @@
             "m3.large": "0.196",
             "m3.medium": "0.098",
             "m3.xlarge": "0.392",
+            "m4.large": "0.125",
+            "m4.xlarge": "0.250",
+            "m4.2xlarge": "0.501",
+            "m4.4xlarge": "1.002",
+            "m4.10xlarge": "2.504",
             "r3.2xlarge": "0.840",
             "r3.4xlarge": "1.680",
             "r3.8xlarge": "3.360",
@@ -196,6 +211,11 @@
             "m3.large": "0.166",
             "m3.medium": "0.083",
             "m3.xlarge": "0.332",
+            "m4.large": "0.150",
+            "m4.xlarge": "0.300",
+            "m4.2xlarge": "0.600",
+            "m4.4xlarge": "1.200",
+            "m4.10xlarge": "3.000",
             "r3.2xlarge": "0.842",
             "r3.4xlarge": "1.684",
             "r3.8xlarge": "3.369",
@@ -243,6 +263,11 @@
             "m3.large": "0.154",
             "m3.medium": "0.077",
             "m3.xlarge": "0.308",
+            "m4.large": "0.139",
+            "m4.xlarge": "0.278",
+            "m4.2xlarge": "0.556",
+            "m4.4xlarge": "1.112",
+            "m4.10xlarge": "2.780",
             "r3.2xlarge": "0.780",
             "r3.4xlarge": "1.560",
             "r3.8xlarge": "3.120",
@@ -317,6 +342,11 @@
             "m3.large": "0.140",
             "m3.medium": "0.070",
             "m3.xlarge": "0.280",
+            "m4.large": "0.126",
+            "m4.xlarge": "0.252",
+            "m4.2xlarge": "0.504",
+            "m4.4xlarge": "1.008",
+            "m4.10xlarge": "2.520",
             "r3.2xlarge": "0.700",
             "r3.4xlarge": "1.400",
             "r3.8xlarge": "2.800",
@@ -394,6 +424,11 @@
             "m3.large": "0.154",
             "m3.medium": "0.077",
             "m3.xlarge": "0.308",
+            "m4.large": "0.147",
+            "m4.xlarge": "0.294",
+            "m4.2xlarge": "0.588",
+            "m4.4xlarge": "1.176",
+            "m4.10xlarge": "2.940",
             "r3.2xlarge": "0.780",
             "r3.4xlarge": "1.560",
             "r3.8xlarge": "3.120",
@@ -441,6 +476,11 @@
             "m3.large": "0.140",
             "m3.medium": "0.070",
             "m3.xlarge": "0.280",
+            "m4.large": "0.126",
+            "m4.xlarge": "0.252",
+            "m4.2xlarge": "0.504",
+            "m4.4xlarge": "1.008",
+            "m4.10xlarge": "2.520",
             "r3.2xlarge": "0.700",
             "r3.4xlarge": "1.400",
             "r3.8xlarge": "2.800",
@@ -851,4 +891,4 @@
     },
     "storage": {},
     "updated": 1447082902
-}
\ No newline at end of file
+}


Mime
View raw message