Repository: libcloud Updated Branches: refs/heads/trunk 7d5eb6fff -> 8a84929a2
Update libcloud/compute/constants.py with output of python contrib/scrap-ec2-sizes.py > libcloud/compute/constants.py Signed-off-by: Quentin Pradet <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1918f6c3 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1918f6c3 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1918f6c3 Branch: refs/heads/trunk Commit: 1918f6c3fa3b223995556fde5eca0f9b43e04adb Parents: 7d5eb6f Author: Ward Vandewege <[email protected]> Authored: Wed Sep 5 16:26:04 2018 -0400 Committer: Quentin Pradet <[email protected]> Committed: Thu Sep 13 09:51:57 2018 +0400 ---------------------------------------------------------------------- libcloud/compute/constants.py | 916 +++++++++++++++++++++++++++++++++++-- 1 file changed, 867 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/1918f6c3/libcloud/compute/constants.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/constants.py b/libcloud/compute/constants.py index d87f13c..8edc8be 100644 --- a/libcloud/compute/constants.py +++ b/libcloud/compute/constants.py @@ -2481,6 +2481,270 @@ INSTANCE_TYPES = { "name": "r4.xlarge", "ram": 31232 }, + "r5.12xlarge": { + "bandwidth": 10, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "173", + "instanceFamily": "Memory optimized", + "instanceType": "r5.12xlarge", + "memory": "384 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "96", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "48" + }, + "id": "r5.12xlarge", + "name": "r5.12xlarge", + "ram": 393216 + }, + "r5.24xlarge": { + "bandwidth": 25, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "345", + "instanceFamily": "Memory optimized", + "instanceType": "r5.24xlarge", + "memory": "768 GiB", + "networkPerformance": "25 Gigabit", + "normalizationSizeFactor": "192", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "96" + }, + "id": "r5.24xlarge", + "name": "r5.24xlarge", + "ram": 786432 + }, + "r5.2xlarge": { + "bandwidth": 10, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "31", + "instanceFamily": "Memory optimized", + "instanceType": "r5.2xlarge", + "memory": "64 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "16", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "8" + }, + "id": "r5.2xlarge", + "name": "r5.2xlarge", + "ram": 65536 + }, + "r5.4xlarge": { + "bandwidth": 10, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "60", + "instanceFamily": "Memory optimized", + "instanceType": "r5.4xlarge", + "memory": "128 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "32", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "16" + }, + "id": "r5.4xlarge", + "name": "r5.4xlarge", + "ram": 131072 + }, + "r5.large": { + "bandwidth": 10, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "8", + "instanceFamily": "Memory optimized", + "instanceType": "r5.large", + "memory": "16 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "4", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "2" + }, + "id": "r5.large", + "name": "r5.large", + "ram": 16384 + }, + "r5.xlarge": { + "bandwidth": 10, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "16", + "instanceFamily": "Memory optimized", + "instanceType": "r5.xlarge", + "memory": "32 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "8", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "4" + }, + "id": "r5.xlarge", + "name": "r5.xlarge", + "ram": 32768 + }, + "r5d.12xlarge": { + "bandwidth": 10, + "disk": 1800, + "extra": { + "currentGeneration": "Yes", + "ecu": "173", + "instanceFamily": "Memory optimized", + "instanceType": "r5d.12xlarge", + "memory": "384 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "96", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "2 x 900 NVMe SSD", + "vcpu": "48" + }, + "id": "r5d.12xlarge", + "name": "r5d.12xlarge", + "ram": 393216 + }, + "r5d.24xlarge": { + "bandwidth": 25, + "disk": 3600, + "extra": { + "currentGeneration": "Yes", + "ecu": "345", + "instanceFamily": "Memory optimized", + "instanceType": "r5d.24xlarge", + "memory": "768 GiB", + "networkPerformance": "25 Gigabit", + "normalizationSizeFactor": "192", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "4 x 900 NVMe SSD", + "vcpu": "96" + }, + "id": "r5d.24xlarge", + "name": "r5d.24xlarge", + "ram": 786432 + }, + "r5d.2xlarge": { + "bandwidth": 10, + "disk": 300, + "extra": { + "currentGeneration": "Yes", + "ecu": "31", + "instanceFamily": "Memory optimized", + "instanceType": "r5d.2xlarge", + "memory": "64 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "16", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "1 x 300 NVMe SSD", + "vcpu": "8" + }, + "id": "r5d.2xlarge", + "name": "r5d.2xlarge", + "ram": 65536 + }, + "r5d.4xlarge": { + "bandwidth": 10, + "disk": 600, + "extra": { + "currentGeneration": "Yes", + "ecu": "60", + "instanceFamily": "Memory optimized", + "instanceType": "r5d.4xlarge", + "memory": "128 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "32", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "2 x 300 NVMe SSD", + "vcpu": "16" + }, + "id": "r5d.4xlarge", + "name": "r5d.4xlarge", + "ram": 131072 + }, + "r5d.large": { + "bandwidth": 10, + "disk": 75, + "extra": { + "currentGeneration": "Yes", + "ecu": "8", + "instanceFamily": "Memory optimized", + "instanceType": "r5d.large", + "memory": "16 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "4", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "1 x 75 NVMe SSD", + "vcpu": "2" + }, + "id": "r5d.large", + "name": "r5d.large", + "ram": 16384 + }, + "r5d.xlarge": { + "bandwidth": 10, + "disk": 150, + "extra": { + "currentGeneration": "Yes", + "ecu": "16", + "instanceFamily": "Memory optimized", + "instanceType": "r5d.xlarge", + "memory": "32 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "8", + "physicalProcessor": "Intel Xeon Platinum 8175", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "1 x 150 NVMe SSD", + "vcpu": "4" + }, + "id": "r5d.xlarge", + "name": "r5d.xlarge", + "ram": 32768 + }, "t1.micro": { "bandwidth": None, "disk": 0, @@ -2563,112 +2827,266 @@ INSTANCE_TYPES = { "memory": "4 GiB", "networkPerformance": "Low to Moderate", "normalizationSizeFactor": "2", - "physicalProcessor": "Intel Xeon Family", - "processorArchitecture": "32-bit or 64-bit", - "processorFeatures": "Intel AVX; Intel Turbo", + "physicalProcessor": "Intel Xeon Family", + "processorArchitecture": "32-bit or 64-bit", + "processorFeatures": "Intel AVX; Intel Turbo", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "2" + }, + "id": "t2.medium", + "name": "t2.medium", + "ram": 4096 + }, + "t2.micro": { + "bandwidth": None, + "disk": 0, + "extra": { + "clockSpeed": "Up to 3.3 GHz", + "currentGeneration": "Yes", + "ecu": "Variable", + "instanceFamily": "General purpose", + "instanceType": "t2.micro", + "memory": "1 GiB", + "networkPerformance": "Low to Moderate", + "normalizationSizeFactor": "0.5", + "physicalProcessor": "Intel Xeon Family", + "processorArchitecture": "32-bit or 64-bit", + "processorFeatures": "Intel AVX; Intel Turbo", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "1" + }, + "id": "t2.micro", + "name": "t2.micro", + "ram": 1024 + }, + "t2.nano": { + "bandwidth": None, + "disk": 0, + "extra": { + "clockSpeed": "Up to 3.3 GHz", + "currentGeneration": "Yes", + "ecu": "Variable", + "instanceFamily": "General purpose", + "instanceType": "t2.nano", + "memory": "0.5 GiB", + "networkPerformance": "Low", + "normalizationSizeFactor": "0.25", + "physicalProcessor": "Intel Xeon Family", + "processorArchitecture": "32-bit or 64-bit", + "processorFeatures": "Intel AVX; Intel Turbo", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "1" + }, + "id": "t2.nano", + "name": "t2.nano", + "ram": 512 + }, + "t2.small": { + "bandwidth": None, + "disk": 0, + "extra": { + "clockSpeed": "Up to 3.3 GHz", + "currentGeneration": "Yes", + "ecu": "Variable", + "instanceFamily": "General purpose", + "instanceType": "t2.small", + "memory": "2 GiB", + "networkPerformance": "Low to Moderate", + "normalizationSizeFactor": "1", + "physicalProcessor": "Intel Xeon Family", + "processorArchitecture": "32-bit or 64-bit", + "processorFeatures": "Intel AVX; Intel Turbo", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "1" + }, + "id": "t2.small", + "name": "t2.small", + "ram": 2048 + }, + "t2.xlarge": { + "bandwidth": None, + "disk": 0, + "extra": { + "clockSpeed": "Up to 3.0 GHz", + "currentGeneration": "Yes", + "ecu": "Variable", + "instanceFamily": "General purpose", + "instanceType": "t2.xlarge", + "memory": "16 GiB", + "networkPerformance": "Moderate", + "normalizationSizeFactor": "8", + "physicalProcessor": "Intel Xeon Family", + "processorArchitecture": "64-bit", + "processorFeatures": "Intel AVX; Intel Turbo", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "4" + }, + "id": "t2.xlarge", + "name": "t2.xlarge", + "ram": 16384 + }, + "t3.2xlarge": { + "bandwidth": None, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "Variable", + "instanceFamily": "General purpose", + "instanceType": "t3.2xlarge", + "memory": "32 GiB", + "networkPerformance": "Moderate", + "normalizationSizeFactor": "16", + "physicalProcessor": "Intel Skylake E5 2686 v5 (2.5 GHz)", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "8" + }, + "id": "t3.2xlarge", + "name": "t3.2xlarge", + "ram": 32768 + }, + "t3.large": { + "bandwidth": None, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "Variable", + "instanceFamily": "General purpose", + "instanceType": "t3.large", + "memory": "8 GiB", + "networkPerformance": "Low to Moderate", + "normalizationSizeFactor": "4", + "physicalProcessor": "Intel Skylake E5 2686 v5 (2.5 GHz)", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "EBS only", + "vcpu": "2" + }, + "id": "t3.large", + "name": "t3.large", + "ram": 8192 + }, + "t3.medium": { + "bandwidth": None, + "disk": 0, + "extra": { + "currentGeneration": "Yes", + "ecu": "Variable", + "instanceFamily": "General purpose", + "instanceType": "t3.medium", + "memory": "4 GiB", + "networkPerformance": "Low to Moderate", + "normalizationSizeFactor": "2", + "physicalProcessor": "Intel Skylake E5 2686 v5 (2.5 GHz)", + "processorArchitecture": "64-bit", "servicecode": "AmazonEC2", "servicename": "Amazon Elastic Compute Cloud", "storage": "EBS only", "vcpu": "2" }, - "id": "t2.medium", - "name": "t2.medium", + "id": "t3.medium", + "name": "t3.medium", "ram": 4096 }, - "t2.micro": { + "t3.micro": { "bandwidth": None, "disk": 0, "extra": { - "clockSpeed": "Up to 3.3 GHz", "currentGeneration": "Yes", "ecu": "Variable", "instanceFamily": "General purpose", - "instanceType": "t2.micro", + "instanceType": "t3.micro", "memory": "1 GiB", "networkPerformance": "Low to Moderate", "normalizationSizeFactor": "0.5", - "physicalProcessor": "Intel Xeon Family", - "processorArchitecture": "32-bit or 64-bit", - "processorFeatures": "Intel AVX; Intel Turbo", + "physicalProcessor": "Intel Skylake E5 2686 v5 (2.5 GHz)", + "processorArchitecture": "64-bit", "servicecode": "AmazonEC2", "servicename": "Amazon Elastic Compute Cloud", "storage": "EBS only", - "vcpu": "1" + "vcpu": "2" }, - "id": "t2.micro", - "name": "t2.micro", + "id": "t3.micro", + "name": "t3.micro", "ram": 1024 }, - "t2.nano": { + "t3.nano": { "bandwidth": None, "disk": 0, "extra": { - "clockSpeed": "Up to 3.3 GHz", "currentGeneration": "Yes", "ecu": "Variable", "instanceFamily": "General purpose", - "instanceType": "t2.nano", + "instanceType": "t3.nano", "memory": "0.5 GiB", "networkPerformance": "Low", "normalizationSizeFactor": "0.25", - "physicalProcessor": "Intel Xeon Family", - "processorArchitecture": "32-bit or 64-bit", - "processorFeatures": "Intel AVX; Intel Turbo", + "physicalProcessor": "Intel Skylake E5 2686 v5 (2.5 GHz)", + "processorArchitecture": "64-bit", "servicecode": "AmazonEC2", "servicename": "Amazon Elastic Compute Cloud", "storage": "EBS only", - "vcpu": "1" + "vcpu": "2" }, - "id": "t2.nano", - "name": "t2.nano", + "id": "t3.nano", + "name": "t3.nano", "ram": 512 }, - "t2.small": { + "t3.small": { "bandwidth": None, "disk": 0, "extra": { - "clockSpeed": "Up to 3.3 GHz", "currentGeneration": "Yes", "ecu": "Variable", "instanceFamily": "General purpose", - "instanceType": "t2.small", + "instanceType": "t3.small", "memory": "2 GiB", "networkPerformance": "Low to Moderate", "normalizationSizeFactor": "1", - "physicalProcessor": "Intel Xeon Family", - "processorArchitecture": "32-bit or 64-bit", - "processorFeatures": "Intel AVX; Intel Turbo", + "physicalProcessor": "Intel Skylake E5 2686 v5 (2.5 GHz)", + "processorArchitecture": "64-bit", "servicecode": "AmazonEC2", "servicename": "Amazon Elastic Compute Cloud", "storage": "EBS only", - "vcpu": "1" + "vcpu": "2" }, - "id": "t2.small", - "name": "t2.small", + "id": "t3.small", + "name": "t3.small", "ram": 2048 }, - "t2.xlarge": { + "t3.xlarge": { "bandwidth": None, "disk": 0, "extra": { - "clockSpeed": "Up to 3.0 GHz", "currentGeneration": "Yes", "ecu": "Variable", "instanceFamily": "General purpose", - "instanceType": "t2.xlarge", + "instanceType": "t3.xlarge", "memory": "16 GiB", "networkPerformance": "Moderate", "normalizationSizeFactor": "8", - "physicalProcessor": "Intel Xeon Family", + "physicalProcessor": "Intel Skylake E5 2686 v5 (2.5 GHz)", "processorArchitecture": "64-bit", - "processorFeatures": "Intel AVX; Intel Turbo", "servicecode": "AmazonEC2", "servicename": "Amazon Elastic Compute Cloud", "storage": "EBS only", "vcpu": "4" }, - "id": "t2.xlarge", - "name": "t2.xlarge", + "id": "t3.xlarge", + "name": "t3.xlarge", "ram": 16384 }, "x1.16xlarge": { @@ -2895,6 +3313,138 @@ INSTANCE_TYPES = { "id": "x1e.xlarge", "name": "x1e.xlarge", "ram": 124928 + }, + "z1d.12xlarge": { + "bandwidth": 25, + "disk": 1800, + "extra": { + "currentGeneration": "Yes", + "ecu": "235", + "instanceFamily": "Memory optimized", + "instanceType": "z1d.12xlarge", + "memory": "384 GiB", + "networkPerformance": "25 Gigabit", + "normalizationSizeFactor": "96", + "physicalProcessor": "Intel Xeon Platinum 8151", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "2 x 900 NVMe SSD", + "vcpu": "48" + }, + "id": "z1d.12xlarge", + "name": "z1d.12xlarge", + "ram": 393216 + }, + "z1d.2xlarge": { + "bandwidth": 10, + "disk": 300, + "extra": { + "currentGeneration": "Yes", + "ecu": "43", + "instanceFamily": "Memory optimized", + "instanceType": "z1d.2xlarge", + "memory": "64 GiB", + "networkPerformance": "Up to 10 Gigabit", + "normalizationSizeFactor": "16", + "physicalProcessor": "Intel Xeon Platinum 8151", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "1 x 300 NVMe SSD", + "vcpu": "8" + }, + "id": "z1d.2xlarge", + "name": "z1d.2xlarge", + "ram": 65536 + }, + "z1d.3xlarge": { + "bandwidth": 10, + "disk": 450, + "extra": { + "currentGeneration": "Yes", + "ecu": "65", + "instanceFamily": "Memory optimized", + "instanceType": "z1d.3xlarge", + "memory": "96 GiB", + "networkPerformance": "Up to 10 Gigabit", + "normalizationSizeFactor": "24", + "physicalProcessor": "Intel Xeon Platinum 8151", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "1 x 450 NVMe SSD", + "vcpu": "12" + }, + "id": "z1d.3xlarge", + "name": "z1d.3xlarge", + "ram": 98304 + }, + "z1d.6xlarge": { + "bandwidth": 10, + "disk": 900, + "extra": { + "currentGeneration": "Yes", + "ecu": "128", + "instanceFamily": "Memory optimized", + "instanceType": "z1d.6xlarge", + "memory": "192 GiB", + "networkPerformance": "10 Gigabit", + "normalizationSizeFactor": "48", + "physicalProcessor": "Intel Xeon Platinum 8151", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "1 x 900 NVMe SSD", + "vcpu": "24" + }, + "id": "z1d.6xlarge", + "name": "z1d.6xlarge", + "ram": 196608 + }, + "z1d.large": { + "bandwidth": 10, + "disk": 75, + "extra": { + "currentGeneration": "Yes", + "ecu": "11", + "instanceFamily": "Memory optimized", + "instanceType": "z1d.large", + "memory": "16 GiB", + "networkPerformance": "Up to 10 Gigabit", + "normalizationSizeFactor": "4", + "physicalProcessor": "Intel Xeon Platinum 8151", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "1 x 75 NVMe SSD", + "vcpu": "2" + }, + "id": "z1d.large", + "name": "z1d.large", + "ram": 16384 + }, + "z1d.xlarge": { + "bandwidth": 10, + "disk": 150, + "extra": { + "currentGeneration": "Yes", + "ecu": "21", + "instanceFamily": "Memory optimized", + "instanceType": "z1d.xlarge", + "memory": "32 GiB", + "networkPerformance": "Up to 10 Gigabit", + "normalizationSizeFactor": "8", + "physicalProcessor": "Intel Xeon Platinum 8151", + "processorArchitecture": "64-bit", + "servicecode": "AmazonEC2", + "servicename": "Amazon Elastic Compute Cloud", + "storage": "1 x 150 NVMe SSD", + "vcpu": "4" + }, + "id": "z1d.xlarge", + "name": "z1d.xlarge", + "ram": 32768 } } REGION_DETAILS = { @@ -2922,6 +3472,12 @@ REGION_DETAILS = { "c5.9xlarge", "c5.large", "c5.xlarge", + "c5d.18xlarge", + "c5d.2xlarge", + "c5d.4xlarge", + "c5d.9xlarge", + "c5d.large", + "c5d.xlarge", "cc2.8xlarge", "cr1.8xlarge", "d2.2xlarge", @@ -2967,6 +3523,12 @@ REGION_DETAILS = { "m5.4xlarge", "m5.large", "m5.xlarge", + "m5d.12xlarge", + "m5d.24xlarge", + "m5d.2xlarge", + "m5d.4xlarge", + "m5d.large", + "m5d.xlarge", "p2.16xlarge", "p2.8xlarge", "p2.xlarge", @@ -2992,6 +3554,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge", "x1e.16xlarge", @@ -2999,7 +3568,13 @@ REGION_DETAILS = { "x1e.32xlarge", "x1e.4xlarge", "x1e.8xlarge", - "x1e.xlarge" + "x1e.xlarge", + "z1d.12xlarge", + "z1d.2xlarge", + "z1d.3xlarge", + "z1d.6xlarge", + "z1d.large", + "z1d.xlarge" ], "signature_version": "2" }, @@ -3025,6 +3600,12 @@ REGION_DETAILS = { "c5.9xlarge", "c5.large", "c5.xlarge", + "c5d.18xlarge", + "c5d.2xlarge", + "c5d.4xlarge", + "c5d.9xlarge", + "c5d.large", + "c5d.xlarge", "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", @@ -3057,6 +3638,12 @@ REGION_DETAILS = { "m5.4xlarge", "m5.large", "m5.xlarge", + "m5d.12xlarge", + "m5d.24xlarge", + "m5d.2xlarge", + "m5d.4xlarge", + "m5d.large", + "m5d.xlarge", "p2.16xlarge", "p2.8xlarge", "p2.xlarge", @@ -3236,6 +3823,12 @@ REGION_DETAILS = { "c5.9xlarge", "c5.large", "c5.xlarge", + "c5d.18xlarge", + "c5d.2xlarge", + "c5d.4xlarge", + "c5d.9xlarge", + "c5d.large", + "c5d.xlarge", "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", @@ -3279,9 +3872,18 @@ REGION_DETAILS = { "m5.4xlarge", "m5.large", "m5.xlarge", + "m5d.12xlarge", + "m5d.24xlarge", + "m5d.2xlarge", + "m5d.4xlarge", + "m5d.large", + "m5d.xlarge", "p2.16xlarge", "p2.8xlarge", "p2.xlarge", + "p3.16xlarge", + "p3.2xlarge", + "p3.8xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge", @@ -3301,8 +3903,21 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", - "x1.32xlarge" + "x1.32xlarge", + "z1d.12xlarge", + "z1d.2xlarge", + "z1d.3xlarge", + "z1d.6xlarge", + "z1d.large", + "z1d.xlarge" ], "signature_version": "2" }, @@ -3330,6 +3945,12 @@ REGION_DETAILS = { "c5.9xlarge", "c5.large", "c5.xlarge", + "c5d.18xlarge", + "c5d.2xlarge", + "c5d.4xlarge", + "c5d.9xlarge", + "c5d.large", + "c5d.xlarge", "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", @@ -3373,9 +3994,18 @@ REGION_DETAILS = { "m5.4xlarge", "m5.large", "m5.xlarge", + "m5d.12xlarge", + "m5d.24xlarge", + "m5d.2xlarge", + "m5d.4xlarge", + "m5d.large", + "m5d.xlarge", "p2.16xlarge", "p2.8xlarge", "p2.xlarge", + "p3.16xlarge", + "p3.2xlarge", + "p3.8xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge", @@ -3395,6 +4025,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge", "x1e.16xlarge", @@ -3457,6 +4094,9 @@ REGION_DETAILS = { "m5d.4xlarge", "m5d.large", "m5d.xlarge", + "p3.16xlarge", + "p3.2xlarge", + "p3.8xlarge", "r4.16xlarge", "r4.2xlarge", "r4.4xlarge", @@ -3470,6 +4110,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge" ], @@ -3513,6 +4160,12 @@ REGION_DETAILS = { "c5.9xlarge", "c5.large", "c5.xlarge", + "c5d.18xlarge", + "c5d.2xlarge", + "c5d.4xlarge", + "c5d.9xlarge", + "c5d.large", + "c5d.xlarge", "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", @@ -3548,9 +4201,18 @@ REGION_DETAILS = { "m5.4xlarge", "m5.large", "m5.xlarge", + "m5d.12xlarge", + "m5d.24xlarge", + "m5d.2xlarge", + "m5d.4xlarge", + "m5d.large", + "m5d.xlarge", "p2.16xlarge", "p2.8xlarge", "p2.xlarge", + "p3.16xlarge", + "p3.2xlarge", + "p3.8xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge", @@ -3569,6 +4231,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge", "x1e.16xlarge", @@ -3684,6 +4353,12 @@ REGION_DETAILS = { "r4.8xlarge", "r4.large", "r4.xlarge", + "r5.12xlarge", + "r5.24xlarge", + "r5.2xlarge", + "r5.4xlarge", + "r5.large", + "r5.xlarge", "t1.micro", "t2.2xlarge", "t2.large", @@ -3692,6 +4367,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge", "x1e.16xlarge", @@ -3699,7 +4381,13 @@ REGION_DETAILS = { "x1e.32xlarge", "x1e.4xlarge", "x1e.8xlarge", - "x1e.xlarge" + "x1e.xlarge", + "z1d.12xlarge", + "z1d.2xlarge", + "z1d.3xlarge", + "z1d.6xlarge", + "z1d.large", + "z1d.xlarge" ], "signature_version": "2" }, @@ -3720,14 +4408,16 @@ REGION_DETAILS = { "c5.9xlarge", "c5.large", "c5.xlarge", + "c5d.18xlarge", + "c5d.2xlarge", + "c5d.4xlarge", + "c5d.9xlarge", + "c5d.large", + "c5d.xlarge", "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", "d2.xlarge", - "i2.2xlarge", - "i2.4xlarge", - "i2.8xlarge", - "i2.xlarge", "i3.16xlarge", "i3.2xlarge", "i3.4xlarge", @@ -3746,6 +4436,15 @@ REGION_DETAILS = { "m5.4xlarge", "m5.large", "m5.xlarge", + "m5d.12xlarge", + "m5d.24xlarge", + "m5d.2xlarge", + "m5d.4xlarge", + "m5d.large", + "m5d.xlarge", + "p3.16xlarge", + "p3.2xlarge", + "p3.8xlarge", "r4.16xlarge", "r4.2xlarge", "r4.4xlarge", @@ -3759,6 +4458,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge" ], @@ -3770,6 +4476,11 @@ REGION_DETAILS = { "endpoint": "ec2.eu-west-3.amazonaws.com", "id": "eu-west-3", "instance_types": [ + "c4.2xlarge", + "c4.4xlarge", + "c4.8xlarge", + "c4.large", + "c4.xlarge", "c5.18xlarge", "c5.2xlarge", "c5.4xlarge", @@ -3786,6 +4497,12 @@ REGION_DETAILS = { "i3.8xlarge", "i3.large", "i3.xlarge", + "m4.10xlarge", + "m4.16xlarge", + "m4.2xlarge", + "m4.4xlarge", + "m4.large", + "m4.xlarge", "m5.12xlarge", "m5.24xlarge", "m5.2xlarge", @@ -3892,6 +4609,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge" ], @@ -4001,6 +4725,18 @@ REGION_DETAILS = { "r4.8xlarge", "r4.large", "r4.xlarge", + "r5.12xlarge", + "r5.24xlarge", + "r5.2xlarge", + "r5.4xlarge", + "r5.large", + "r5.xlarge", + "r5d.12xlarge", + "r5d.24xlarge", + "r5d.2xlarge", + "r5d.4xlarge", + "r5d.large", + "r5d.xlarge", "t1.micro", "t2.2xlarge", "t2.large", @@ -4009,6 +4745,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge", "x1e.16xlarge", @@ -4016,7 +4759,13 @@ REGION_DETAILS = { "x1e.32xlarge", "x1e.4xlarge", "x1e.8xlarge", - "x1e.xlarge" + "x1e.xlarge", + "z1d.12xlarge", + "z1d.2xlarge", + "z1d.3xlarge", + "z1d.6xlarge", + "z1d.large", + "z1d.xlarge" ], "signature_version": "2" }, @@ -4099,6 +4848,18 @@ REGION_DETAILS = { "r4.8xlarge", "r4.large", "r4.xlarge", + "r5.12xlarge", + "r5.24xlarge", + "r5.2xlarge", + "r5.4xlarge", + "r5.large", + "r5.xlarge", + "r5d.12xlarge", + "r5d.24xlarge", + "r5d.2xlarge", + "r5d.4xlarge", + "r5d.large", + "r5d.xlarge", "t2.2xlarge", "t2.large", "t2.medium", @@ -4106,6 +4867,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge" ], @@ -4239,6 +5007,12 @@ REGION_DETAILS = { "c5.9xlarge", "c5.large", "c5.xlarge", + "c5d.18xlarge", + "c5d.2xlarge", + "c5d.4xlarge", + "c5d.9xlarge", + "c5d.large", + "c5d.xlarge", "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", @@ -4281,6 +5055,12 @@ REGION_DETAILS = { "m5.4xlarge", "m5.large", "m5.xlarge", + "m5d.12xlarge", + "m5d.24xlarge", + "m5d.2xlarge", + "m5d.4xlarge", + "m5d.large", + "m5d.xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge", @@ -4299,7 +5079,20 @@ REGION_DETAILS = { "t2.micro", "t2.nano", "t2.small", - "t2.xlarge" + "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", + "z1d.12xlarge", + "z1d.2xlarge", + "z1d.3xlarge", + "z1d.6xlarge", + "z1d.large", + "z1d.xlarge" ], "signature_version": "2" }, @@ -4407,6 +5200,18 @@ REGION_DETAILS = { "r4.8xlarge", "r4.large", "r4.xlarge", + "r5.12xlarge", + "r5.24xlarge", + "r5.2xlarge", + "r5.4xlarge", + "r5.large", + "r5.xlarge", + "r5d.12xlarge", + "r5d.24xlarge", + "r5d.2xlarge", + "r5d.4xlarge", + "r5d.large", + "r5d.xlarge", "t1.micro", "t2.2xlarge", "t2.large", @@ -4415,6 +5220,13 @@ REGION_DETAILS = { "t2.nano", "t2.small", "t2.xlarge", + "t3.2xlarge", + "t3.large", + "t3.medium", + "t3.micro", + "t3.nano", + "t3.small", + "t3.xlarge", "x1.16xlarge", "x1.32xlarge", "x1e.16xlarge", @@ -4422,7 +5234,13 @@ REGION_DETAILS = { "x1e.32xlarge", "x1e.4xlarge", "x1e.8xlarge", - "x1e.xlarge" + "x1e.xlarge", + "z1d.12xlarge", + "z1d.2xlarge", + "z1d.3xlarge", + "z1d.6xlarge", + "z1d.large", + "z1d.xlarge" ], "signature_version": "2" }
