You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by je...@apache.org on 2010/12/24 18:38:46 UTC
svn commit: r1052535 - in /incubator/libcloud/trunk:
libcloud/drivers/elastichosts.py test/test_elastichosts.py
Author: jerry
Date: Fri Dec 24 17:38:46 2010
New Revision: 1052535
URL: http://svn.apache.org/viewvc?rev=1052535&view=rev
Log:
Update standard drives list for ElasticHosts
Modified:
incubator/libcloud/trunk/libcloud/drivers/elastichosts.py
incubator/libcloud/trunk/test/test_elastichosts.py
Modified: incubator/libcloud/trunk/libcloud/drivers/elastichosts.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/elastichosts.py?rev=1052535&r1=1052534&r2=1052535&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/elastichosts.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/elastichosts.py Fri Dec 24 17:38:46 2010
@@ -105,50 +105,53 @@ INSTANCE_TYPES = {
# Retrieved from http://www.elastichosts.com/cloud-hosting/api
STANDARD_DRIVES = {
- 'cf82519b-01a0-4247-aff5-a2dadf4401ad': {
- 'uuid': 'cf82519b-01a0-4247-aff5-a2dadf4401ad',
- 'description': 'Debian Linux 4.0: Base system without X',
- 'size_gunzipped': '1GB',
+ '38df0986-4d85-4b76-b502-3878ffc80161': {
+ 'uuid': '38df0986-4d85-4b76-b502-3878ffc80161',
+ 'description': 'CentOS Linux 5.5',
+ 'size_gunzipped': '3GB',
+ 'supports_deployment': True,
},
- 'e6111e4c-67af-4438-b1bc-189747d5a8e5': {
- 'uuid': 'e6111e4c-67af-4438-b1bc-189747d5a8e5',
- 'description': 'Debian Linux 5.0: Base system without X',
+ '980cf63c-f21e-4382-997b-6541d5809629': {
+ 'uuid': '980cf63c-f21e-4382-997b-6541d5809629',
+ 'description': 'Debian Linux 5.0',
'size_gunzipped': '1GB',
+ 'supports_deployment': True,
},
- 'bf1d943e-2a55-46bb-a8c7-6099e44a3dde': {
- 'uuid': 'bf1d943e-2a55-46bb-a8c7-6099e44a3dde',
- 'description': 'Ubuntu Linux 8.10: Base system with X',
- 'size_gunzipped': '3GB',
- },
- '757586d5-f1e9-4d9c-b215-5a391c9a24bf': {
- 'uuid': '757586d5-f1e9-4d9c-b215-5a391c9a24bf',
- 'description': 'Ubuntu Linux 9.04: Base system with X',
- 'size_gunzipped': '3GB',
+ 'aee5589a-88c3-43ef-bb0a-9cab6e64192d': {
+ 'uuid': 'aee5589a-88c3-43ef-bb0a-9cab6e64192d',
+ 'description': 'Ubuntu Linux 10.04',
+ 'size_gunzipped': '1GB',
+ 'supports_deployment': True,
},
'b9d0eb72-d273-43f1-98e3-0d4b87d372c0': {
'uuid': 'b9d0eb72-d273-43f1-98e3-0d4b87d372c0',
'description': 'Windows Web Server 2008',
'size_gunzipped': '13GB',
+ 'supports_deployment': False,
},
'30824e97-05a4-410c-946e-2ba5a92b07cb': {
'uuid': '30824e97-05a4-410c-946e-2ba5a92b07cb',
'description': 'Windows Web Server 2008 R2',
'size_gunzipped': '13GB',
+ 'supports_deployment': False,
},
'9ecf810e-6ad1-40ef-b360-d606f0444671': {
'uuid': '9ecf810e-6ad1-40ef-b360-d606f0444671',
'description': 'Windows Web Server 2008 R2 + SQL Server',
'size_gunzipped': '13GB',
+ 'supports_deployment': False,
},
'10a88d1c-6575-46e3-8d2c-7744065ea530': {
'uuid': '10a88d1c-6575-46e3-8d2c-7744065ea530',
'description': 'Windows Server 2008 Standard R2',
'size_gunzipped': '13GB',
+ 'supports_deployment': False,
},
'2567f25c-8fb8-45c7-95fc-bfe3c3d84c47': {
'uuid': '2567f25c-8fb8-45c7-95fc-bfe3c3d84c47',
'description': 'Windows Server 2008 Standard R2 + SQL Server',
'size_gunzipped': '13GB',
+ 'supports_deployment': False,
},
}
Modified: incubator/libcloud/trunk/test/test_elastichosts.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_elastichosts.py?rev=1052535&r1=1052534&r2=1052535&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_elastichosts.py (original)
+++ incubator/libcloud/trunk/test/test_elastichosts.py Fri Dec 24 17:38:46 2010
@@ -50,10 +50,10 @@ class ElasticHostsTestCase(unittest.Test
def test_list_images(self):
sizes = self.driver.list_images()
- self.assertEqual(len(sizes), 9)
+ self.assertEqual(len(sizes), 8)
size = sizes[0]
- self.assertEqual(size.id, '757586d5-f1e9-4d9c-b215-5a391c9a24bf')
- self.assertEqual(size.name, 'Ubuntu Linux 9.04: Base system with X')
+ self.assertEqual(size.id, '38df0986-4d85-4b76-b502-3878ffc80161')
+ self.assertEqual(size.name, 'CentOS Linux 5.5')
def test_list_locations_response(self):
pass
@@ -85,7 +85,7 @@ class ElasticHostsHttp(MockHttp):
body = self.fixtures.load('drives_create.json')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
- def _drives_0012e24a_6eae_4279_9912_3432f698cec8_image_757586d5_f1e9_4d9c_b215_5a391c9a24bf_gunzip(self, method, url, body, headers):
+ def _drives_0012e24a_6eae_4279_9912_3432f698cec8_image_38df0986_4d85_4b76_b502_3878ffc80161_gunzip(self, method, url, body, headers):
return (httplib.NO_CONTENT, body, {}, httplib.responses[httplib.NO_CONTENT])
def _drives_0012e24a_6eae_4279_9912_3432f698cec8_info(self, method, url, body, headers):