Skip to content

LIBCLOUD-560: Updated CloudStack driver to support new resource types in 4.3 #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cderamus wants to merge 17 commits into from
Closed

LIBCLOUD-560: Updated CloudStack driver to support new resource types in 4.3 #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7772606
Merge pull request #12 from apache/trunk
cderamus Dec 26, 2013
43f931c
Merge pull request #13 from apache/trunk
cderamus Dec 27, 2013
93ee2eb
Merge pull request #14 from apache/trunk
cderamus Dec 27, 2013
4b8e220
Merge pull request #16 from apache/trunk
cderamus Dec 28, 2013
7980d70
Merge pull request #17 from apache/trunk
cderamus Dec 29, 2013
0d5710d
Merge pull request #18 from apache/trunk
cderamus Dec 30, 2013
f04d920
Merge pull request #19 from apache/trunk
cderamus Dec 30, 2013
7a700d9
Merge pull request #20 from apache/trunk
cderamus Jan 2, 2014
d4643f5
Merge pull request #21 from apache/trunk
cderamus Jan 10, 2014
044eee6
Merge remote-tracking branch 'upstream/trunk' into trunk
Jan 12, 2014
5fb3660
Merge branch 'trunk' of https://github.com/DivvyCloud/libcloud into t…
Feb 2, 2014
a3caf59
Merge branch 'trunk' of https://github.com/DivvyCloud/libcloud into t…
Feb 4, 2014
a02a5f4
Adding in the hs1.4xlarge and hs1.8xlarge instance types into regions…
Mar 2, 2014
de2fca6
Adding in the hs1.4xlarge and hs1.8xlarge instance types into regions…
Mar 2, 2014
97ad6a2
Revert "Adding in the hs1.4xlarge and hs1.8xlarge instance types into…
Mar 2, 2014
399289e
Merge branch 'trunk' of https://github.com/DivvyCloud/libcloud into t…
Mar 2, 2014
b9f8877
LIBCLOUD-560: Add support for new resourcetypes in the 4.3 version of…
May 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions libcloud/compute/drivers/cloudstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,6 +1667,9 @@ def ex_limits(self):
CloudStack uses integers as the resource type so we will convert
them to a more human readable string using the resource map

A list of the resource type mappings can be found at
http://goo.gl/17C6Gk

:return: dict
:rtype: ``dict``
"""
Expand All @@ -1683,11 +1686,18 @@ def ex_limits(self):
4: 'max_images',
5: 'max_projects',
6: 'max_networks',
7: 'max_vpc'
7: 'max_vpc',
8: 'max_cpu',
9: 'max_memory',
10: 'max_primary_storage',
11: 'max_secondary_storage'
}

for limit in result.get('resourcelimit', []):
resource = resource_map[int(limit['resourcetype'])]
# We will ignore unknown types
resource = resource_map.get(int(limit['resourcetype']), None)
if not resource:
continue
limits[resource] = int(limit['max'])

return limits
Expand Down
14 changes: 14 additions & 0 deletions libcloud/compute/drivers/ec2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,13 @@
'disk': 240,
'bandwidth': None
},
'hs1.4xlarge': {
'id': 'hs1.4xlarge',
'name': 'High Storage Quadruple Extra Large Instance',
'ram': 61952,
'disk': 2048,
'bandwidth': None
},
'hs1.8xlarge': {
'id': 'hs1.8xlarge',
'name': 'High Storage Eight Extra Large Instance',
Expand Down Expand Up @@ -313,6 +320,7 @@
'cg1.4xlarge',
'g2.2xlarge',
'cr1.8xlarge',
'hs1.4xlarge',
'hs1.8xlarge',
'i2.xlarge',
'i2.2xlarge',
Expand Down Expand Up @@ -374,6 +382,8 @@
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
'hs1.4xlarge',
'hs1.8xlarge',
'cc2.8xlarge',
'i2.xlarge',
'i2.2xlarge',
Expand Down Expand Up @@ -407,6 +417,8 @@
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
'hs1.4xlarge',
'hs1.8xlarge',
'cc2.8xlarge',
'i2.xlarge',
'i2.2xlarge',
Expand Down Expand Up @@ -472,6 +484,8 @@
'c3.2xlarge',
'c3.4xlarge',
'c3.8xlarge',
'hs1.4xlarge',
'hs1.8xlarge',
'i2.xlarge',
'i2.2xlarge',
'i2.4xlarge',
Expand Down
13 changes: 11 additions & 2 deletions libcloud/data/pricing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
"m1.xlarge": 0.52,
"c1.medium": 0.17,
"c1.xlarge": 0.68,
"c3.large": 0.150,
"c3.xlarge": 0.300,
"c3.large": 0.150
, "c3.xlarge": 0.300,
"c3.2xlarge": 0.600,
"c3.4xlarge": 1.200,
"c3.8xlarge": 2.400,
Expand All @@ -90,6 +90,7 @@
"cc1.4xlarge": 1.3,
"cc2.8xlarge": 2.4,
"cr1.8xlarge": 3.50,
"hs1.4xlarge": 3.1,
"hs1.8xlarge": 4.6,
"i2.xlarge": 0.85,
"i2.2xlarge": 1.71,
Expand Down Expand Up @@ -118,6 +119,8 @@
"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,
Expand Down Expand Up @@ -145,6 +148,8 @@
"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,
Expand Down Expand Up @@ -173,6 +178,8 @@
"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,
Expand Down Expand Up @@ -228,6 +235,8 @@
"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,
Expand Down