Skip to content

[LIBCLOUD-543] Update Linode pricing. #281

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
bsdlp wants to merge 1 commit into from
Closed

[LIBCLOUD-543] Update Linode pricing. #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions libcloud/common/linode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
API_HOST = 'api.linode.com'
API_ROOT = '/'

# Constants that map a RAM figure to a PlanID (updated 6/28/10)
LINODE_PLAN_IDS = {1024: '1',
2048: '3',
4096: '5',
8192: '6',
16384: '7',
24576: '8',
32768: '9',
40960: '10'}
# Constants that map a RAM figure to a PlanID (updated 4/25/14)
LINODE_PLAN_IDS = {2048: '1',
4096: '3',
8192: '5',
16384: '6',
32768: '7',
49152: '8',
65536: '9',
98304: '11'}


class LinodeException(Exception):
Expand Down
257 changes: 124 additions & 133 deletions libcloud/test/compute/fixtures/linode/_avail_linodeplans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,134 +1,125 @@
{
"ERRORARRAY": [],
"DATA": [
{
"PRICE": 20,
"RAM": 1024,
"XFER": 2000,
"PLANID": 1,
"LABEL": "Linode 1024",
"AVAIL": {
"2": 500,
"3": 500,
"4": 500,
"6": 500,
"7": 500,
"8": 500
},
"DISK": 48
},
{
"PRICE": 40,
"RAM": 2048,
"XFER": 4000,
"PLANID": 3,
"LABEL": "Linode 2048",
"AVAIL": {
"2": 500,
"3": 500,
"4": 500,
"6": 500,
"7": 500,
"8": 500
},
"DISK": 96
},
{
"PRICE": 80,
"RAM": 4096,
"XFER": 8000,
"PLANID": 5,
"LABEL": "Linode 4096",
"AVAIL": {
"2": 500,
"3": 500,
"4": 500,
"6": 500,
"7": 500,
"8": 500
},
"DISK": 192
},
{
"PRICE": 160,
"RAM": 8192,
"XFER": 16000,
"PLANID": 6,
"LABEL": "Linode 8192",
"AVAIL": {
"2": 500,
"3": 500,
"4": 500,
"6": 500,
"7": 500,
"8": 500
},
"DISK": 384
},
{
"PRICE": 320,
"RAM": 16384,
"XFER": 20000,
"PLANID": 7,
"LABEL": "Linode 16384",
"AVAIL": {
"2": 500,
"3": 500,
"4": 500,
"6": 500,
"7": 500,
"8": 500
},
"DISK": 768
},
{
"PRICE": 480,
"RAM": 24576,
"XFER": 20000,
"PLANID": 8,
"LABEL": "Linode 24576",
"AVAIL": {
"2": 500,
"3": 500,
"4": 500,
"6": 500,
"7": 500,
"8": 500
},
"DISK": 1152
},
{
"PRICE": 640,
"RAM": 32768,
"XFER": 20000,
"PLANID": 9,
"LABEL": "Linode 32768",
"AVAIL": {
"2": 500,
"3": 500,
"4": 500,
"6": 500,
"7": 500,
"8": 500
},
"DISK": 1536
},
{
"PRICE": 800,
"RAM": 40960,
"XFER": 20000,
"PLANID": 10,
"LABEL": "Linode 40960",
"AVAIL": {
"2": 500,
"3": 500,
"4": 500,
"6": 500,
"7": 500,
"8": 500
},
"DISK": 1920
}
],
"ACTION": "avail.linodeplans"
}
"ERRORARRAY": [],
"DATA": [{
"PRICE": 20.00,
"RAM": 2048,
"XFER": 3000,
"PLANID": 1,
"LABEL": "Linode 2048",
"AVAIL": {
"3": 500,
"2": 500,
"7": 500,
"6": 500,
"4": 500,
"8": 500
},
"DISK": 48
}, {
"PRICE": 40.00,
"RAM": 4096,
"XFER": 4000,
"PLANID": 3,
"LABEL": "Linode 4096",
"AVAIL": {
"3": 500,
"2": 500,
"7": 500,
"6": 500,
"4": 500,
"8": 500
},
"DISK": 96
}, {
"PRICE": 80.00,
"RAM": 8192,
"XFER": 8000,
"PLANID": 5,
"LABEL": "Linode 8192",
"AVAIL": {
"3": 500,
"2": 500,
"7": 500,
"6": 500,
"4": 500,
"8": 500
},
"DISK": 192
}, {
"PRICE": 160.00,
"RAM": 16384,
"XFER": 16000,
"PLANID": 6,
"LABEL": "Linode 16384",
"AVAIL": {
"3": 500,
"2": 500,
"7": 500,
"6": 500,
"4": 500,
"8": 500
},
"DISK": 384
}, {
"PRICE": 320.00,
"RAM": 32768,
"XFER": 20000,
"PLANID": 7,
"LABEL": "Linode 32768",
"AVAIL": {
"3": 500,
"2": 500,
"7": 500,
"6": 500,
"4": 500,
"8": 500
},
"DISK": 768
}, {
"PRICE": 480.00,
"RAM": 49152,
"XFER": 20000,
"PLANID": 8,
"LABEL": "Linode 49152",
"AVAIL": {
"3": 500,
"2": 500,
"7": 500,
"6": 500,
"4": 500,
"8": 500
},
"DISK": 1152
}, {
"PRICE": 640.00,
"RAM": 65536,
"XFER": 20000,
"PLANID": 9,
"LABEL": "Linode 65536",
"AVAIL": {
"3": 500,
"2": 500,
"7": 500,
"6": 500,
"4": 500,
"8": 500
},
"DISK": 1536
}, {
"PRICE": 960.00,
"RAM": 98304,
"XFER": 20000,
"PLANID": 11,
"LABEL": "Linode 98304",
"AVAIL": {
"3": 500,
"2": 500,
"7": 500,
"6": 500,
"4": 500,
"8": 500
},
"DISK": 1920
}],
"ACTION": "avail.linodeplans"
}
6 changes: 3 additions & 3 deletions libcloud/test/compute/fixtures/linode/_linode_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"STATUS": 1,
"ALERT_DISKIO_ENABLED": 1,
"CREATE_DT": "2012-05-04 19:31:30.0",
"TOTALHD": 98304,
"TOTALHD": 49152,
"ALERT_BWQUOTA_THRESHOLD": 80,
"TOTALRAM": 2048,
"ALERT_BWIN_THRESHOLD": 5,
Expand All @@ -22,11 +22,11 @@
"ALERT_BWOUT_ENABLED": 1,
"BACKUPSENABLED": 1,
"ALERT_CPU_THRESHOLD": 90,
"PLANID": "3",
"PLANID": "1",
"BACKUPWEEKLYDAY": 0,
"LABEL": "api-node3",
"LPM_DISPLAYGROUP": "test",
"TOTALXFER": 4000
"TOTALXFER": 3000
}
],
"ACTION": "linode.list"
Expand Down
2 changes: 1 addition & 1 deletion libcloud/test/compute/test_linode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_list_nodes(self):
node = nodes[0]
self.assertEqual(node.id, "8098")
self.assertEqual(node.name, 'api-node3')
self.assertEqual(node.extra['PLANID'], '3')
self.assertEqual(node.extra['PLANID'], '1')
self.assertTrue('75.127.96.245' in node.public_ips)
self.assertEqual(node.private_ips, [])

Expand Down