You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2015/12/01 00:41:55 UTC
[3/3] libcloud git commit: Outscale Driver - region update (eu-west-2
,
us-east-2) on OUTSCALE_INC & OUTSCALE_SAS with outdated pricing for the moment
Outscale Driver - region update (eu-west-2 , us-east-2) on OUTSCALE_INC & OUTSCALE_SAS with outdated pricing for the moment
Signed-off-by: Anthony Shaw <an...@gmail.com>
Closes #645
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b7d851f1
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b7d851f1
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b7d851f1
Branch: refs/heads/trunk
Commit: b7d851f1413b57772a6c17cdc6c9670e64379c45
Parents: b2968c4
Author: Filipe Silva <fi...@9online.fr>
Authored: Sat Nov 28 00:13:16 2015 +0100
Committer: Anthony Shaw <an...@gmail.com>
Committed: Tue Dec 1 10:41:37 2015 +1100
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 324 +++++++++++++++++++++++++++++++++++
libcloud/data/pricing.json | 176 +++++++++++++++++++
2 files changed, 500 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b7d851f1/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 6645849..1c79339 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -1317,6 +1317,87 @@ OUTSCALE_SAS_REGION_DETAILS = {
'os1.8xlarge'
]
},
+ 'eu-west-2': {
+ 'endpoint': 'fcu.eu-west-2.outscale.com',
+ 'api_name': 'osc_sas_eu_west_2',
+ 'country': 'FRANCE',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
+ 'eu-west-2': {
+ 'endpoint': 'fcu.eu-west-2.outscale.com',
+ 'api_name': 'osc_sas_eu_west_2',
+ 'country': 'FRANCE',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
+ 'eu-west-2': {
+ 'endpoint': 'fcu.eu-west-2.outscale.com',
+ 'api_name': 'osc_sas_eu_west_2',
+ 'country': 'FRANCE',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
'us-east-1': {
'endpoint': 'api.us-east-1.outscale.com',
'api_name': 'osc_sas_us_east_1',
@@ -1370,6 +1451,87 @@ OUTSCALE_SAS_REGION_DETAILS = {
'cr1.8xlarge',
'os1.8xlarge'
]
+ },
+ 'us-east-2': {
+ 'endpoint': 'fcu.us-east-2.outscale.com',
+ 'api_name': 'osc_sas_us_east_2',
+ 'country': 'USA',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
+ 'us-east-2': {
+ 'endpoint': 'fcu.us-east-2.outscale.com',
+ 'api_name': 'osc_sas_us_east_2',
+ 'country': 'USA',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
+ 'us-east-2': {
+ 'endpoint': 'fcu.us-east-2.outscale.com',
+ 'api_name': 'osc_sas_us_east_2',
+ 'country': 'USA',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
}
}
@@ -1429,6 +1591,87 @@ OUTSCALE_INC_REGION_DETAILS = {
'os1.8xlarge'
]
},
+ 'eu-west-2': {
+ 'endpoint': 'fcu.eu-west-2.outscale.com',
+ 'api_name': 'osc_inc_eu_west_2',
+ 'country': 'FRANCE',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
+ 'eu-west-2': {
+ 'endpoint': 'fcu.eu-west-2.outscale.com',
+ 'api_name': 'osc_inc_eu_west_2',
+ 'country': 'FRANCE',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
+ 'eu-west-2': {
+ 'endpoint': 'fcu.eu-west-2.outscale.com',
+ 'api_name': 'osc_inc_eu_west_2',
+ 'country': 'FRANCE',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
'eu-west-3': {
'endpoint': 'api-ppd.outscale.com',
'api_name': 'osc_inc_eu_west_3',
@@ -1509,6 +1752,87 @@ OUTSCALE_INC_REGION_DETAILS = {
'cr1.8xlarge',
'os1.8xlarge'
]
+ },
+ 'us-east-2': {
+ 'endpoint': 'fcu.us-east-2.outscale.com',
+ 'api_name': 'osc_inc_us_east_2',
+ 'country': 'USA',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
+ 'us-east-2': {
+ 'endpoint': 'fcu.us-east-2.outscale.com',
+ 'api_name': 'osc_inc_us_east_2',
+ 'country': 'USA',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
+ },
+ 'us-east-2': {
+ 'endpoint': 'fcu.us-east-2.outscale.com',
+ 'api_name': 'osc_inc_us_east_2',
+ 'country': 'USA',
+ 'instance_types': [
+ 't1.micro',
+ 'm1.small',
+ 'm1.medium',
+ 'm1.large',
+ 'm1.xlarge',
+ 'c1.medium',
+ 'c1.xlarge',
+ 'm2.xlarge',
+ 'm2.2xlarge',
+ 'm2.4xlarge',
+ 'nv1.small',
+ 'nv1.medium',
+ 'nv1.large',
+ 'nv1.xlarge',
+ 'cc1.4xlarge',
+ 'cc2.8xlarge',
+ 'm3.xlarge',
+ 'm3.2xlarge',
+ 'cr1.8xlarge',
+ 'os1.8xlarge'
+ ]
}
}
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b7d851f1/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index e173999..0f42160 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -671,6 +671,50 @@
"os1.8xlarge": "4.310",
"t1.micro": "0.040"
},
+ "osc_inc_eu_west_2": {
+ "c1.medium": "0.230",
+ "c1.xlarge": "0.900",
+ "cc1.4xlarge": "1.300",
+ "cc2.8xlarge": "2.400",
+ "cr1.8xlarge": "3.500",
+ "m1.large": "0.360",
+ "m1.medium": "0.120",
+ "m1.small": "0.090",
+ "m1.xlarge": "0.730",
+ "m2.2xlarge": "0.820",
+ "m2.4xlarge": "1.640",
+ "m2.xlarge": "0.410",
+ "m3.2xlarge": "1.560",
+ "m3.xlarge": "0.780",
+ "nv1.large": "5.490",
+ "nv1.medium": "5.250",
+ "nv1.small": "5.220",
+ "nv1.xlarge": "5.610",
+ "os1.8xlarge": "4.310",
+ "t1.micro": "0.040"
+ },
+ "osc_inc_eu_west_2": {
+ "c1.medium": "0.230",
+ "c1.xlarge": "0.900",
+ "cc1.4xlarge": "1.300",
+ "cc2.8xlarge": "2.400",
+ "cr1.8xlarge": "3.500",
+ "m1.large": "0.360",
+ "m1.medium": "0.120",
+ "m1.small": "0.090",
+ "m1.xlarge": "0.730",
+ "m2.2xlarge": "0.820",
+ "m2.4xlarge": "1.640",
+ "m2.xlarge": "0.410",
+ "m3.2xlarge": "1.560",
+ "m3.xlarge": "0.780",
+ "nv1.large": "5.490",
+ "nv1.medium": "5.250",
+ "nv1.small": "5.220",
+ "nv1.xlarge": "5.610",
+ "os1.8xlarge": "4.310",
+ "t1.micro": "0.040"
+ },
"osc_inc_eu_west_3": {
"c1.medium": "0.230",
"c1.xlarge": "0.900",
@@ -715,6 +759,50 @@
"os1.8xlarge": "6.400",
"t1.micro": "0.020"
},
+ "osc_inc_us_east_2": {
+ "c1.medium": "0.150",
+ "c1.xlarge": "0.580",
+ "cc1.4xlarge": "1.610",
+ "cc2.8xlarge": "2.400",
+ "cr1.8xlarge": "3.500",
+ "m1.large": "0.240",
+ "m1.medium": "0.180",
+ "m1.small": "0.060",
+ "m1.xlarge": "0.730",
+ "m2.2xlarge": "1.020",
+ "m2.4xlarge": "2.040",
+ "m2.xlarge": "0.410",
+ "m3.2xlarge": "1.560",
+ "m3.xlarge": "0.500",
+ "nv1.large": "5.490",
+ "nv1.medium": "5.250",
+ "nv1.small": "5.190",
+ "nv1.xlarge": "5.610",
+ "os1.8xlarge": "6.400",
+ "t1.micro": "0.020"
+ },
+ "osc_inc_us_east_2": {
+ "c1.medium": "0.150",
+ "c1.xlarge": "0.580",
+ "cc1.4xlarge": "1.610",
+ "cc2.8xlarge": "2.400",
+ "cr1.8xlarge": "3.500",
+ "m1.large": "0.240",
+ "m1.medium": "0.180",
+ "m1.small": "0.060",
+ "m1.xlarge": "0.730",
+ "m2.2xlarge": "1.020",
+ "m2.4xlarge": "2.040",
+ "m2.xlarge": "0.410",
+ "m3.2xlarge": "1.560",
+ "m3.xlarge": "0.500",
+ "nv1.large": "5.490",
+ "nv1.medium": "5.250",
+ "nv1.small": "5.190",
+ "nv1.xlarge": "5.610",
+ "os1.8xlarge": "6.400",
+ "t1.micro": "0.020"
+ },
"osc_sas_eu_west_1": {
"c1.medium": "0.230",
"c1.xlarge": "0.900",
@@ -737,6 +825,50 @@
"os1.8xlarge": "6.400",
"t1.micro": "0.040"
},
+ "osc_sas_eu_west_2": {
+ "c1.medium": "0.230",
+ "c1.xlarge": "0.900",
+ "cc1.4xlarge": "1.460",
+ "cc2.8xlarge": "2.700",
+ "cr1.8xlarge": "3.750",
+ "m1.large": "0.360",
+ "m1.medium": "0.130",
+ "m1.small": "0.090",
+ "m1.xlarge": "0.730",
+ "m2.2xlarge": "0.920",
+ "m2.4xlarge": "1.840",
+ "m2.xlarge": "0.460",
+ "m3.2xlarge": "1.560",
+ "m3.xlarge": "0.780",
+ "nv1.large": "5.490",
+ "nv1.medium": "5.310",
+ "nv1.small": "5.220",
+ "nv1.xlarge": "5.860",
+ "os1.8xlarge": "6.400",
+ "t1.micro": "0.040"
+ },
+ "osc_sas_eu_west_2": {
+ "c1.medium": "0.230",
+ "c1.xlarge": "0.900",
+ "cc1.4xlarge": "1.460",
+ "cc2.8xlarge": "2.700",
+ "cr1.8xlarge": "3.750",
+ "m1.large": "0.360",
+ "m1.medium": "0.130",
+ "m1.small": "0.090",
+ "m1.xlarge": "0.730",
+ "m2.2xlarge": "0.920",
+ "m2.4xlarge": "1.840",
+ "m2.xlarge": "0.460",
+ "m3.2xlarge": "1.560",
+ "m3.xlarge": "0.780",
+ "nv1.large": "5.490",
+ "nv1.medium": "5.310",
+ "nv1.small": "5.220",
+ "nv1.xlarge": "5.860",
+ "os1.8xlarge": "6.400",
+ "t1.micro": "0.040"
+ },
"osc_sas_eu_west_3": {
"c1.medium": "0.230",
"c1.xlarge": "0.900",
@@ -781,6 +913,50 @@
"os1.8xlarge": "6.400",
"t1.micro": "0.020"
},
+ "osc_sas_us_east_2": {
+ "c1.medium": "0.170",
+ "c1.xlarge": "0.660",
+ "cc1.4xlarge": "1.610",
+ "cc2.8xlarge": "2.700",
+ "cr1.8xlarge": "3.750",
+ "m1.large": "0.260",
+ "m1.medium": "0.180",
+ "m1.small": "0.070",
+ "m1.xlarge": "0.730",
+ "m2.2xlarge": "1.020",
+ "m2.4xlarge": "2.040",
+ "m2.xlarge": "0.460",
+ "m3.2xlarge": "1.560",
+ "m3.xlarge": "0.550",
+ "nv1.large": "5.490",
+ "nv1.medium": "5.310",
+ "nv1.small": "5.220",
+ "nv1.xlarge": "5.860",
+ "os1.8xlarge": "6.400",
+ "t1.micro": "0.020"
+ },
+ "osc_sas_us_east_2": {
+ "c1.medium": "0.170",
+ "c1.xlarge": "0.660",
+ "cc1.4xlarge": "1.610",
+ "cc2.8xlarge": "2.700",
+ "cr1.8xlarge": "3.750",
+ "m1.large": "0.260",
+ "m1.medium": "0.180",
+ "m1.small": "0.070",
+ "m1.xlarge": "0.730",
+ "m2.2xlarge": "1.020",
+ "m2.4xlarge": "2.040",
+ "m2.xlarge": "0.460",
+ "m3.2xlarge": "1.560",
+ "m3.xlarge": "0.550",
+ "nv1.large": "5.490",
+ "nv1.medium": "5.310",
+ "nv1.small": "5.220",
+ "nv1.xlarge": "5.860",
+ "os1.8xlarge": "6.400",
+ "t1.micro": "0.020"
+ },
"rackspace": {
"1": 0.015,
"2": 0.03,