Commit e79abed5 by diegolima

Não remover DB- dos prefixos do nome no Google

1 parent 43227420
......@@ -46,10 +46,10 @@ elif PRODUCT_TYPE == 'database':
CATALOG = 'https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonRDS/current/index.json'
PRODUCT_FAMILY = 'Database Instance'
#with urllib.request.urlopen(CATALOG) as url:
# DATA = json.loads(url.read().decode())
with open(FCATALOG) as url:
DATA = json.load(url)
with urllib.request.urlopen(CATALOG) as url:
DATA = json.loads(url.read().decode())
#with open(FCATALOG) as url:
# DATA = json.load(url)
for product in DATA["products"]:
if DATA['products'][product]['productFamily'] == PRODUCT_FAMILY:
sku = DATA['products'][product]['sku']
......
......@@ -6,11 +6,11 @@ import sys
PRODUCT_TYPE = 'compute'
if PRODUCT_TYPE == 'compute':
FCATALOG = 'examples/azure.json'
CATALOG = 'https://azure.microsoft.com/api/v1/pricing/virtual-machines/calculator/?culture=en-us'
CATALOG = 'https://azure.microsoft.com/api/v2/pricing/virtual-machines-base/calculator/?culture=pt-br&discount=mosp'
PRODUCT_FAMILY = 'Compute Instance'
elif PRODUCT_TYPE == 'database':
FCATALOG = 'examples/azure.json'
CATALOG = 'https://azure.microsoft.com/api/v1/pricing/virtual-machines/calculator/?culture=en-us'
CATALOG = 'https://azure.microsoft.com/api/v2/pricing/virtual-machines-base/calculator/?culture=pt-br&discount=mosp'
PRODUCT_FAMILY = 'Database Instance'
OSLIST = [
......
{
"comment": "If you've gotten here by mistake, this is the JSON data used by our pricing calculator. It is helpful for developers. Go to https://cloud.google.com/products/calculator/ to get back to our web calculator.",
"version": "v1.15",
"updated": "27-September-2017",
"version": "v1.22",
"updated": "10-January-2018",
"gcp_price_list": {
"sustained_use_base": 0.25,
"sustained_use_tiers": {
......@@ -20,6 +20,8 @@
"europe-west1": 0.0086,
"europe-west2": 0.0096,
"europe-west3": 0.0096,
"europe-west4": 0.0084,
"northamerica-northeast1": 0.0084,
"asia": 0.0090,
"asia-east": 0.0090,
"asia-northeast": 0.0092,
......@@ -27,6 +29,7 @@
"australia-southeast1": 0.0106,
"australia": 0.0106,
"southamerica-east1": 0.0118,
"asia-south1": 0.0091,
"cores": "shared",
"memory": "0.6",
"gceu": "Shared CPU, not guaranteed",
......@@ -44,6 +47,8 @@
"europe-west1": 0.0285,
"europe-west2": 0.0324,
"europe-west3": 0.0324,
"europe-west4": 0.0283,
"northamerica-northeast1": 0.0283,
"asia": 0.030,
"asia-east": 0.030,
"asia-northeast": 0.0322,
......@@ -51,6 +56,7 @@
"australia-southeast1": 0.0357,
"australia": 0.0357,
"southamerica-east1": 0.0400,
"asia-south1": 0.0308,
"cores": "shared",
"memory": "1.7",
"gceu": 1.38,
......@@ -68,6 +74,8 @@
"europe-west1": 0.0523,
"europe-west2": 0.0612,
"europe-west3": 0.0612,
"europe-west4": 0.0523,
"northamerica-northeast1": 0.0523,
"asia": 0.055,
"asia-east": 0.055,
"asia-northeast": 0.0610,
......@@ -75,6 +83,7 @@
"australia-southeast1": 0.0674,
"australia": 0.0674,
"southamerica-east1": 0.0754,
"asia-south1": 0.0570,
"cores": "1",
"memory": "3.75",
"gceu": 2.75,
......@@ -92,6 +101,8 @@
"europe-west1": 0.1046,
"europe-west2": 0.1224,
"europe-west3": 0.1224,
"europe-west4": 0.1046,
"northamerica-northeast1": 0.1046,
"asia": 0.110,
"asia-east": 0.110,
"asia-northeast": 0.1220,
......@@ -99,6 +110,7 @@
"australia-southeast1": 0.1348,
"australia": 0.1348,
"southamerica-east1": 0.1508,
"asia-south1": 0.1141,
"cores": "2",
"memory": "7.5",
"gceu": 5.50,
......@@ -116,6 +128,8 @@
"europe-west1": 0.2092,
"europe-west2": 0.2448,
"europe-west3": 0.2448,
"europe-west4": 0.2092,
"northamerica-northeast1": 0.2092,
"asia": 0.220,
"asia-east": 0.220,
"asia-northeast": 0.2440,
......@@ -123,6 +137,7 @@
"australia-southeast1": 0.2697,
"australia": 0.2697,
"southamerica-east1": 0.3017,
"asia-south1": 0.2282,
"cores": "4",
"memory": "15",
"gceu": 11,
......@@ -140,6 +155,8 @@
"europe-west1": 0.4184,
"europe-west2": 0.4896,
"europe-west3": 0.4896,
"europe-west4": 0.4184,
"northamerica-northeast1": 0.4184,
"asia": 0.440,
"asia-east": 0.440,
"asia-northeast": 0.4880,
......@@ -147,6 +164,7 @@
"australia-southeast1": 0.5393,
"australia": 0.5393,
"southamerica-east1": 0.6034,
"asia-south1": 0.4564,
"cores": "8",
"memory": "30",
"gceu": 22,
......@@ -164,6 +182,8 @@
"europe-west1": 0.8368,
"europe-west2": 0.9792,
"europe-west3": 0.9792,
"europe-west4": 0.8368,
"northamerica-northeast1": 0.8368,
"asia": 0.880,
"asia-east": 0.880,
"asia-northeast": 0.9760,
......@@ -171,6 +191,7 @@
"australia-southeast1":1.0787,
"australia":1.0787,
"southamerica-east1": 1.2068,
"asia-south1": 0.9127,
"cores": "16",
"memory": "60",
"gceu": 44,
......@@ -188,6 +209,8 @@
"europe-west1": 1.6736,
"europe-west2": 1.9584,
"europe-west3": 1.9584,
"europe-west4": 1.6736,
"northamerica-northeast1": 1.6736,
"asia": 1.760,
"asia-east": 1.760,
"asia-northeast": 1.9520,
......@@ -195,6 +218,7 @@
"australia-southeast1":2.1574,
"australia":2.1574,
"southamerica-east1": 2.4136,
"asia-south1": 1.8255,
"cores": "32",
"memory": "120",
"gceu": 88,
......@@ -212,6 +236,8 @@
"europe-west1": 3.3472,
"europe-west2": 3.9168,
"europe-west3": 3.9168,
"europe-west4": 3.3472,
"northamerica-northeast1": 3.3472,
"asia": 3.520,
"asia-east": 3.520,
"asia-northeast": 3.9040,
......@@ -219,6 +245,7 @@
"australia-southeast1":4.3147,
"australia":4.3147,
"southamerica-east1": 4.8271,
"asia-south1": 3.6510,
"cores": "64",
"memory": "240",
"gceu": 176,
......@@ -236,6 +263,8 @@
"europe-west1": 5.0208,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 5.2800,
"asia-east": 5.2800,
"asia-northeast": 0,
......@@ -243,6 +272,7 @@
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0,
"cores": "96",
"memory": "360",
"gceu": 264,
......@@ -260,6 +290,8 @@
"europe-west1": 0.1302,
"europe-west2": 0.1523,
"europe-west3": 0.1523,
"europe-west4": 0.1303,
"northamerica-northeast1": 0.1303,
"asia": 0.1370,
"asia-east": 0.1370,
"asia-northeast": 0.1517,
......@@ -267,6 +299,7 @@
"australia-southeast1": 0.1679,
"australia": 0.1679,
"southamerica-east1": 0.1879,
"asia-south1": 0.1421,
"cores": "2",
"memory": "13",
"gceu": 5.50,
......@@ -284,6 +317,8 @@
"europe-west1": 0.2604,
"europe-west2": 0.3046,
"europe-west3": 0.3046,
"europe-west4": 0.2606,
"northamerica-northeast1": 0.2606,
"asia": 0.2740,
"asia-east": 0.2740,
"asia-northeast": 0.3034,
......@@ -291,6 +326,7 @@
"australia-southeast1": 0.3358,
"australia": 0.3358,
"southamerica-east1": 0.3757,
"asia-south1": 0.2842,
"cores": "4",
"memory": "26",
"gceu": 11,
......@@ -308,6 +344,8 @@
"europe-west1": 0.5208,
"europe-west2": 0.6092,
"europe-west3": 0.6092,
"europe-west4": 0.5212,
"northamerica-northeast1": 0.5212,
"asia": 0.5480,
"asia-east": 0.5480,
"asia-northeast": 0.6068,
......@@ -315,6 +353,7 @@
"australia-southeast1": 0.6716,
"australia": 0.6716,
"southamerica-east1": 0.7514,
"asia-south1": 0.5683,
"cores": "8",
"memory": "52",
"gceu": 22,
......@@ -332,6 +371,8 @@
"europe-west1": 1.0416,
"europe-west2": 1.2184,
"europe-west3": 1.2184,
"europe-west4": 1.0424,
"northamerica-northeast1": 1.0424,
"asia": 1.0960,
"asia-east": 1.0960,
"asia-northeast": 1.2136,
......@@ -339,6 +380,7 @@
"australia-southeast1":1.3431,
"australia":1.3431,
"southamerica-east1": 1.5029,
"asia-south1": 1.1366,
"cores": "16",
"memory": "104",
"gceu": 44,
......@@ -356,6 +398,8 @@
"europe-west1": 2.0832,
"europe-west2": 2.4368,
"europe-west3": 2.4368,
"europe-west4": 2.0848,
"northamerica-northeast1": 2.0848,
"asia": 2.1920,
"asia-east": 2.1920,
"asia-northeast": 2.4272,
......@@ -363,6 +407,7 @@
"australia-southeast1":2.6862,
"australia":2.6862,
"southamerica-east1": 3.0057,
"asia-south1": 2.2732,
"cores": "32",
"memory": "208",
"gceu": 88,
......@@ -380,6 +425,8 @@
"europe-west1": 4.1664,
"europe-west2": 4.8736,
"europe-west3": 4.8736,
"europe-west4": 4.1696,
"northamerica-northeast1": 4.1696,
"asia": 4.3840,
"asia-east": 4.3840,
"asia-northeast": 4.8544,
......@@ -387,6 +434,7 @@
"australia-southeast1":5.3725,
"australia":5.3725,
"southamerica-east1": 6.0114,
"asia-south1": 4.5465,
"cores": "64",
"memory": "416",
"gceu": 176,
......@@ -404,6 +452,8 @@
"europe-west1": 6.2496,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 6.5760,
"asia-east": 6.5760,
"asia-northeast": 0,
......@@ -411,6 +461,7 @@
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0,
"cores": "96",
"memory": "624",
"gceu": 264,
......@@ -428,6 +479,8 @@
"europe-west1": 0.0780,
"europe-west2": 0.0912,
"europe-west3": 0.0912,
"europe-west4": 0.0781,
"northamerica-northeast1": 0.0781,
"asia": 0.0821,
"asia-east": 0.0821,
"asia-northeast": 0.0910,
......@@ -435,6 +488,7 @@
"australia-southeast1": 0.1006,
"australia": 0.1006,
"southamerica-east1": 0.1125,
"asia-south1": 0.0851,
"cores": "2",
"memory": "1.8",
"gceu": 5.5,
......@@ -452,6 +506,8 @@
"europe-west1": 0.1560,
"europe-west2": 0.1824,
"europe-west3": 0.1824,
"europe-west4": 0.1562,
"northamerica-northeast1": 0.1562,
"asia": 0.1642,
"asia-east": 0.1642,
"asia-northeast": 0.1820,
......@@ -459,6 +515,7 @@
"australia-southeast1": 0.2012,
"australia": 0.2012,
"southamerica-east1": 0.2250,
"asia-south1": 0.1702,
"cores": "4",
"memory": "3.6",
"gceu": 11,
......@@ -476,6 +533,8 @@
"europe-west1": 0.3120,
"europe-west2": 0.3648,
"europe-west3": 0.3648,
"europe-west4": 0.3124,
"northamerica-northeast1": 0.3124,
"asia": 0.3284,
"asia-east": 0.3284,
"asia-northeast": 0.3640,
......@@ -483,6 +542,7 @@
"australia-southeast1": 0.4023,
"australia": 0.4023,
"southamerica-east1": 0.4500,
"asia-south1": 0.3404,
"cores": "8",
"memory": "7.2",
"gceu": 22,
......@@ -500,6 +560,8 @@
"europe-west1": 0.6240,
"europe-west2": 0.7296,
"europe-west3": 0.7296,
"europe-west4": 0.6248,
"northamerica-northeast1": 0.6248,
"asia": 0.6568,
"asia-east": 0.6568,
"asia-northeast": 0.7280,
......@@ -507,6 +569,7 @@
"australia-southeast1": 0.8046,
"australia": 0.8046,
"southamerica-east1": 0.8999,
"asia-south1": 0.6807,
"cores": "16",
"memory": "14.40",
"gceu": 44,
......@@ -524,6 +587,8 @@
"europe-west1": 1.2480,
"europe-west2": 1.4592,
"europe-west3": 1.4592,
"europe-west4": 1.2496,
"northamerica-northeast1": 1.2496,
"asia": 1.3136,
"asia-east": 1.3136,
"asia-northeast": 1.4560,
......@@ -531,6 +596,7 @@
"australia-southeast1":1.6092,
"australia":1.6092,
"southamerica-east1": 1.7999,
"asia-south1": 1.3615,
"cores": "32",
"memory": "28.80",
"gceu": 88,
......@@ -548,6 +614,8 @@
"europe-west1": 2.4960,
"europe-west2": 2.9184,
"europe-west3": 2.9184,
"europe-west4": 2.4992,
"northamerica-northeast1": 2.4992,
"asia": 2.6272,
"asia-east": 2.6272,
"asia-northeast": 2.9120,
......@@ -555,6 +623,7 @@
"australia-southeast1":3.2185,
"australia":3.2185,
"southamerica-east1": 3.5998,
"asia-south1": 2.7229,
"cores": "64",
"memory": "57.6",
"gceu": 176,
......@@ -572,6 +641,8 @@
"europe-west1": 3.7440,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 3.9408,
"asia-east": 3.9408,
"asia-northeast": 0,
......@@ -579,6 +650,7 @@
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0,
"cores": "96",
"memory": "86.4",
"gceu": 264,
......@@ -586,6 +658,33 @@
"maxPdSize": 64,
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
},
"CP-COMPUTEENGINE-VMIMAGE-N1-MEGAMEM-96": {
"us": 10.67,
"us-central1": 10.67,
"us-east1": 0,
"us-east4": 0,
"us-west1": 10.67,
"europe": 11.74,
"europe-west1": 11.74,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 12.36,
"asia-east": 12.36,
"asia-northeast": 0,
"asia-southeast": 0,
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0,
"cores": "96",
"memory": "1440",
"gceu": 264,
"maxNumberOfPd": 16,
"maxPdSize": 64,
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
},
"CP-COMPUTEENGINE-VMIMAGE-F1-MICRO-PREEMPTIBLE": {
"us": 0.0035,
"us-central1": 0.0035,
......@@ -596,6 +695,8 @@
"europe-west1": 0.0039,
"europe-west2": 0.00420,
"europe-west3": 0.00420,
"europe-west4": 0.0039,
"northamerica-northeast1": 0.0039,
"asia": 0.0039,
"asia-east": 0.0039,
"asia-northeast": 0.005,
......@@ -603,6 +704,7 @@
"australia-southeast1": 0.00460,
"australia": 0.00460,
"southamerica-east1": 0.00520,
"asia-south1": 0.00420,
"cores": "shared",
"memory": "0.6",
"ssd": [0]
......@@ -617,6 +719,8 @@
"europe-west1": 0.0077,
"europe-west2": 0.00840,
"europe-west3": 0.00840,
"europe-west4": 0.00770,
"northamerica-northeast1": 0.00770,
"asia": 0.0077,
"asia-east": 0.0077,
"asia-northeast": 0.0100,
......@@ -624,6 +728,7 @@
"australia-southeast1": 0.00930,
"australia": 0.00930,
"southamerica-east1": 0.01040,
"asia-south1": 0.00840,
"cores": "shared",
"memory": "1.7",
"ssd": [0]
......@@ -638,6 +743,8 @@
"europe-west1": 0.011,
"europe-west2": 0.01230,
"europe-west3": 0.01230,
"europe-west4": 0.011,
"northamerica-northeast1": 0.011,
"asia": 0.011,
"asia-east": 0.011,
"asia-northeast": 0.01325,
......@@ -645,6 +752,7 @@
"australia-southeast1": 0.01349,
"australia": 0.01349,
"southamerica-east1": 0.01510,
"asia-south1": 0.01203,
"cores": "1",
"memory": "3.75",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -659,6 +767,8 @@
"europe-west1": 0.022,
"europe-west2": 0.02460,
"europe-west3": 0.02460,
"europe-west4": 0.02210,
"northamerica-northeast1": 0.02210,
"asia": 0.022,
"asia-east": 0.022,
"asia-northeast": 0.0265,
......@@ -666,6 +776,7 @@
"australia-southeast1": 0.02698,
"australia": 0.02698,
"southamerica-east1": 0.03020,
"asia-south1": 0.02405,
"cores": "2",
"memory": "7.5",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -680,6 +791,8 @@
"europe-west1": 0.044,
"europe-west2": 0.04920,
"europe-west3": 0.04920,
"europe-west4": 0.04410,
"northamerica-northeast1": 0.04410,
"asia": 0.044,
"asia-east": 0.044,
"asia-northeast": 0.053,
......@@ -687,6 +800,7 @@
"australia-southeast1": 0.05397,
"australia": 0.05397,
"southamerica-east1": 0.06040,
"asia-south1": 0.04811,
"cores": "4",
"memory": "15",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -701,6 +815,8 @@
"europe-west1": 0.088,
"europe-west2": 0.09840,
"europe-west3": 0.09840,
"europe-west4": 0.08820,
"northamerica-northeast1": 0.08820,
"asia": 0.088,
"asia-east": 0.088,
"asia-northeast": 0.106,
......@@ -708,6 +824,7 @@
"australia-southeast1": 0.10793,
"australia": 0.10793,
"southamerica-east1": 0.12080,
"asia-south1": 0.09622,
"cores": "8",
"memory": "30",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -722,6 +839,8 @@
"europe-west1": 0.176,
"europe-west2": 0.19680,
"europe-west3": 0.19680,
"europe-west4": 0.17640,
"northamerica-northeast1": 0.17640,
"asia": 0.176,
"asia-east": 0.176,
"asia-northeast": 0.212,
......@@ -729,6 +848,7 @@
"australia-southeast1": 0.21586,
"australia": 0.21586,
"southamerica-east1": 0.24160,
"asia-south1": 0.19243,
"cores": "16",
"memory": "60",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -743,6 +863,8 @@
"europe-west1": 0.352,
"europe-west2": 0.39360,
"europe-west3": 0.39360,
"europe-west4": 0.35280,
"northamerica-northeast1": 0.35280,
"asia": 0.352,
"asia-east": 0.352,
"asia-northeast": 0.424,
......@@ -750,6 +872,7 @@
"australia-southeast1": 0.43172,
"australia": 0.43172,
"southamerica-east1": 0.48320,
"asia-south1": 0.38486,
"cores": "32",
"memory": "120",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -764,6 +887,8 @@
"europe-west1": 0.704,
"europe-west2": 0.78720,
"europe-west3": 0.78720,
"europe-west4": 0.70570,
"northamerica-northeast1": 0.70570,
"asia": 0.704,
"asia-east": 0.704,
"asia-northeast": 0.8480,
......@@ -771,6 +896,7 @@
"australia-southeast1": 0.86344,
"australia": 0.86344,
"southamerica-east1": 0.96640,
"asia-south1": 0.76973,
"cores": "64",
"memory": "240",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -785,6 +911,8 @@
"europe-west1": 1.0560,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 1.0560,
"asia-east": 1.0560,
"asia-northeast": 0,
......@@ -792,6 +920,7 @@
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0,
"cores": "96",
"memory": "360",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -806,6 +935,8 @@
"europe-west1": 0.0275,
"europe-west2": 0.03050,
"europe-west3": 0.03050,
"europe-west4": 0.02750,
"northamerica-northeast1": 0.02750,
"asia": 0.0275,
"asia-east": 0.0275,
"asia-northeast": 0.033,
......@@ -813,6 +944,7 @@
"australia-southeast1": 0.03360,
"australia": 0.03360,
"southamerica-east1": 0.03757,
"asia-south1": 0.02997,
"cores": "2",
"memory": "13",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -827,6 +959,8 @@
"europe-west1": 0.055,
"europe-west2": 0.06100,
"europe-west3": 0.06100,
"europe-west4": 0.05500,
"northamerica-northeast1": 0.05500,
"asia": 0.055,
"asia-east": 0.055,
"asia-northeast": 0.066,
......@@ -834,6 +968,7 @@
"australia-southeast1": 0.06720,
"australia": 0.06720,
"southamerica-east1": 0.07515,
"asia-south1": 0.05994,
"cores": "4",
"memory": "26",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -848,6 +983,8 @@
"europe-west1": 0.11,
"europe-west2": 0.12200,
"europe-west3": 0.12200,
"europe-west4": 0.10990,
"northamerica-northeast1": 0.10990,
"asia": 0.11,
"asia-east": 0.11,
"asia-northeast": 0.132,
......@@ -855,6 +992,7 @@
"australia-southeast1": 0.13440,
"australia": 0.13440,
"southamerica-east1": 0.15030,
"asia-south1": 0.11989,
"cores": "8",
"memory": "52",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -869,6 +1007,8 @@
"europe-west1": 0.22,
"europe-west2": 0.24400,
"europe-west3": 0.24400,
"europe-west4": 0.21980,
"northamerica-northeast1": 0.21980,
"asia": 0.22,
"asia-east": 0.22,
"asia-northeast": 0.264,
......@@ -876,6 +1016,7 @@
"australia-southeast1": 0.26879,
"australia": 0.26879,
"southamerica-east1": 0.30059,
"asia-south1": 0.23978,
"cores": "16",
"memory": "104",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -890,6 +1031,8 @@
"europe-west1": 0.44,
"europe-west2": 0.48800,
"europe-west3": 0.48800,
"europe-west4": 0.43970,
"northamerica-northeast1": 0.43970,
"asia": 0.44,
"asia-east": 0.44,
"asia-northeast": 0.528,
......@@ -897,6 +1040,7 @@
"australia-southeast1": 0.53758,
"australia": 0.53758,
"southamerica-east1": 0.60118,
"asia-south1": 0.47955,
"cores": "32",
"memory": "208",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -911,6 +1055,8 @@
"europe-west1": 0.880,
"europe-west2": 0.97600,
"europe-west3": 0.97600,
"europe-west4": 0.87930,
"northamerica-northeast1": 0.87930,
"asia": 0.880,
"asia-east": 0.880,
"asia-northeast": 1.0560,
......@@ -918,6 +1064,7 @@
"australia-southeast1":1.07517,
"australia":1.07517,
"southamerica-east1": 1.20237,
"asia-south1": 0.95910,
"cores": "64",
"memory": "416",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -932,6 +1079,8 @@
"europe-west1": 1.3200,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 1.3200,
"asia-east": 1.3200,
"asia-northeast": 0,
......@@ -939,6 +1088,7 @@
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0,
"cores": "96",
"memory": "624",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -953,6 +1103,8 @@
"europe-west1": 0.0165,
"europe-west2": 0.01830,
"europe-west3": 0.01830,
"europe-west4": 0.01640,
"northamerica-northeast1": 0.01640,
"asia": 0.0165,
"asia-east": 0.0165,
"asia-northeast": 0.0198,
......@@ -960,6 +1112,7 @@
"australia-southeast1": 0.02013,
"australia": 0.02013,
"southamerica-east1": 0.02250,
"asia-south1": 0.01792,
"cores": "2",
"memory": "1.8",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -974,6 +1127,8 @@
"europe-west1": 0.033,
"europe-west2": 0.03660,
"europe-west3": 0.03660,
"europe-west4": 0.03290,
"northamerica-northeast1": 0.03290,
"asia": 0.033,
"asia-east": 0.033,
"asia-northeast": 0.0396,
......@@ -981,6 +1136,7 @@
"australia-southeast1": 0.04025,
"australia": 0.04025,
"southamerica-east1": 0.04500,
"asia-south1": 0.03584,
"cores": "4",
"memory": "3.6",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -995,6 +1151,8 @@
"europe-west1": 0.066,
"europe-west2": 0.07320,
"europe-west3": 0.07320,
"europe-west4": 0.06570,
"northamerica-northeast1": 0.06570,
"asia": 0.066,
"asia-east": 0.066,
"asia-northeast": 0.0792,
......@@ -1002,6 +1160,7 @@
"australia-southeast1": 0.08050,
"australia": 0.08050,
"southamerica-east1": 0.09000,
"asia-south1": 0.07168,
"cores": "8",
"memory": "7.2",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -1016,6 +1175,8 @@
"europe-west1": 0.132,
"europe-west2": 0.14640,
"europe-west3": 0.14640,
"europe-west4": 0.13140,
"northamerica-northeast1": 0.13140,
"asia": 0.132,
"asia-east": 0.132,
"asia-northeast": 0.1584,
......@@ -1023,6 +1184,7 @@
"australia-southeast1": 0.16100,
"australia": 0.16100,
"southamerica-east1": 0.17999,
"asia-south1": 0.14337,
"cores": "16",
"memory": "14.40",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -1037,6 +1199,8 @@
"europe-west1": 0.264,
"europe-west2": 0.29280,
"europe-west3": 0.29280,
"europe-west4": 0.26290,
"northamerica-northeast1": 0.26290,
"asia": 0.264,
"asia-east": 0.264,
"asia-northeast": 0.3168,
......@@ -1044,6 +1208,7 @@
"australia-southeast1": 0.32201,
"australia": 0.32201,
"southamerica-east1": 0.35998,
"asia-south1": 0.28673,
"cores": "32",
"memory": "28.80",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -1058,6 +1223,8 @@
"europe-west1": 0.528,
"europe-west2": 0.58560,
"europe-west3": 0.58560,
"europe-west4": 0.52570,
"northamerica-northeast1": 0.52570,
"asia": 0.528,
"asia-east": 0.528,
"asia-northeast": 0.6336,
......@@ -1065,6 +1232,7 @@
"australia-southeast1": 0.64401,
"australia": 0.64401,
"southamerica-east1": 0.71996,
"asia-south1": 0.57347,
"cores": "64",
"memory": "57.6",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
......@@ -1079,6 +1247,8 @@
"europe-west1": 0.7920,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 0.7920,
"asia-east": 0.7920,
"asia-northeast": 0,
......@@ -1086,10 +1256,35 @@
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0,
"cores": "96",
"memory": "86.4",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
},
"CP-COMPUTEENGINE-VMIMAGE-N1-MEGAMEM-96-PREEMPTIBLE": {
"us": 2.26,
"us-central1": 2.26,
"us-east1": 0,
"us-east4": 0,
"us-west1": 2.26,
"europe": 2.47,
"europe-west1": 2.47,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 2.47,
"asia-east": 2.47,
"asia-northeast": 0,
"asia-southeast": 0,
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0,
"cores": "96",
"memory": "1440",
"ssd": [0, 1, 2, 3, 4, 5, 6, 7, 8]
},
"CP-COMPUTEENGINE-LOCAL-SSD": {
"us": 0.00010959,
"us-central1": 0.00010959,
......@@ -1099,30 +1294,38 @@
"europe": 0.00010959,
"europe-west1": 0.00010959,
"europe-west2": 0.00013151,
"europe-west3": 0.00013151,
"europe-west4": 0.00012055,
"northamerica-northeast1": 0.00012055,
"asia": 0.00010959,
"asia-east": 0.00010959,
"asia-northeast": 0.00014247,
"asia-southeast": 0.00012055,
"australia-southeast1": 0.00014795,
"australia": 0.00014795,
"southamerica-east1": 0.000164385
"southamerica-east1": 0.000164385,
"asia-south1": 0.00013151
},
"CP-COMPUTEENGINE-LOCAL-SSD-PREEMPTIBLE": {
"us": 0.00008767,
"us-central1": 0.00008767,
"us-east1": 0.00008767,
"us": 0.000065754,
"us-central1": 0.000065754,
"us-east1": 0.000065754,
"us-east4": 0.00009589,
"us-west1": 0.00008767,
"europe": 0.00008767,
"europe-west1": 0.00008767,
"europe-west2": 0.00010548,
"asia": 0.00008767,
"asia-east": 0.00008767,
"asia-northeast": 0.00011370,
"us-west1": 0.000065754,
"europe": 0.000065754,
"europe-west1": 0.000065754,
"europe-west2": 0.000079453,
"europe-west3": 0.000079453,
"europe-west4": 0.00009589,
"northamerica-northeast1": 0.00009589,
"asia": 0.000065754,
"asia-east": 0.000065754,
"asia-northeast": 0.000084932,
"asia-southeast": 0.00009589,
"australia-southeast1": 0.00011781,
"australia": 0.00011781,
"southamerica-east1": 0.00013151
"australia-southeast1": 0.0000890411,
"australia": 0.0000890411,
"southamerica-east1": 0.000098631,
"asia-south1": 0.000079453
},
"CP-COMPUTEENGINE-OS": {
"win": {
......@@ -1179,12 +1382,15 @@
"europe-west1": 0.04,
"europe-west2": 0.048,
"europe-west3": 0.048,
"europe-west4": 0.044,
"northamerica-northeast1": 0.044,
"asia-east": 0.04,
"asia-northeast": 0.052,
"asia-southeast": 0.044,
"australia-southeast1": 0.054,
"australia": 0.054,
"southamerica-east1": 0.060
"southamerica-east1": 0.060,
"asia-south1": 0.048
},
"CP-COMPUTEENGINE-STORAGE-PD-SSD": {
"us": 0.17,
......@@ -1196,12 +1402,15 @@
"europe-west1": 0.17,
"europe-west2": 0.204,
"europe-west3": 0.204,
"europe-west4": 0.187,
"northamerica-northeast1": 0.187,
"asia-east": 0.17,
"asia-northeast": 0.221,
"asia-southeast": 0.187,
"australia-southeast1": 0.230,
"australia": 0.230,
"southamerica-east1": 0.255
"southamerica-east1": 0.255,
"asia-south1": 0.204
},
"CP-COMPUTEENGINE-PD-IO-REQUEST": {
"us": 0.0
......@@ -1216,12 +1425,15 @@
"europe-west1": 0.026,
"europe-west2": 0.031,
"europe-west3": 0.031,
"europe-west4": 0.029,
"northamerica-northeast1": 0.029,
"asia-east": 0.026,
"asia-northeast": 0.034,
"asia-southeast": 0.039,
"australia-southeast1": 0.035,
"australia": 0.035,
"southamerica-east1": 0.039
"southamerica-east1": 0.039,
"asia-south1": 0.031
},
"CP-BIGSTORE-CLASS-A-REQUEST": {
"us": 0.05,
......@@ -1233,12 +1445,15 @@
"europe-west1": 0.05,
"europe-west2": 0.05,
"europe-west3": 0.05,
"europe-west4": 0.05,
"northamerica-northeast1": 0.05,
"asia-east": 0.05,
"asia-northeast": 0.05,
"asia-southeast": 0.05,
"australia-southeast1": 0.5,
"australia-southeast1": 0.05,
"australia": 0.05,
"southamerica-east1": 0.5
"southamerica-east1": 0.05,
"asia-south1": 0.05
},
"CP-BIGSTORE-CLASS-B-REQUEST": {
"us": 0.004,
......@@ -1250,11 +1465,14 @@
"europe-west1": 0.004,
"europe-west2": 0.004,
"europe-west3": 0.004,
"europe-west4": 0.004,
"northamerica-northeast1": 0.004,
"asia-east": 0.004,
"asia-northeast": 0.004,
"asia-southeast": 0.004,
"australia-southeast1": 0.004,
"australi": 0.004
"australia": 0.004,
"asia-south1": 0.004
},
"CP-CLOUDSQL-PERUSE-D0": {
"us": 0.025
......@@ -1323,8 +1541,15 @@
"europe-west1": 0.01,
"europe-west2": 0.016,
"europe-west3": 0.016,
"europe-west4": 0.010,
"northamerica-northeast1": 0.016,
"asia-east": 0.01,
"asia-northeast": 0.016
"asia-northeast": 0.016,
"asia-southeast": 0.01,
"australia-southeast1": 0.016,
"australia": 0.016,
"southamerica-east1": 0.020,
"asia-south1": 0.016
},
"CP-NEARLINE-RESTORE-SIZE": {
"us": 0.01
......@@ -1339,12 +1564,15 @@
"europe-west1": 0.025,
"europe-west2": 0.030,
"europe-west3": 0.030,
"europe-west4": 0.028,
"northamerica-northeast1": 0.028,
"asia-east": 0.025,
"asia-northeast": 0.038,
"asia-southeast": 0.028,
"australia-southeast1": 0.034,
"australia": 0.034,
"southamerica-east1": 0.038,
"asia-south1": 0.030,
"fixed": true
},
"FORWARDING_RULE_CHARGE_EXTRA": {
......@@ -1357,12 +1585,15 @@
"europe-west1": 0.010,
"europe-west2": 0.012,
"europe-west3": 0.012,
"europe-west4": 0.011,
"northamerica-northeast1": 0.011,
"asia-east": 0.010,
"asia-northeast": 0.011,
"asia-southeast": 0.011,
"australia-southeast1": 0.014,
"australia": 0.014,
"southamerica-east1": 0.015
"southamerica-east1": 0.015,
"asia-south1": 0.012
},
"NETWORK_LOAD_BALANCED_INGRESS": {
"us": 0.008,
......@@ -1374,12 +1605,15 @@
"europe-west1": 0.008,
"europe-west2": 0.010,
"europe-west3": 0.010,
"europe-west4": 0.009,
"northamerica-northeast1": 0.009,
"asia-east": 0.008,
"asia-northeast": 0.012,
"asia-southeast": 0.009,
"australia-southeast1": 0.011,
"australia": 0.011,
"southamerica-east1": 0.012
"southamerica-east1": 0.012,
"asia-south1": 0.010
},
"CP-COMPUTEENGINE-INTERNET-EGRESS-NA-NA": {
"tiers": {
......@@ -1656,31 +1890,37 @@
"europe-west1": 0,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 0,
"asia-east": 0,
"asia-northeast": 0,
"asia-southeast": 0,
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0
"southamerica-east1": 0,
"asia-south1": 0
},
"CP-CONTAINER-ENGINE-STANDARD": {
"us": 0.15,
"us-central1": 0.15,
"us-east1": 0.15,
"us-east4": 0.1605,
"us-west1": 0.15,
"europe": 0.15,
"europe-west1": 0.15,
"europe-west2": 0.1800,
"europe-west3": 0.1800,
"asia": 0.15,
"asia-east": 0.15,
"asia-northeast": 0.20,
"asia-southeast": 0.17,
"australia-southeast1": 0.2025,
"australia": 0.2025,
"southamerica-east1": 0.2250
"us": 0,
"us-central1": 0,
"us-east1": 0,
"us-east4": 0,
"us-west1": 0,
"europe": 0,
"europe-west1": 0,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia": 0,
"asia-east": 0,
"asia-northeast": 0,
"asia-southeast": 0,
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0
},
"CP-SUPPORT-BRONZE": {
"us": 0.0
......@@ -1707,13 +1947,16 @@
"europe-west1": 0.036489,
"europe-west2": 0.040692,
"europe-west3": 0.040692,
"europe-west4": 0.034802,
"northamerica-northeast1": 0.034802,
"asia": 0.038410,
"asia-east": 0.038410,
"asia-northeast": 0.040618,
"asia-southeast": 0.038996,
"australia-southeast1": 0.04488,
"australia": 0.04488,
"southamerica-east1": 0.050190
"southamerica-east1": 0.050190,
"asia-south1": 0.037966
},
"CP-COMPUTEENGINE-CUSTOM-VM-RAM": {
"us": 0.004446,
......@@ -1725,13 +1968,16 @@
"europe-west1": 0.004892,
"europe-west2": 0.005453,
"europe-west3": 0.005453,
"europe-west4": 0.004664,
"northamerica-northeast1": 0.004664,
"asia": 0.005150,
"asia-east": 0.005150,
"asia-northeast": 0.005418,
"asia-southeast": 0.005226,
"australia-southeast1": 0.00601,
"australia": 0.00601,
"southamerica-east1": 0.006729
"southamerica-east1": 0.006729,
"asia-south1": 0.005088
},
"CP-COMPUTEENGINE-CUSTOM-VM-EXTENDED-RAM": {
"us": 0.009550,
......@@ -1743,13 +1989,16 @@
"europe-west1": 0.010506,
"europe-west2": 0.01171,
"europe-west3": 0.01171,
"europe-west4": 0.010018,
"northamerica-northeast1": 0.010018,
"asia": 0.011059,
"asia-east": 0.011059,
"asia-northeast": 0.011667,
"asia-southeast": 0.011667,
"australia-southeast1": 0.01291,
"australia": 0.01291,
"southamerica-east1": 0.014451
"southamerica-east1": 0.014451,
"asia-south1": 0.010929
},
"CP-COMPUTEENGINE-PREDEFINED-VM-CORE": {
"us": 0.031611,
......@@ -1761,13 +2010,16 @@
"europe-west1": 0.034773,
"europe-west2": 0.040730,
"europe-west3": 0.040730,
"europe-west4": 0.034773,
"northamerica-northeast1": 0.034773,
"asia": 0.036602,
"asia-east": 0.036602,
"asia-northeast": 0.040618,
"asia-southeast": 0.038999,
"australia-southeast1": 0.044856,
"australia": 0.044856,
"southamerica-east1": 0.0474165
"southamerica-east1": 0.0474165,
"asia-south1": 0.0378409
},
"CP-COMPUTEENGINE-PREDEFINED-VM-RAM": {
"us": 0.004237,
......@@ -1779,13 +2031,16 @@
"europe-west1": 0.004661,
"europe-west2": 0.005411,
"europe-west3": 0.005411,
"europe-west4": 0.004661,
"northamerica-northeast1": 0.004661,
"asia": 0.004906,
"asia-east": 0.004906,
"asia-northeast": 0.005419,
"asia-southeast": 0.005222,
"australia-southeast1": 0.006048,
"australia": 0.006048,
"southamerica-east1": 0.0063555
"southamerica-east1": 0.0063555,
"asia-south1": 0.005109
},
"CP-COMPUTEENGINE-CUSTOM-VM-CORE-PREEMPTIBLE": {
"us": 0.00698,
......@@ -1797,13 +2052,16 @@
"europe-west1": 0.00768,
"europe-west2": 0.00815,
"europe-west3": 0.00815,
"europe-west4": 0.007325,
"northamerica-northeast1": 0.007325,
"asia": 0.00768,
"asia-east": 0.00768,
"asia-northeast": 0.00883,
"asia-southeast": 0.007801,
"australia-southeast1": 0.00898,
"australia": 0.00898,
"southamerica-east1": 0.010038
"southamerica-east1": 0.010038,
"asia-south1": 0.007992
},
"CP-COMPUTEENGINE-CUSTOM-VM-RAM-PREEMPTIBLE": {
"us": 0.00094,
......@@ -1815,13 +2073,16 @@
"europe-west1": 0.00103,
"europe-west2": 0.00109,
"europe-west3": 0.00109,
"europe-west4": 0.000987,
"northamerica-northeast1": 0.000987,
"asia": 0.00103,
"asia-east": 0.00103,
"asia-northeast": 0.001178,
"asia-southeast": 0.001045,
"australia-southeast1": 0.00120,
"australia": 0.00120,
"southamerica-east1": 0.001346
"southamerica-east1": 0.001346,
"asia-south1": 0.001076
},
"CP-COMPUTEENGINE-CUSTOM-VM-EXTENDED-RAM-PREEMPTIBLE": {
"us": 0.002014,
......@@ -1833,13 +2094,16 @@
"europe-west1": 0.002212,
"europe-west2": 0.00235,
"europe-west3": 0.00235,
"europe-west4": 0.002114,
"northamerica-northeast1": 0.002114,
"asia": 0.002212,
"asia-east": 0.002212,
"asia-northeast": 0.002536,
"asia-southeast": 0.002536,
"australia-southeast1": 0.00258,
"australia": 0.00258,
"southamerica-east1": 0.002890
"southamerica-east1": 0.002890,
"asia-south1": 0.002306
},
"CP-COMPUTEENGINE-PREDEFINED-VM-CORE-PREEMPTIBLE": {
"us": 0.0066551,
......@@ -1851,13 +2115,16 @@
"europe-west1": 0.007321,
"europe-west2": 0.00815,
"europe-west3": 0.00815,
"europe-west4": 0.007321,
"northamerica-northeast1": 0.007321,
"asia": 0.007320,
"asia-east": 0.007320,
"asia-northeast": 0.008830,
"asia-southeast": 0.00780,
"australia-southeast1": 0.0089,
"australia": 0.0089,
"southamerica-east1": 0.00998265
"southamerica-east1": 0.00998265,
"asia-south1": 0.0080004
},
"CP-COMPUTEENGINE-PREDEFINED-VM-RAM-PREEMPTIBLE": {
"us": 0.000892,
......@@ -1869,13 +2136,16 @@
"europe-west1": 0.000981,
"europe-west2": 0.00109,
"europe-west3": 0.00109,
"europe-west4": 0.000981,
"northamerica-northeast1": 0.000981,
"asia": 0.000981,
"asia-east": 0.000981,
"asia-northeast": 0.001178,
"asia-southeast": 0.00105,
"australia-southeast1": 0.00120,
"australia": 0.00120,
"southamerica-east1": 0.001338
"southamerica-east1": 0.001338,
"asia-south1": 0.00107454
},
"CP-DB-F1-MICRO": {
"us": 0.0150,
......@@ -1887,13 +2157,16 @@
"europe-west1": 0.0150,
"europe-west2": 0.0180,
"europe-west3": 0.0180,
"europe-west4": 0.0165,
"northamerica-northeast1": 0.0165,
"asia": 0.0150,
"asia-east": 0.0150,
"asia-northeast": 0.0195,
"asia-southeast": 0,
"australia-southeast1": 0.0203,
"australia": 0.0203,
"southamerica-east1": 0.0255
"southamerica-east1": 0.0255,
"asia-south1": 0.0180
},
"CP-DB-G1-SMALL": {
"us": 0.0500,
......@@ -1905,13 +2178,16 @@
"europe-west1": 0.0500,
"europe-west2": 0.0600,
"europe-west3": 0.0600,
"europe-west4": 0.0550,
"northamerica-northeast1": 0.0550,
"asia": 0.0500,
"asia-east": 0.0500,
"asia-northeast": 0.0650,
"asia-southeast": 0,
"australia-southeast1": 0.0675,
"australia": 0.0675,
"southamerica-east1": 0.0750
"southamerica-east1": 0.0750,
"asia-south1": 0.0600
},
"CP-DB-N1-STANDARD-1": {
"us": 0.0965,
......@@ -1923,13 +2199,16 @@
"europe-west1": 0.0965,
"europe-west2": 0.1158,
"europe-west3": 0.1158,
"europe-west4": 0.1062,
"northamerica-northeast1": 0.1062,
"asia": 0.0965,
"asia-east": 0.0965,
"asia-northeast": 0.1255,
"asia-southeast": 0,
"australia-southeast1": 0.1303,
"australia": 0.1303,
"southamerica-east1": 0.1448
"southamerica-east1": 0.1448,
"asia-south1": 0.1158
},
"CP-DB-N1-STANDARD-2": {
"us": 0.1930,
......@@ -1941,13 +2220,16 @@
"europe-west1": 0.1930,
"europe-west2": 0.2316,
"europe-west3": 0.2316,
"europe-west4": 0.2123,
"northamerica-northeast1": 0.2123,
"asia": 0.1930,
"asia-east": 0.1930,
"asia-northeast": 0.2509,
"asia-southeast": 0,
"australia-southeast1": 0.2606,
"australia": 0.2606,
"southamerica-east1": 0.2895
"southamerica-east1": 0.2895,
"asia-south1": 0.2316
},
"CP-DB-N1-STANDARD-4": {
"us": 0.3860,
......@@ -1959,13 +2241,16 @@
"europe-west1": 0.3860,
"europe-west2": 0.4632,
"europe-west3": 0.4632,
"europe-west4": 0.4246,
"northamerica-northeast1": 0.4246,
"asia": 0.3860,
"asia-east": 0.3860,
"asia-northeast": 0.5018,
"asia-southeast": 0,
"australia-southeast1": 0.5211,
"australia": 0.5211,
"southamerica-east1": 0.5790
"southamerica-east1": 0.5790,
"asia-south1": 0.4632
},
"CP-DB-N1-STANDARD-8": {
"us": 0.7720,
......@@ -1977,13 +2262,16 @@
"europe-west1": 0.7720,
"europe-west2": 0.9264,
"europe-west3": 0.9264,
"europe-west4": 0.8492,
"northamerica-northeast1": 0.8492,
"asia": 0.7720,
"asia-east": 0.7720,
"asia-northeast": 1.0036,
"asia-southeast": 0,
"australia-southeast1": 1.0422,
"australia": 1.0422,
"southamerica-east1": 1.1580
"southamerica-east1": 1.1580,
"asia-south1": 0.9264
},
"CP-DB-N1-STANDARD-16": {
"us": 1.5445,
......@@ -1995,13 +2283,16 @@
"europe-west1": 1.5445,
"europe-west2": 1.8534,
"europe-west3": 1.8534,
"europe-west4": 1.6984,
"northamerica-northeast1": 1.6984,
"asia": 1.5445,
"asia-east": 1.5445,
"asia-northeast": 2.0079,
"asia-southeast": 0,
"australia-southeast1": 2.0851,
"australia": 2.0851,
"southamerica-east1": 2.3168
"southamerica-east1": 2.3168,
"asia-south1": 1.8528
},
"CP-DB-N1-STANDARD-32": {
"us": 3.0885,
......@@ -2013,13 +2304,16 @@
"europe-west1": 3.0885,
"europe-west2": 3.7062,
"europe-west3": 3.7062,
"europe-west4": 3.3968,
"northamerica-northeast1": 3.3968,
"asia": 3.0885,
"asia-east": 3.0885,
"asia-northeast": 4.0151,
"asia-southeast": 0,
"australia-southeast1": 4.1695,
"australia": 4.1695,
"southamerica-east1": 4.6335
"southamerica-east1": 4.6335,
"asia-south1": 3.7056
},
"CP-DB-N1-STANDARD-64": {
"us": 6.1770,
......@@ -2031,13 +2325,16 @@
"europe-west1": 6.1770,
"europe-west2": 7.4124,
"europe-west3": 7.4124,
"europe-west4": 6.7936,
"northamerica-northeast1": 6.7936,
"asia": 6.1770,
"asia-east": 6.1770,
"asia-northeast": 8.0301,
"asia-southeast": 0,
"australia-southeast1": 8.3390,
"australia": 8.3390,
"southamerica-east1": 9.2655
"southamerica-east1": 9.2655,
"asia-south1": 7.4112
},
"CP-DB-N1-HIGHMEM-2": {
"us": 0.2515,
......@@ -2049,13 +2346,16 @@
"europe-west1": 0.2515,
"europe-west2": 0.3018,
"europe-west3": 0.3018,
"europe-west4": 0.2767,
"northamerica-northeast1": 0.2767,
"asia": 0.2515,
"asia-east": 0.2515,
"asia-northeast": 0.3270,
"asia-southeast": 0,
"australia-southeast1": 0.3395,
"australia": 0.3395,
"southamerica-east1": 0.3773
"southamerica-east1": 0.3773,
"asia-south1": 0.3018
},
"CP-DB-N1-HIGHMEM-4": {
"us": 0.5030,
......@@ -2067,13 +2367,16 @@
"europe-west1": 0.5030,
"europe-west2": 0.6036,
"europe-west3": 0.6036,
"europe-west4": 0.5533,
"northamerica-northeast1": 0.5533,
"asia": 0.5030,
"asia-east": 0.5030,
"asia-northeast": 0.6539,
"asia-southeast": 0,
"australia-southeast1": 0.6791,
"australia": 0.6791,
"southamerica-east1": 0.7545
"southamerica-east1": 0.7545,
"asia-south1": 0.6036
},
"CP-DB-N1-HIGHMEM-8": {
"us": 1.0060,
......@@ -2085,13 +2388,16 @@
"europe-west1": 1.0060,
"europe-west2": 1.2072,
"europe-west3": 1.2072,
"europe-west4": 1.1066,
"northamerica-northeast1": 1.1066,
"asia": 1.0060,
"asia-east": 1.0060,
"asia-northeast": 1.3078,
"asia-southeast": 0,
"australia-southeast1": 1.3581,
"australia": 1.3581,
"southamerica-east1": 1.509
"southamerica-east1": 1.509,
"asia-south1": 1.2072
},
"CP-DB-N1-HIGHMEM-16": {
"us": 2.0120,
......@@ -2103,13 +2409,16 @@
"europe-west1": 2.0120,
"europe-west2": 2.4144,
"europe-west3": 2.4144,
"europe-west4": 2.2132,
"northamerica-northeast1": 2.2132,
"asia": 2.0120,
"asia-east": 2.0120,
"asia-northeast": 2.6156,
"asia-southeast": 0,
"australia-southeast1": 2.7162,
"australia": 2.7162,
"southamerica-east1": 3.0180
"southamerica-east1": 3.0180,
"asia-south1": 2.4144
},
"CP-DB-N1-HIGHMEM-32": {
"us": 4.0240,
......@@ -2121,13 +2430,16 @@
"europe-west1": 4.0240,
"europe-west2": 4.8288,
"europe-west3": 4.8288,
"europe-west4": 4.4264,
"northamerica-northeast1": 4.4264,
"asia": 4.0240,
"asia-east": 4.0240,
"asia-northeast": 5.2312,
"asia-southeast": 0,
"australia-southeast1": 5.4324,
"australia": 5.4324,
"southamerica-east1": 6.0360
"southamerica-east1": 6.0360,
"asia-south1": 4.8288
},
"CP-DB-N1-HIGHMEM-64": {
"us": 8.0480,
......@@ -2139,13 +2451,16 @@
"europe-west1": 8.0480,
"europe-west2": 9.6576,
"europe-west3": 9.6576,
"europe-west4": 8.8528,
"northamerica-northeast1": 8.8528,
"asia": 8.0480,
"asia-east": 8.0480,
"asia-northeast": 10.4624,
"asia-southeast": 0,
"australia-southeast1": 10.8648,
"australia": 10.8648,
"southamerica-east1": 12.0720
"southamerica-east1": 12.0720,
"asia-south1": 9.6576
},
"CP-CLOUDSQL-STORAGE-SSD": {
"us": 0.17,
......@@ -2157,13 +2472,37 @@
"europe-west1": 0.17,
"europe-west2": 0.204,
"europe-west3": 0.204,
"europe-west4": 0.187,
"northamerica-northeast1": 0.187,
"asia": 0.17,
"asia-east": 0.17,
"asia-northeast": 0.22,
"asia-southeast": 0,
"australia-southeast1": 0.230,
"australia": 0.230,
"southamerica-east1": 0.255
"southamerica-east1": 0.255,
"asia-south1": 0.204
},
"CP-CLOUDSQL-STORAGE-HDD": {
"us": 0.09,
"us-central1": 0.09,
"us-east1": 0.09,
"us-east4": 0.0963,
"us-west1": 0.09,
"europe": 0.09,
"europe-west1": 0.09,
"europe-west2": 0.108,
"europe-west3": 0.108,
"europe-west4": 0.099,
"northamerica-northeast1": 0.099,
"asia": 0.09,
"asia-east": 0.09,
"asia-northeast": 0.12,
"asia-southeast": 0,
"australia-southeast1": 0.122,
"australia": 0.122,
"southamerica-east1": 0.135,
"asia-south1": 0.108
},
"CP-CLOUDSQL-BACKUP": {
"us": 0.08,
......@@ -2175,13 +2514,16 @@
"europe-west1": 0.08,
"europe-west2": 0.096,
"europe-west3": 0.096,
"europe-west4": 0.088,
"northamerica-northeast1": 0.088,
"asia": 0.08,
"asia-east": 0.08,
"asia-northeast": 0.10,
"asia-southeast": 0,
"australia-southeast1": 0.108,
"australia": 0.108,
"southamerica-east1": 0.12
"southamerica-east1": 0.12,
"asia-south1": 0.096
},
"CP-VISION-LABEL-DETECTION": {
"tiers": {
......@@ -2371,15 +2713,20 @@
"asia": 0.54
},
"CP-ML-PREDICTION-ONLINE": {
"us": 0.10,
"europe": 0.11,
"asia": 0.11
"us": 0.3,
"europe": 0.348,
"asia": 0.348
},
"CP-ML-PREDICTION-PROCESSING": {
"us": 0.40,
"europe": 0.44,
"asia": 0.44
},
"CP-ML-PREDICTION-BATCH": {
"us": 0.09262,
"europe": 0.10744,
"asia": 0.10744
},
"CP-BIGSTORE-STORAGE-COLDLINE": {
"us": 0.007,
"us-central1": 0.007,
......@@ -2390,11 +2737,14 @@
"europe-west1": 0.007,
"europe-west2": 0.013,
"europe-west3": 0.013,
"europe-west4": 0.007,
"northamerica-northeast1": 0.013,
"asia-east": 0.007,
"asia-northeast": 0.01,
"australia-southeast1": 0.013,
"australia": 0.013,
"southamerica-east1": 0.014
"southamerica-east1": 0.014,
"asia-south1": 0.013
},
"CP-BIGSTORE-DATA-RETRIEVAL-COLDLINE": {
"us": 0.05
......@@ -2409,11 +2759,14 @@
"europe-west1": 0.026,
"europe-west2": 0.026,
"europe-west3": 0.026,
"europe-west4": 0.026,
"northamerica-northeast1": 0.026,
"asia-east": 0.026,
"asia-northeast": 0.026,
"australia-southeast1": 0.023,
"australia": 0.023,
"southamerica-east1": 0.026
"australia-southeast1": 0.026,
"australia": 0.026,
"southamerica-east1": 0.026,
"asia-south1": 0.026
},
"CP-BIGSTORE-STORAGE-REGIONAL": {
"us": 0.02,
......@@ -2425,11 +2778,14 @@
"europe-west1": 0.02,
"europe-west2": 0.023,
"europe-west3": 0.023,
"europe-west4": 0.020,
"northamerica-northeast1": 0.023,
"asia-east": 0.02,
"asia-northeast": 0.023,
"australia-southeast1": 0.023,
"australia": 0.023,
"southamerica-east1": 0.035
"southamerica-east1": 0.035,
"asia-south1": 0.023
},
"CP-BIGSTORE-STORAGE-NEARLINE": {
"us": 0.01,
......@@ -2441,11 +2797,14 @@
"europe-west1": 0.01,
"europe-west2": 0.0160,
"europe-west3": 0.0160,
"europe-west4": 0.010,
"northamerica-northeast1": 0.016,
"asia-east": 0.01,
"asia-northeast": 0.016,
"australia-southeast1": 0.016,
"australia": 0.016,
"southamerica-east1": 0.0200
"southamerica-east1": 0.0200,
"asia-south1": 0.0160
},
"CP-GAE-FLEX-INSTANCE-CORE-HOURS": {
"us": 0.0526
......@@ -2471,44 +2830,102 @@
}
},
"GPU_NVIDIA_TESLA_K80": {
"us": 0.7,
"us-central1": 0,
"us-east1": 0.7,
"us": 0.45,
"us-central1": 0.45,
"us-east1": 0.45,
"us-east4": 0,
"us-west1": 0.7,
"europe": 0.77,
"europe-west1": 0.77,
"us-west1": 0.45,
"europe": 0.49,
"europe-west1": 0.49,
"europe-west2": 0,
"europe-west3": 0,
"asia-east": 0.77,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia-east": 0.49,
"asia-northeast": 0,
"asia-southeast": 0,
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0
"southamerica-east1": 0,
"asia-south1": 0
},
"GPU_NVIDIA_TESLA_P100": {
"us": 2.3,
"us-central1": 0,
"us-east1": 2.3,
"us": 1.46,
"us-central1": 1.46,
"us-east1": 1.46,
"us-east4": 0,
"us-west1": 1.46,
"europe": 1.6,
"europe-west1": 1.6,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia-east": 1.6,
"asia-northeast": 0,
"asia-southeast": 0,
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0
},
"GPU_NVIDIA_TESLA_K80-PREEMPTIBLE": {
"us": 0.22,
"us-central1": 0.22,
"us-east1": 0.22,
"us-east4": 0,
"us-west1": 0.22,
"europe": 0.22,
"europe-west1": 0.22,
"europe-west2": 0,
"europe-west3": 0,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia-east": 0.22,
"asia-northeast": 0,
"asia-southeast": 0,
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0,
"asia-south1": 0
},
"GPU_NVIDIA_TESLA_P100-PREEMPTIBLE": {
"us": 0.73,
"us-central1": 0.73,
"us-east1": 0.73,
"us-east4": 0,
"us-west1": 2.3,
"europe": 2.53,
"europe-west1": 2.53,
"us-west1": 0.73,
"europe": 0.73,
"europe-west1": 0.73,
"europe-west2": 0,
"europe-west3": 0,
"asia-east": 2.53,
"europe-west4": 0,
"northamerica-northeast1": 0,
"asia-east": 0.73,
"asia-northeast": 0,
"asia-southeast": 0,
"australia-southeast1": 0,
"australia": 0,
"southamerica-east1": 0
"southamerica-east1": 0,
"asia-south1": 0
},
"CP-SPANNER-NODE": {
"us": 0.90
"us": 0.90,
"us-central1": 0.90,
"europe-west1": 0.90,
"asia-east1": 0.90,
"asia-northeast1": 1.17,
"nam3": 3.0,
"nam-eur-asia1": 9.0
},
"CP-SPANNER-STORAGE-SSD": {
"us": 0.30
"us": 0.30,
"us-central1": 0.30,
"europe-west1": 0.30,
"asia-east1": 0.30,
"asia-northeast1": 0.39,
"nam3": 0.5,
"nam-eur-asia1": 0.9
},
"CP-CLOUD-ENDPOINTS-REQUESTS": {
"tiers": {
......@@ -2541,41 +2958,32 @@
"6": 0.12
}
},
"CP-PROF-SVC-START-INF": {
"us": 50000
"CP-PROF-SVC-START": {
"us": 25000
},
"CP-PROF-SVC-SPRINT": {
"us": 125000
},
"CP-PROF-SVC-PLAN-INF": {
"us": 105000
},
"CP-PROF-SVC-START-DA": {
"us": 50000
"us": 120000
},
"CP-PROF-SVC-PLAN-DA": {
"us": 105000
},
"CP-PROF-SVC-START-ML": {
"us": 80000
},
"CP-PROF-SVC-PLAN-ML": {
"us": 120000
},
"CP-PROF-SVC-START-APP": {
"us": 50000
"CP-PROF-SVC-PLAN-ML": {
"us": 80000
},
"CP-PROF-SVC-PLAN-APP": {
"us": 105000
"us": 120000
},
"GAPPS-PROF-SVC-ADA": {
"us": 450000
},
"GAPPS-PROF-SVC-CSA": {
"us": 60000
"us": 150000
},
"GAPPS-PROF-SVC-CMAS": {
"us": 25000
},
"GAPPS-PROF-SVC-PSC": {
"us": 60000
"us": 30000
},
"GAPPS-PROF-SVC-SA": {
"us": 30000
......@@ -2626,13 +3034,16 @@
"europe-west1": 0.0150,
"europe-west2": 0.0180,
"europe-west3": 0.0180,
"europe-west4": 0.0165,
"northamerica-northeast1": 0.0165,
"asia": 0.0150,
"asia-east": 0.0150,
"asia-northeast": 0.0195,
"asia-southeast": 0,
"australia-southeast1": 0.0203,
"australia": 0.0203,
"southamerica-east1": 0.0225
"southamerica-east1": 0.0225,
"asia-south1": 0.00180
},
"CP-DB-PG-G1-SMALL": {
"us": 0.0500,
......@@ -2644,13 +3055,16 @@
"europe-west1": 0.0500,
"europe-west2": 0.0600,
"europe-west3": 0.0600,
"europe-west4": 0.0550,
"northamerica-northeast1": 0.0550,
"asia": 0.0500,
"asia-east": 0.0500,
"asia-northeast": 0.0650,
"asia-southeast": 0,
"australia-southeast1": 0.0675,
"australia": 0.0675,
"southamerica-east1": 0.0750
"southamerica-east1": 0.0750,
"asia-south1": 0.0600
},
"CP-DB-PG-CUSTOM-VM-CORE": {
"us": 0.0590,
......@@ -2662,13 +3076,16 @@
"europe-west1": 0.0590,
"europe-west2": 0.07080,
"europe-west3": 0.07080,
"europe-west4": 0.0649,
"northamerica-northeast1": 0.0649,
"asia": 0.0590,
"asia-east": 0.0590,
"asia-northeast": 0.0767,
"asia-southeast": 0,
"australia-southeast1": 0.0797,
"australia": 0.0797,
"southamerica-east1": 0.08850
"southamerica-east1": 0.08850,
"asia-south1": 0.07080
},
"CP-DB-PG-CUSTOM-VM-RAM": {
"us": 0.0100,
......@@ -2680,13 +3097,16 @@
"europe-west1": 0.0100,
"europe-west2": 0.01200,
"europe-west3": 0.01200,
"europe-west4": 0.0110,
"northamerica-northeast1": 0.0110,
"asia": 0.0100,
"asia-east": 0.0100,
"asia-northeast": 0.0130,
"asia-southeast": 0,
"australia-southeast1": 0.0135,
"australia": 0.0135,
"southamerica-east1": 0.01500
"southamerica-east1": 0.01500,
"asia-south1": 0.01200
},
"CP-CUD-1-YEAR-CPU": {
"us": 0.019915,
......@@ -2698,12 +3118,15 @@
"europe-west1": 0.021907,
"europe-west2": 0.025636,
"europe-west3": 0.025636,
"europe-west4": 0.021925,
"northamerica-northeast1": 0.021925,
"asia-east": 0.023059,
"asia-northeast": 0.025589,
"asia-southeast": 0.024567,
"australia-southeast1": 0.028274,
"australia": 0.028274,
"southamerica-east1": 0.031620
"southamerica-east1": 0.031620,
"asia-south1": 0.023919
},
"CP-CUD-1-YEAR-RAM": {
"us": 0.002669,
......@@ -2715,12 +3138,15 @@
"europe-west1": 0.002936,
"europe-west2": 0.003435,
"europe-west3": 0.003435,
"europe-west4": 0.002938,
"northamerica-northeast1": 0.002938,
"asia-east": 0.003091,
"asia-northeast": 0.003414,
"asia-southeast": 0.003292,
"australia-southeast1": 0.003786,
"australia": 0.003786,
"southamerica-east1": 0.004239
"southamerica-east1": 0.004239,
"asia-south1": 0.003205
},
"CP-CUD-3-YEAR-CPU": {
"us": 0.014225,
......@@ -2732,12 +3158,15 @@
"europe-west1": 0.015648,
"europe-west2": 0.0183114,
"europe-west3": 0.0183114,
"europe-west4": 0.015661,
"northamerica-northeast1": 0.015661,
"asia-east": 0.016471,
"asia-northeast": 0.018278,
"asia-southeast": 0.017548,
"australia-southeast1": 0.0201960,
"australia": 0.0201960,
"southamerica-east1": 0.0225855
"southamerica-east1": 0.0225855,
"asia-south1": 0.017085
},
"CP-CUD-3-YEAR-RAM": {
"us": 0.001907,
......@@ -2749,16 +3178,15 @@
"europe-west1": 0.002097,
"europe-west2": 0.0024539,
"europe-west3": 0.0024539,
"europe-west4": 0.002099,
"northamerica-northeast1": 0.002099,
"asia-east": 0.002208,
"asia-northeast": 0.002438,
"asia-southeast": 0.002352,
"australia-southeast1": 0.0027045,
"australia": 0.0027045,
"southamerica-east1": 0.006729
},
"CP-COMPUTEENGINE-CPU-PREMIUM-SKYLAKE-PERCENTAGE": {
"cpu": 0.05,
"ram": 0.15
"southamerica-east1": 0.0030281,
"asia-south1": 0.002290
},
"CP-DATAPREP-UNITS": {
"us-central1": 0.096
......@@ -2770,6 +3198,24 @@
"5242880": 0.0020,
"52428800": 0.00045
}
},
"CP-VIDEO-INTELLIGENCE-LABEL-DETECTION": {
"tiers": {
"1000": 0,
"100000": 0.1
}
},
"CP-VIDEO-INTELLIGENCE-SHOT-DETECTION": {
"tiers": {
"1000": 0,
"100000": 0.05
}
},
"CP-VIDEO-INTELLIGENCE-EXPLICIT-CONTENT-DETECTION": {
"tiers": {
"1000": 0,
"100000": 0.1
}
}
}
}
import math
import json
import sys
import urllib.request
if len(sys.argv) == 1:
print('You need to specify a product type')
......@@ -42,6 +42,7 @@ with open(FCATALOG) as url:
for product in DATA['gcp_price_list']:
if 'CUSTOM-VM-' not in product:
if PRODUCT_FAMILY in product: # Discard non-product entries
realname = product[len(PRODUCT_FAMILY)-3:].lower()
name = product[len(PRODUCT_FAMILY):].lower()
if PRODUCT_FAMILY == DB_PRODUCT_FAMILY:
match = COMPUTE_PRODUCT_FAMILY+name.upper()
......@@ -96,4 +97,4 @@ with open(FCATALOG) as url:
cost = float(cost)+add
print('google,%s,%s,%s,%s,%s,%s' % (name, cpu, memory, cost, region, os))
else:
print('google,%s,%s,%s,%s,%s,%s' % (name, cpu, memory, cost, region, os))
\ No newline at end of file
print('google,%s,%s,%s,%s,%s,%s' % (realname, cpu, memory, cost, region, os))
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!