From 5d6c5fbaae170c999a7426302c2d9a243427e89a Mon Sep 17 00:00:00 2001
From: Matthew Tyas <matthewtyas@Matthews-MacBook-Air.local>
Date: Wed, 21 Dec 2016 17:12:51 +0000
Subject: [PATCH] Adding m4 instances to us-gov and brazil, m4.16xlarge to all
 regions

---
 libcloud/compute/drivers/ec2.py   | 33 +++++++++++++++++++++++++++++++
 libcloud/test/compute/test_ec2.py | 14 +++++++------
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index e38dcf3296..26656eb7ee 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -284,6 +284,16 @@ def GiB(value):
             'cpu': 40
         }
     },
+    'm4.16xlarge': {
+        'id': 'm4.16xlarge',
+        'name': '16 Extra Large Instance',
+        'ram': GiB(256),
+        'disk': 0,  # EBS only
+        'bandwidth': None,
+        'extra': {
+            'cpu': 64
+        }
+    },
     'cg1.4xlarge': {
         'id': 'cg1.4xlarge',
         'name': 'Cluster GPU Quadruple Extra Large Instance',
@@ -683,6 +693,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             'cc2.8xlarge',
@@ -746,6 +757,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             'g2.2xlarge',
@@ -800,6 +812,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             'cc2.8xlarge',
@@ -863,6 +876,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             'g2.2xlarge',
@@ -924,6 +938,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             'g2.2xlarge',
@@ -986,6 +1001,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c3.8xlarge',
             'i2.xlarge',
             'i2.2xlarge',
@@ -1024,6 +1040,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c4.large',
             'c4.xlarge',
             'c4.2xlarge',
@@ -1068,6 +1085,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             'c3.large',
@@ -1135,6 +1153,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'hs1.8xlarge',
             'i2.xlarge',
             'i2.2xlarge',
@@ -1174,6 +1193,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'i2.xlarge',
             'i2.2xlarge',
             'i2.4xlarge',
@@ -1214,6 +1234,12 @@ def GiB(value):
             'm3.large',
             'm3.xlarge',
             'm3.2xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             't2.nano',
@@ -1247,6 +1273,7 @@ def GiB(value):
             'm4.2xlarge',
             'm4.4xlarge',
             'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             'c3.large',
@@ -1298,6 +1325,12 @@ def GiB(value):
             'm3.large',
             'm3.xlarge',
             'm3.2xlarge',
+            'm4.large',
+            'm4.xlarge',
+            'm4.2xlarge',
+            'm4.4xlarge',
+            'm4.10xlarge',
+            'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
             'g2.2xlarge',
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index 466c0df27d..aceb05bfbf 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -429,21 +429,23 @@ def test_list_sizes(self):
                 self.assertTrue('m2.4xlarge' in ids)
 
             if region_name == 'us-east-1':
-                self.assertEqual(len(sizes), 54)
+                self.assertEqual(len(sizes), 55)
                 self.assertTrue('cg1.4xlarge' in ids)
                 self.assertTrue('cc2.8xlarge' in ids)
                 self.assertTrue('cr1.8xlarge' in ids)
                 self.assertTrue('x1.32xlarge' in ids)
             elif region_name == 'us-west-1':
-                self.assertEqual(len(sizes), 45)
+                self.assertEqual(len(sizes), 46)
             if region_name == 'us-west-2':
-                self.assertEqual(len(sizes), 52)
+                self.assertEqual(len(sizes), 53)
             elif region_name == 'ap-southeast-1':
-                self.assertEqual(len(sizes), 44)
+                self.assertEqual(len(sizes), 45)
             elif region_name == 'ap-southeast-2':
-                self.assertEqual(len(sizes), 48)
+                self.assertEqual(len(sizes), 49)
             elif region_name == 'eu-west-1':
-                self.assertEqual(len(sizes), 52)
+                self.assertEqual(len(sizes), 53)
+            elif region_name == 'ap-south-1':
+                self.assertEqual(len(sizes), 29)
 
         self.driver.region_name = region_old