Update EC2 instance and pricing information.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/6f3a4235 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/6f3a4235 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/6f3a4235 Branch: refs/heads/trunk Commit: 6f3a4235b35879b74b14fb7934203cb759045550 Parents: 5521b87 Author: Tomaz Muraus <[email protected]> Authored: Thu Apr 10 14:45:39 2014 -0400 Committer: Tomaz Muraus <[email protected]> Committed: Thu Apr 10 14:45:39 2014 -0400 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 5 - libcloud/data/pricing.json | 839 +++++++++++++++++---------------- libcloud/test/compute/test_ec2.py | 5 +- 3 files changed, 424 insertions(+), 425 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/6f3a4235/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index ad51e00..884e8ba 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -313,7 +313,6 @@ REGION_DETAILS = { 'm3.2xlarge', 'c1.medium', 'c1.xlarge', - 'cc1.4xlarge', 'cc2.8xlarge', 'c3.large', 'c3.xlarge', @@ -323,7 +322,6 @@ REGION_DETAILS = { 'cg1.4xlarge', 'g2.2xlarge', 'cr1.8xlarge', - 'hs1.4xlarge', 'hs1.8xlarge', 'i2.xlarge', 'i2.2xlarge', @@ -385,7 +383,6 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', - 'hs1.4xlarge', 'hs1.8xlarge', 'cc2.8xlarge', 'i2.xlarge', @@ -420,7 +417,6 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', - 'hs1.4xlarge', 'hs1.8xlarge', 'cc2.8xlarge', 'i2.xlarge', @@ -487,7 +483,6 @@ REGION_DETAILS = { 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', - 'hs1.4xlarge', 'hs1.8xlarge', 'i2.xlarge', 'i2.2xlarge', http://git-wip-us.apache.org/repos/asf/libcloud/blob/6f3a4235/libcloud/data/pricing.json ---------------------------------------------------------------------- diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json index 5a2e123..f054dfc 100644 --- a/libcloud/data/pricing.json +++ b/libcloud/data/pricing.json @@ -1,454 +1,459 @@ { "compute": { - "bluebox": { - "1gb": 0.15, - "2gb": 0.25, - "4gb": 0.35, - "8gb": 0.45 + "ec2_us_west_oregon": { + "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", + "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.500", + "i2.xlarge": "0.853", + "i2.2xlarge": "1.705", + "i2.4xlarge": "3.410", + "i2.8xlarge": "6.820", + "hs1.8xlarge": "4.600", + "hi1.4xlarge": "3.100", + "t1.micro": "0.020" }, - - "rackspace": { - "1": 0.015, - "2": 0.030, - "3": 0.060, - "4": 0.120, - "5": 0.240, - "6": 0.480, - "7": 0.960, - "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 + "\"ec2_us_west": { + "m3.2xlarge": "0.616", + "r3.4xlarge": "1.560", + "m1.small": "0.047", + "c1.medium": "0.148", + "m3.large": "0.154", + "r3.2xlarge": "0.780", + "t1.micro": "0.025", + "c3.2xlarge": "0.478", + "c3.xlarge": "0.239", + "m1.large": "0.190", + "c3.8xlarge": "1.912", + "c3.4xlarge": "0.956", + "i2.8xlarge": "7.502", + "m2.2xlarge": "0.550", + "c1.xlarge": "0.592", + "g2.2xlarge": "0.702", + "m1.xlarge": "0.379", + "m2.xlarge": "0.275", + "m1.medium": "0.095", + "r3.large": "0.195", + "i2.xlarge": "0.938", + "m3.medium": "0.077", + "i2.4xlarge": "3.751", + "r3.xlarge": "0.390", + "i2.2xlarge": "1.876", + "c3.large": "0.120", + "r3.8xlarge": "3.120", + "m2.4xlarge": "1.100", + "m3.xlarge": "0.308" }, - - "rackspacenovaus": { - "2": 0.022, - "3": 0.060, - "4": 0.120, - "5": 0.240, - "6": 0.480, - "7": 0.960, - "8": 1.200, - "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 + "ec2_us_west": { + "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", + "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_eu_west": { + "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", + "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", + "hi1.4xlarge": "3.100", + "t1.micro": "0.020" }, - "rackspacenovalon": { - "2": 0.032, + "performance2-60": 2.72, + "performance2-120": 5.44, + "performance1-1": 0.04, + "performance2-15": 0.68, + "performance1-4": 0.16, + "performance2-30": 1.36, + "performance2-90": 4.08, "3": 0.064, + "2": 0.032, + "performance1-2": 0.08, "4": 0.129, - "5": 0.258, - "6": 0.516, "7": 0.967, - "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 + "6": 0.516, + "5": 0.258, + "performance1-8": 0.32, + "8": 1.612 }, - - "rackspacenovasyd": { - "2": 0.026, - "3": 0.072, - "4": 0.144, - "5": 0.288, - "6": 0.576, - "7": 1.080, - "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 + "ec2_ap_southeast_2": { + "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", + "t1.micro": "0.020" }, - - "dreamhost": { - "minimum": 15, - "maximum": 200, - "default": 115, - "low": 50, - "high": 150 + "vps_net": { + "1": 0.416 }, - "ec2_us_east": { - "m3.medium": 0.113, - "m3.large": 0.140, - "m3.xlarge": 0.45, - "m3.2xlarge": 0.90, - "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, - "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, - "i2.xlarge": 0.853, - "i2.2xlarge": 1.705, - "i2.4xlarge": 3.41, - "i2.8xlarge": 6.82, - "hs1.8xlarge": 4.6, - "hi1.4xlarge": 3.10, - "t1.micro": 0.02 + "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", + "cg1.4xlarge": "2.100", + "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.500", + "i2.xlarge": "0.853", + "i2.2xlarge": "1.705", + "i2.4xlarge": "3.410", + "i2.8xlarge": "6.820", + "hs1.8xlarge": "4.600", + "hi1.4xlarge": "3.100", + "t1.micro": "0.020" }, - - "ec2_us_west": { - "m3.medium": 0.124, - "m3.large": 0.248, - "m3.xlarge": 0.495, - "m3.2xlarge": 0.990, - "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 + "rackspacenovaus": { + "performance2-60": 2.72, + "performance2-120": 5.44, + "performance1-1": 0.04, + "performance2-15": 0.68, + "performance1-4": 0.16, + "performance2-30": 1.36, + "performance2-90": 4.08, + "3": 0.06, + "2": 0.022, + "performance1-2": 0.08, + "4": 0.12, + "7": 0.96, + "6": 0.48, + "5": 0.24, + "performance1-8": 0.32, + "8": 1.2 }, - - "ec2_us_west_oregon": { - "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, - "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, - "hs1.8xlarge": 4.6, - "hi1.4xlarge": 3.10, - "t1.micro": 0.02 + "ec2_sa_east": { + "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_eu_west": { - "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, - "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 + "cloudsigma_zrh": { + "high-cpu-medium": 0.211, + "standard-large": 0.381, + "micro-high-cpu": 0.381, + "standard-extra-large": 0.762, + "high-memory-double-extra-large": 1.383, + "micro-regular": 0.0548, + "standard-small": 0.0796, + "high-memory-extra-large": 0.642, + "high-cpu-extra-large": 0.78 }, - - "ec2_ap_southeast": { - "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, - "t1.micro": 0.025 + "rackspacenovasyd": { + "performance2-60": 2.72, + "performance2-120": 5.44, + "performance1-1": 0.04, + "performance2-15": 0.68, + "performance1-4": 0.16, + "performance2-30": 1.36, + "performance2-90": 4.08, + "3": 0.072, + "2": 0.026, + "performance1-2": 0.08, + "4": 0.144, + "7": 1.08, + "6": 0.576, + "5": 0.288, + "performance1-8": 0.32, + "8": 1.44 }, - - "ec2_ap_northeast": { - "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": { - "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_northeast": { + "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.349", + "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.026" }, - - "ec2_ap_southeast_2": { - "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, - "t1.micro": 0.020 + "gogrid": { + "24GB": 4.56, + "512MB": 0.095, + "8GB": 1.52, + "4GB": 0.76, + "2GB": 0.38, + "1GB": 0.19, + "16GB": 3.04 }, - - "nephoscale" : { - "1": 0.60, - "3": 0.063, - "5": 0.031, - "7": 0.125, - "9": 0.188, + "serverlove": { + "high-cpu-medium": 0.291, + "medium": 0.404, + "large": 0.534, + "small": 0.161, + "extra-large": 0.615, + "high-cpu-extra-large": 0.776 + }, + "elastichosts": { + "high-cpu-medium": 0.18, + "medium": 0.223, + "large": 0.378, + "small": 0.1, + "extra-large": 0.579, + "high-cpu-extra-large": 0.77 + }, + "rackspace": { + "performance2-60": 2.72, + "performance2-120": 5.44, + "performance1-1": 0.04, + "performance2-15": 0.68, + "performance1-4": 0.16, + "performance2-30": 1.36, + "1": 0.015, + "performance2-90": 4.08, + "3": 0.06, + "2": 0.03, + "performance1-2": 0.08, + "4": 0.12, + "7": 0.96, + "6": 0.48, + "5": 0.24, + "performance1-8": 0.32, + "8": 1.8 + }, + "nephoscale": { "11": 0.35, "27": 0.0, - "46": 0.10, "48": 0.15, + "46": 0.1, + "54": 0.938, + "56": 0.75, "50": 0.28, "52": 0.48, - "54": 0.938, - "56": 0.75 + "1": 0.6, + "3": 0.063, + "5": 0.031, + "7": 0.125, + "9": 0.188 }, - - "nimbus" : { + "nimbus": { + "m1.xlarge": 0.0, "m1.small": 0.0, - "m1.large": 0.0, - "m1.xlarge": 0.0 + "m1.large": 0.0 }, - - "cloudsigma_zrh": { - "micro-regular": 0.0548, - "micro-high-cpu": 0.381, - "standard-small": 0.0796, - "standard-large": 0.381, - "standard-extra-large": 0.762, - "high-memory-extra-large": 0.642, - "high-memory-double-extra-large": 1.383, - "high-cpu-medium": 0.211, - "high-cpu-extra-large": 0.780 + "gandi": { + "1": 0.02, + "small": 0.02, + "large": 0.06, + "medium": 0.03, + "x-large": 0.12 + }, + "skalicloud": { + "high-cpu-medium": 0.249, + "medium": 0.301, + "large": 0.505, + "small": 0.136, + "extra-large": 0.654, + "high-cpu-extra-large": 0.936 + }, + "bluebox": { + "4gb": 0.35, + "2gb": 0.25, + "8gb": 0.45, + "1gb": 0.15 + }, + "ec2_ap_southeast": { + "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", + "t1.micro": "0.020" }, - "cloudsigma_lvs": { - "micro-regular": 0.0, - "micro-high-cpu": 0.0, - "standard-small": 0.0, + "high-cpu-medium": 0.0, "standard-large": 0.0, + "micro-high-cpu": 0.0, "standard-extra-large": 0.0, - "high-memory-extra-large": 0.0, "high-memory-double-extra-large": 0.0, - "high-cpu-medium": 0.0, + "micro-regular": 0.0, + "standard-small": 0.0, + "high-memory-extra-large": 0.0, "high-cpu-extra-large": 0.0 }, - - "elastichosts": { - "small": 0.100, - "medium": 0.223, - "large": 0.378, - "extra-large": 0.579, - "high-cpu-medium": 0.180, - "high-cpu-extra-large": 0.770 - }, - - "skalicloud": { - "small": 0.136, - "medium": 0.301, - "large": 0.505, - "extra-large": 0.654, - "high-cpu-medium": 0.249, - "high-cpu-extra-large": 0.936 - }, - - "serverlove": { - "small": 0.161, - "medium": 0.404, - "large": 0.534, - "extra-large": 0.615, - "high-cpu-medium": 0.291, - "high-cpu-extra-large": 0.776 - }, - - "gogrid": { - "512MB": 0.095, - "1GB": 0.19, - "2GB": 0.38, - "4GB": 0.76, - "8GB": 1.52, - "16GB": 3.04, - "24GB": 4.56 - }, - - "gandi": { - "1": 0.02, - "small": 0.02, - "medium": 0.03, - "large": 0.06, - "x-large": 0.12 - }, - - "vps_net": { - "1": 0.416 + "dreamhost": { + "default": 115, + "high": 150, + "minimum": 15, + "maximum": 200, + "low": 50 } }, - - "storage": { - }, - - "updated": 1349661768 -} + "storage": {}, + "updated": 1397154837 +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/libcloud/blob/6f3a4235/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 4a2b4d7..de2eeb3 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -372,9 +372,8 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertTrue('m2.4xlarge' in ids) if region_name == 'us-east-1': - self.assertEqual(len(sizes), 30) + self.assertEqual(len(sizes), 28) self.assertTrue('cg1.4xlarge' in ids) - self.assertTrue('cc1.4xlarge' in ids) self.assertTrue('cc2.8xlarge' in ids) self.assertTrue('cr1.8xlarge' in ids) elif region_name == 'us-west-1': @@ -386,7 +385,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): elif region_name == 'ap-southeast-2': self.assertEqual(len(sizes), 24) elif region_name == 'eu-west-1': - self.assertEqual(len(sizes), 27) + self.assertEqual(len(sizes), 26) self.driver.region_name = region_old
