You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by pq...@apache.org on 2010/01/08 23:29:03 UTC
svn commit: r897339 - in /incubator/libcloud/trunk:
libcloud/drivers/dummy.py libcloud/drivers/ec2.py
libcloud/drivers/gogrid.py libcloud/drivers/rimuhosting.py
libcloud/drivers/slicehost.py libcloud/drivers/vpsnet.py
test/test_slicehost.py
Author: pquerna
Date: Fri Jan 8 22:29:03 2010
New Revision: 897339
URL: http://svn.apache.org/viewvc?rev=897339&view=rev
Log:
Enforce that IP addresses on nodes are always in lists
Modified:
incubator/libcloud/trunk/libcloud/drivers/dummy.py
incubator/libcloud/trunk/libcloud/drivers/ec2.py
incubator/libcloud/trunk/libcloud/drivers/gogrid.py
incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py
incubator/libcloud/trunk/libcloud/drivers/slicehost.py
incubator/libcloud/trunk/libcloud/drivers/vpsnet.py
incubator/libcloud/trunk/test/test_slicehost.py
Modified: incubator/libcloud/trunk/libcloud/drivers/dummy.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/dummy.py?rev=897339&r1=897338&r2=897339&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/dummy.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/dummy.py Fri Jan 8 22:29:03 2010
@@ -38,13 +38,13 @@
Node(uuid=self.get_uuid(),
name='dummy-1',
state=NodeState.RUNNING,
- ipaddress='127.0.0.1',
+ ipaddress=['127.0.0.1'],
creds=self.creds,
attrs={'foo': 'bar'}),
Node(uuid=self.get_uuid(),
name='dummy-2',
state=NodeState.REBOOTING,
- ipaddress='127.0.0.2',
+ ipaddress=['127.0.0.2'],
creds=self.creds,
attrs={'foo': 'bar'})
]
Modified: incubator/libcloud/trunk/libcloud/drivers/ec2.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/ec2.py?rev=897339&r1=897338&r2=897339&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/ec2.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/ec2.py Fri Jan 8 22:29:03 2010
@@ -207,8 +207,8 @@
n = Node(id=self._findtext(element, 'instanceId'),
name=self._findtext(element, 'instanceId'),
state=state,
- public_ip=self._findtext(element, 'dnsName'),
- private_ip=self._findtext(element, 'privateDnsName'),
+ public_ip=[self._findtext(element, 'dnsName')],
+ private_ip=[self._findtext(element, 'privateDnsName')],
driver=self.connection.driver)
return n
Modified: incubator/libcloud/trunk/libcloud/drivers/gogrid.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/gogrid.py?rev=897339&r1=897338&r2=897339&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/gogrid.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/gogrid.py Fri Jan 8 22:29:03 2010
@@ -145,8 +145,8 @@
n = GoGridNode(id=id,
name=element['name'],
state=state,
- public_ip=ip,
- private_ip=ip,
+ public_ip=[ip],
+ private_ip=[],
driver=self.connection.driver)
return n
Modified: incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py?rev=897339&r1=897338&r2=897339&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/rimuhosting.py Fri Jan 8 22:29:03 2010
@@ -110,7 +110,7 @@
name=order['domain_name'],
state=NodeState.RUNNING,
public_ip=[order['allocated_ips']['primary_ip']]+order['allocated_ips']['secondary_ips'],
- private_ip=None,
+ private_ip=[],
driver=self.connection.driver
)
n.slug = order['slug']
Modified: incubator/libcloud/trunk/libcloud/drivers/slicehost.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/slicehost.py?rev=897339&r1=897338&r2=897339&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/slicehost.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/slicehost.py Fri Jan 8 22:29:03 2010
@@ -167,8 +167,8 @@
n = Node(id=element.findtext('id'),
name=element.findtext('name'),
state=state,
- public_ip=public_ip,
- private_ip=private_ip,
+ public_ip=[public_ip],
+ private_ip=[private_ip],
driver=self.connection.driver)
return n
Modified: incubator/libcloud/trunk/libcloud/drivers/vpsnet.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/vpsnet.py?rev=897339&r1=897338&r2=897339&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/vpsnet.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/vpsnet.py Fri Jan 8 22:29:03 2010
@@ -92,8 +92,8 @@
n = Node(id=vm['id'],
name=vm['label'],
state=state,
- public_ip=vm.get('primary_ip_address', None),
- private_ip=None,
+ public_ip=[vm.get('primary_ip_address', None)],
+ private_ip=[],
driver=self.connection.driver)
return n
Modified: incubator/libcloud/trunk/test/test_slicehost.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/test_slicehost.py?rev=897339&r1=897338&r2=897339&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/test_slicehost.py (original)
+++ incubator/libcloud/trunk/test/test_slicehost.py Fri Jan 8 22:29:03 2010
@@ -37,8 +37,8 @@
ret = self.driver.list_nodes()
self.assertEqual(len(ret), 1)
node = ret[0]
- self.assertEqual(node.public_ip, '174.143.212.229')
- self.assertEqual(node.private_ip, '10.176.164.199')
+ self.assertTrue('174.143.212.229' in node.public_ip)
+ self.assertTrue('10.176.164.199' in node.private_ip)
self.assertEqual(node.state, NodeState.PENDING)
SlicehostMockHttp.type = 'UNAUTHORIZED'