Repository: libcloud Updated Branches: refs/heads/trunk 342471bb9 -> 04884dca3
Updating the pricing information to match new AWS pricing changes effective April 1st, 2014 Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/c842f35f Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c842f35f Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c842f35f Branch: refs/heads/trunk Commit: c842f35f85c7fe9dea90c5a25f66711bdceaceb2 Parents: 342471b Author: Chris DeRamus <[email protected]> Authored: Mon Mar 31 15:38:34 2014 -0400 Committer: Tomaz Muraus <[email protected]> Committed: Thu Apr 10 10:37:06 2014 -0400 ---------------------------------------------------------------------- libcloud/data/pricing.json | 436 +++++++++++++++++++++++----------------- 1 file changed, 250 insertions(+), 186 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/c842f35f/libcloud/data/pricing.json ---------------------------------------------------------------------- diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json index d6202ba..5a2e123 100644 --- a/libcloud/data/pricing.json +++ b/libcloud/data/pricing.json @@ -15,7 +15,16 @@ "5": 0.240, "6": 0.480, "7": 0.960, - "8": 1.800 + "8": 1.800, + "performance1-1": 0.040, + "performance1-2": 0.080, + "performance1-4": 0.160, + "performance1-8": 0.320, + "performance2-15": 0.680, + "performance2-30": 1.360, + "performance2-60": 2.720, + "performance2-90": 4.080, + "performance2-120": 5.440 }, "rackspacenovaus": { @@ -44,7 +53,16 @@ "5": 0.258, "6": 0.516, "7": 0.967, - "8": 1.612 + "8": 1.612, + "performance1-1": 0.040, + "performance1-2": 0.080, + "performance1-4": 0.160, + "performance1-8": 0.320, + "performance2-15": 0.680, + "performance2-30": 1.360, + "performance2-60": 2.720, + "performance2-90": 4.080, + "performance2-120": 5.440 }, "rackspacenovasyd": { @@ -54,7 +72,16 @@ "5": 0.288, "6": 0.576, "7": 1.080, - "8": 1.440 + "8": 1.440, + "performance1-1": 0.040, + "performance1-2": 0.080, + "performance1-4": 0.160, + "performance1-8": 0.320, + "performance2-15": 0.680, + "performance2-30": 1.360, + "performance2-60": 2.720, + "performance2-90": 4.080, + "performance2-120": 5.440 }, "dreamhost": { @@ -66,225 +93,262 @@ }, "ec2_us_east": { - "t1.micro": 0.02, - "m1.small": 0.065, - "m1.medium": 0.13, - "m1.large": 0.26, - "m1.xlarge": 0.52, - "c1.medium": 0.17, - "c1.xlarge": 0.68, - "c3.large": 0.150, - "c3.xlarge": 0.300, - "c3.2xlarge": 0.600, - "c3.4xlarge": 1.200, - "c3.8xlarge": 2.400, - "m2.xlarge": 0.50, - "m2.2xlarge": 1.0, - "m2.4xlarge": 2.0, "m3.medium": 0.113, - "m3.large": 0.225, + "m3.large": 0.140, "m3.xlarge": 0.45, "m3.2xlarge": 0.90, - "cg1.4xlarge": 2.1, + "m1.small": 0.044, + "m1.medium": 0.087, + "m1.large": 0.175, + "m1.xlarge": 0.350, + "c3.large": 0.105, + "c3.xlarge": 0.210, + "c3.2xlarge": 0.420, + "c3.4xlarge": 0.840, + "c3.8xlarge": 1.680, + "c1.medium": 0.130, + "c1.xlarge": 0.520, + "cc2.8xlarge": 2.00, "g2.2xlarge": 0.650, - "cc1.4xlarge": 1.3, - "cc2.8xlarge": 2.4, + "cg1.4xlarge": 2.1, + "r3.large": 0.175, + "r3.xlarge": 0.350, + "r3.2xlarge": 0.700, + "r3.4xlarge": 1.400, + "r3.8xlarge": 2.800, + "m2.xlarge": 0.245, + "m2.2xlarge": 0.490, + "m2.4xlarge": 0.980, "cr1.8xlarge": 3.50, - "hs1.4xlarge": 3.1, - "hs1.8xlarge": 4.6, - "i2.xlarge": 0.85, - "i2.2xlarge": 1.71, + "i2.xlarge": 0.853, + "i2.2xlarge": 1.705, "i2.4xlarge": 3.41, - "i2.8xlarge": 6.82 + "i2.8xlarge": 6.82, + "hs1.8xlarge": 4.6, + "hi1.4xlarge": 3.10, + "t1.micro": 0.02 }, "ec2_us_west": { - "t1.micro": 0.025, - "m1.small": 0.095, - "m1.medium": 0.180, - "m1.large": 0.38, - "m1.xlarge": 0.76, - "c1.medium": 0.19, - "c1.xlarge": 0.76, - "g2.2xlarge": 0.702, - "c3.large": 0.171, - "c3.xlarge": 0.342, - "c3.2xlarge": 0.633, - "c3.4xlarge": 1.366, - "c3.8xlarge": 2.732, - "m2.xlarge": 0.57, - "m2.2xlarge": 1.14, - "m2.4xlarge": 2.28, "m3.medium": 0.124, "m3.large": 0.248, "m3.xlarge": 0.495, "m3.2xlarge": 0.990, - "hs1.4xlarge": 3.1, - "hs1.8xlarge": 4.6, - "i2.xlarge": 0.85, - "i2.2xlarge": 1.71, - "i2.4xlarge": 3.41, - "i2.8xlarge": 6.82 + "m1.small": 0.047, + "m1.medium": 0.095, + "m1.large": 0.190, + "m1.xlarge": 0.379, + "c3.large": 0.120, + "c3.xlarge": 0.239, + "c3.2xlarge": 0.478, + "c3.4xlarge": 0.956, + "c3.8xlarge": 1.912, + "c1.medium": 0.148, + "c1.xlarge": 0.592, + "g2.2xlarge": 0.702, + "r3.large": 0.195, + "r3.xlarge": 0.390, + "r3.2xlarge": 0.780, + "r3.4xlarge": 1.560, + "r3.8xlarge": 3.120, + "m2.xlarge": 0.275, + "m2.2xlarge": 0.550, + "m2.4xlarge": 1.100, + "i2.xlarge": 0.938, + "i2.2xlarge": 1.876, + "i2.4xlarge": 3.751, + "i2.8xlarge": 7.502, + "t1.micro": 0.025 }, "ec2_us_west_oregon": { - "t1.micro": 0.02, - "m1.small": 0.065, - "m1.medium": 0.13, - "m1.large": 0.26, - "m1.xlarge": 0.52, - "c1.medium": 0.17, - "c1.xlarge": 0.68, + "m3.medium": 0.070, + "m3.large": 0.140, + "m3.xlarge": 0.280, + "m3.2xlarge": 0.560, + "m1.small": 0.044, + "m1.medium": 0.087, + "m1.large": 0.175, + "m1.xlarge": 0.350, + "c3.large": 0.105, + "c3.xlarge": 0.210, + "c3.2xlarge": 0.420, + "c3.4xlarge": 0.840, + "c3.8xlarge": 1.680, + "c1.medium": 0.130, + "c1.xlarge": 0.520, + "cc2.8xlarge": 2.000, "g2.2xlarge": 0.650, - "c3.large": 0.150, - "c3.xlarge": 0.300, - "c3.2xlarge": 0.600, - "c3.4xlarge": 1.200, - "c3.8xlarge": 2.400, - "m2.xlarge": 0.50, - "m2.2xlarge": 1.0, - "m2.4xlarge": 2.0, - "m3.medium": 0.113, - "m3.large": 0.225, - "m3.xlarge": 0.45, - "m3.2xlarge": 0.90, - "hs1.4xlarge": 3.1, - "hs1.8xlarge": 4.6, - "cc2.8xlarge": 2.400, - "i2.xlarge": 0.85, - "i2.2xlarge": 1.71, + "r3.large": 0.175, + "r3.xlarge": 0.350, + "r3.2xlarge": 0.700, + "r3.4xlarge": 1.400, + "r3.8xlarge": 2.800, + "m2.xlarge": 0.245, + "m2.2xlarge": 0.490, + "m2.4xlarge": 0.980, + "cr1.8xlarge": 3.50, + "i2.xlarge": 0.853, + "i2.2xlarge": 1.705, "i2.4xlarge": 3.41, - "i2.8xlarge": 6.82 + "i2.8xlarge": 6.82, + "hs1.8xlarge": 4.6, + "hi1.4xlarge": 3.10, + "t1.micro": 0.02 }, "ec2_eu_west": { - "t1.micro": 0.025, - "m1.small": 0.095, - "m1.medium": 0.180, - "m1.large": 0.38, - "m1.xlarge": 0.76, - "c1.medium": 0.19, - "c1.xlarge": 0.76, + "m3.medium": 0.077, + "m3.large": 0.154, + "m3.xlarge": 0.308, + "m3.2xlarge": 0.616, + "m1.small": 0.047, + "m1.medium": 0.095, + "m1.large": 0.190, + "m1.xlarge": 0.379, + "c3.large": 0.120, + "c3.xlarge": 0.239, + "c3.2xlarge": 0.478, + "c3.4xlarge": 0.956, + "c3.8xlarge": 1.912, + "c1.medium": 0.148, + "c1.xlarge": 0.592, + "cc2.8xlarge": 2.250, "g2.2xlarge": 0.702, - "c3.large": 0.171, - "c3.xlarge": 0.342, - "c3.2xlarge": 0.683, - "c3.4xlarge": 1.366, - "c3.8xlarge": 2.732, - "m2.xlarge": 0.57, - "m2.2xlarge": 1.14, - "m2.4xlarge": 2.28, - "m3.medium": 0.124, - "m3.large": 0.248, - "m3.xlarge": 0.495, - "m3.2xlarge": 0.990, - "hs1.4xlarge": 3.1, - "hs1.8xlarge": 4.6, - "cc2.8xlarge": 2.7, - "i2.xlarge": 0.85, - "i2.2xlarge": 1.71, - "i2.4xlarge": 3.41, - "i2.8xlarge": 6.82 + "cg1.4xlarge": 2.360, + "r3.large": 0.195, + "r3.xlarge": 0.390, + "r3.2xlarge": 0.780, + "r3.4xlarge": 1.560, + "r3.8xlarge": 3.120, + "m2.xlarge": 0.275, + "m2.2xlarge": 0.550, + "m2.4xlarge": 1.100, + "cr1.8xlarge": 3.750, + "i2.xlarge": 0.938, + "i2.2xlarge": 1.876, + "i2.4xlarge": 3.751, + "i2.8xlarge": 7.502, + "hs1.8xlarge": 4.900, + "hs1.4xlarge": 3.100, + "t1.micro": 0.020 }, "ec2_ap_southeast": { - "t1.micro": 0.025, - "m1.small": 0.095, - "m1.medium": 0.180, - "m1.large": 0.38, - "m1.xlarge": 0.76, - "c1.medium": 0.19, - "c1.xlarge": 0.76, - "c3.large": 0.189, - "c3.xlarge": 0.378, - "c3.2xlarge": 0.756, - "c3.4xlarge": 1.512, - "c3.8xlarge": 3.024, - "m2.xlarge": 0.57, - "m2.2xlarge": 1.14, - "m2.4xlarge": 2.28, - "m3.medium": 0.158, - "m3.large": 0.315, - "m3.xlarge": 0.630, - "m3.2xlarge": 1.260, + "m3.medium": 0.098, + "m3.large": 0.196, + "m3.xlarge": 0.392, + "m3.2xlarge": 0.784, + "m1.small": 0.058, + "m1.medium": 0.117, + "m1.large": 0.233, + "m1.xlarge": 0.467, + "c3.large": 0.132, + "c3.xlarge": 0.265, + "c3.2xlarge": 0.529, + "c3.4xlarge": 1.058, + "c3.8xlarge": 2.117, + "c1.medium": 0.164, + "c1.xlarge": 0.655, + "r3.large": 0.210, + "r3.xlarge": 0.420, + "r3.2xlarge": 0.840, + "r3.4xlarge": 1.680, + "r3.8xlarge": 3.360, + "m2.xlarge": 0.296, + "m2.2xlarge": 0.592, + "m2.4xlarge": 1.183, + "i2.xlarge": 1.018, + "i2.2xlarge": 2.035, + "i2.4xlarge": 4.070, + "i2.8xlarge": 8.140, "hs1.8xlarge": 5.570, - "i2.xlarge": 0.85, - "i2.2xlarge": 1.71, - "i2.4xlarge": 3.41, - "i2.8xlarge": 6.82 + "t1.micro": 0.025 }, "ec2_ap_northeast": { - "t1.micro": 0.027, - "m1.small": 0.10, - "m1.medium": 0.184, - "m1.large": 0.40, - "m1.xlarge": 0.80, - "c1.medium": 0.20, - "c1.xlarge": 0.80, - "g2.2xlarge": 0.943, - "c3.large": 0.192, - "c3.xlarge": 0.383, - "c3.2xlarge": 0.766, - "c3.4xlarge": 1.532, - "c3.8xlarge": 3.064, - "m2.xlarge": 0.60, - "m2.2xlarge": 1.20, - "m2.4xlarge": 2.39, - "m3.medium": 0.171, - "m3.large": 0.342, - "m3.xlarge": 0.684, - "m3.2xlarge": 1.368, - "hs1.4xlarge": 3.440, - "hs1.8xlarge": 5.670, - "i2.xlarge": 0.85, - "i2.2xlarge": 1.71, - "i2.4xlarge": 3.41, - "i2.8xlarge": 6.82 + "m3.medium": 0.101, + "m3.large": 0.203, + "m3.xlarge": 0.405, + "m3.2xlarge": 0.810, + "m1.small": 0.061, + "m1.medium": 0.122, + "m1.large": 0.243, + "m1.xlarge": 0.486, + "c3.large": 0.128, + "c3.xlarge": 0.255, + "c3.2xlarge": 0.511, + "c3.4xlarge": 1.021, + "c3.8xlarge": 2.043, + "c1.medium": 0.158, + "c1.xlarge": 0.632, + "cc2.8xlarge": 2.350, + "g2.2xlarge": 0.898, + "r3.large": 0.210, + "r3.xlarge": 0.420, + "r3.2xlarge": 0.840, + "r3.4xlarge": 1.680, + "r3.8xlarge": 3.360, + "m2.xlarge": 0.287, + "m2.2xlarge": 0.575, + "m2.4xlarge": 1.150, + "cr1.8xlarge": 4.105, + "i2.xlarge": 1.001, + "i2.2xlarge": 2.001, + "i2.4xlarge": 4.002, + "i2.8xlarge": 8.004, + "hs1.8xlarge": 5.400, + "hi1.4xlarge": 3.276, + "t1.micro": 0.027 }, "ec2_sa_east": { - "t1.micro": 0.027, - "m1.small": 0.115, - "m1.medium": 0.230, - "m1.large": 0.46, - "m1.xlarge": 0.92, - "c1.medium": 0.23, - "c1.xlarge": 0.92, - "m2.xlarge": 0.68, - "m2.2xlarge": 1.36, - "m2.4xlarge": 2.72, - "m3.medium": 0.153, - "m3.large": 0.306, - "m3.xlarge": 0.612, - "m3.2xlarge": 1.224 + "m3.medium": 0.095, + "m3.large": 0.190, + "m3.xlarge": 0.381, + "m3.2xlarge": 0.761, + "m1.small": 0.058, + "m1.medium": 0.117, + "m1.large": 0.233, + "m1.xlarge": 0.467, + "c1.medium": 0.179, + "c1.xlarge": 0.718, + "m2.xlarge": 0.323, + "m2.2xlarge": 0.645, + "m2.4xlarge": 1.291, + "t1.micro": 0.027 }, "ec2_ap_southeast_2": { - "t1.micro": 0.020, - "m1.small": 0.085, - "m1.medium": 0.170, - "m1.large": 0.340, - "m1.xlarge": 0.680, - "c1.medium": 0.186, - "c1.xlarge": 0.744, - "c3.large": 0.189, - "c3.xlarge": 0.378, - "c3.2xlarge": 0.756, - "c3.4xlarge": 1.512, - "c3.8xlarge": 3.024, - "m2.xlarge": 0.506, - "m2.2xlarge": 1.012, - "m2.4xlarge": 2.024, - "m3.medium": 0.158, - "m3.large": 0.315, - "m3.xlarge": 0.630, - "m3.2xlarge": 1.260, + "m3.medium": 0.098, + "m3.large": 0.196, + "m3.xlarge": 0.392, + "m3.2xlarge": 0.784, + "m1.small": 0.058, + "m1.medium": 0.117, + "m1.large": 0.233, + "m1.xlarge": 0.467, + "c3.large": 0.132, + "c3.xlarge": 0.265, + "c3.2xlarge": 0.529, + "c3.4xlarge": 1.058, + "c3.8xlarge": 2.117, + "c1.medium": 0.164, + "c1.xlarge": 0.655, + "r3.large": 0.210, + "r3.xlarge": 0.420, + "r3.2xlarge": 0.840, + "r3.4xlarge": 1.680, + "r3.8xlarge": 3.360, + "m2.xlarge": 0.296, + "m2.2xlarge": 0.592, + "m2.4xlarge": 1.183, + "i2.xlarge": 1.018, + "i2.2xlarge": 2.035, + "i2.4xlarge": 4.070, + "i2.8xlarge": 8.140, "hs1.8xlarge": 5.570, - "i2.xlarge": 0.85, - "i2.2xlarge": 1.71, - "i2.4xlarge": 3.41, - "i2.8xlarge": 6.82 + "t1.micro": 0.020 }, "nephoscale" : {
