Skip to content

Commit

Permalink
[#4914]: Add support for c5d instance types
Browse files Browse the repository at this point in the history
Summary: Yugaware should now allow universe creation on c5d type machines.

Test Plan:
Verified that c5d instance type machines show up when selecting instance to deploy an AWS
universe.

Reviewers: wesley, ram, sudheer

Reviewed By: sudheer

Subscribers: jenkins-bot, sudheer, yugaware

Differential Revision: https://phabricator.dev.yugabyte.com/D8769
  • Loading branch information
Arnav15 committed Jun 29, 2020
1 parent dfd1a66 commit e375c7b
Show file tree
Hide file tree
Showing 25 changed files with 10,239 additions and 551 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class InstanceType extends Model {
public static final Logger LOG = LoggerFactory.getLogger(InstanceType.class);

public static List<String> AWS_INSTANCE_PREFIXES_SUPPORTED = ImmutableList.of(
"m3.", "c5.", "c4.", "c3.", "i3.");
"m3.", "c5.", "c5d.", "c4.", "c3.", "i3.");

public enum VolumeType {
@EnumValue("EBS")
Expand Down
360 changes: 348 additions & 12 deletions managed/src/main/resources/aws_pricing/ap-east-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/ap-northeast-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/ap-northeast-2

Large diffs are not rendered by default.

370 changes: 353 additions & 17 deletions managed/src/main/resources/aws_pricing/ap-northeast-3

Large diffs are not rendered by default.

374 changes: 355 additions & 19 deletions managed/src/main/resources/aws_pricing/ap-south-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/ap-southeast-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/ap-southeast-2

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/ca-central-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/eu-central-1

Large diffs are not rendered by default.

476 changes: 462 additions & 14 deletions managed/src/main/resources/aws_pricing/eu-north-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/eu-west-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/eu-west-2

Large diffs are not rendered by default.

364 changes: 350 additions & 14 deletions managed/src/main/resources/aws_pricing/eu-west-3

Large diffs are not rendered by default.

472 changes: 460 additions & 12 deletions managed/src/main/resources/aws_pricing/me-south-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/sa-east-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/us-east-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/us-east-2

Large diffs are not rendered by default.

364 changes: 350 additions & 14 deletions managed/src/main/resources/aws_pricing/us-gov-east-1

Large diffs are not rendered by default.

1,670 changes: 1,479 additions & 191 deletions managed/src/main/resources/aws_pricing/us-gov-west-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/us-west-1

Large diffs are not rendered by default.

486 changes: 467 additions & 19 deletions managed/src/main/resources/aws_pricing/us-west-2

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions managed/src/main/resources/aws_pricing/us-west-2-lax-1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"4GXUH8YANS3QKBCF.JRTCKXETXF": {
"offerTermCode": "JRTCKXETXF",
"sku": "4GXUH8YANS3QKBCF",
"effectiveDate": "2020-03-01T00:00:00Z",
"effectiveDate": "2020-06-01T00:00:00Z",
"priceDimensions": {
"4GXUH8YANS3QKBCF.JRTCKXETXF.6YS6EN2CT7": {
"rateCode": "4GXUH8YANS3QKBCF.JRTCKXETXF.6YS6EN2CT7",
Expand All @@ -26,7 +26,7 @@
"CSB9PRYWS5B4THNR.JRTCKXETXF": {
"offerTermCode": "JRTCKXETXF",
"sku": "CSB9PRYWS5B4THNR",
"effectiveDate": "2020-03-01T00:00:00Z",
"effectiveDate": "2020-06-01T00:00:00Z",
"priceDimensions": {
"CSB9PRYWS5B4THNR.JRTCKXETXF.6YS6EN2CT7": {
"rateCode": "CSB9PRYWS5B4THNR.JRTCKXETXF.6YS6EN2CT7",
Expand All @@ -47,7 +47,7 @@
"UWC5W5GDVAWS5BQ8.JRTCKXETXF": {
"offerTermCode": "JRTCKXETXF",
"sku": "UWC5W5GDVAWS5BQ8",
"effectiveDate": "2020-03-01T00:00:00Z",
"effectiveDate": "2020-06-01T00:00:00Z",
"priceDimensions": {
"UWC5W5GDVAWS5BQ8.JRTCKXETXF.6YS6EN2CT7": {
"rateCode": "UWC5W5GDVAWS5BQ8.JRTCKXETXF.6YS6EN2CT7",
Expand All @@ -68,7 +68,7 @@
"HRVK8R78SX7PJCX9.JRTCKXETXF": {
"offerTermCode": "JRTCKXETXF",
"sku": "HRVK8R78SX7PJCX9",
"effectiveDate": "2020-03-01T00:00:00Z",
"effectiveDate": "2020-06-01T00:00:00Z",
"priceDimensions": {
"HRVK8R78SX7PJCX9.JRTCKXETXF.6YS6EN2CT7": {
"rateCode": "HRVK8R78SX7PJCX9.JRTCKXETXF.6YS6EN2CT7",
Expand All @@ -89,7 +89,7 @@
"7DKM4U3HAX3NDEZR.JRTCKXETXF": {
"offerTermCode": "JRTCKXETXF",
"sku": "7DKM4U3HAX3NDEZR",
"effectiveDate": "2020-03-01T00:00:00Z",
"effectiveDate": "2020-06-01T00:00:00Z",
"priceDimensions": {
"7DKM4U3HAX3NDEZR.JRTCKXETXF.6YS6EN2CT7": {
"rateCode": "7DKM4U3HAX3NDEZR.JRTCKXETXF.6YS6EN2CT7",
Expand All @@ -110,7 +110,7 @@
"MUQU4PTNHRJC57XK.JRTCKXETXF": {
"offerTermCode": "JRTCKXETXF",
"sku": "MUQU4PTNHRJC57XK",
"effectiveDate": "2020-03-01T00:00:00Z",
"effectiveDate": "2020-06-01T00:00:00Z",
"priceDimensions": {
"MUQU4PTNHRJC57XK.JRTCKXETXF.6YS6EN2CT7": {
"rateCode": "MUQU4PTNHRJC57XK.JRTCKXETXF.6YS6EN2CT7",
Expand All @@ -131,7 +131,7 @@
"BUGQGA29BS5THA3B.JRTCKXETXF": {
"offerTermCode": "JRTCKXETXF",
"sku": "BUGQGA29BS5THA3B",
"effectiveDate": "2020-03-01T00:00:00Z",
"effectiveDate": "2020-06-01T00:00:00Z",
"priceDimensions": {
"BUGQGA29BS5THA3B.JRTCKXETXF.6YS6EN2CT7": {
"rateCode": "BUGQGA29BS5THA3B.JRTCKXETXF.6YS6EN2CT7",
Expand All @@ -152,7 +152,7 @@
"3DAJDC94YXPVAA63.JRTCKXETXF": {
"offerTermCode": "JRTCKXETXF",
"sku": "3DAJDC94YXPVAA63",
"effectiveDate": "2020-03-01T00:00:00Z",
"effectiveDate": "2020-06-01T00:00:00Z",
"priceDimensions": {
"3DAJDC94YXPVAA63.JRTCKXETXF.6YS6EN2CT7": {
"rateCode": "3DAJDC94YXPVAA63.JRTCKXETXF.6YS6EN2CT7",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"date": "2020-03-23"
"date": "2020-06-30"
}
2 changes: 1 addition & 1 deletion managed/utils/retrieve_aws_prices.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

BASE_PRICING_URL = "https://pricing.us-east-1.amazonaws.com"
REGION_INDEX_URL = BASE_PRICING_URL + "/offers/v1.0/aws/AmazonEC2/current/region_index.json"
SUPPORTED_TYPES = ["m3.", "c5.", "c4.", "c3.", "i3."]
SUPPORTED_TYPES = ["m3.", "c5.", "c4.", "c5d.", "c3.", "i3."]
TARGET_DIRECTORY = os.path.expanduser('')
YW_DIR = os.path.abspath(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
AWS_PRICE_DIR = os.path.join(YW_DIR, "src/main/resources/aws_pricing")
Expand Down

0 comments on commit e375c7b

Please sign in to comment.