You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2011/03/25 15:01:44 UTC
svn commit: r1085375 - in /incubator/libcloud/trunk/test/compute:
fixtures/gandi/vm_info.xml fixtures/gandi/vm_reboot.xml
fixtures/gandi/vm_stop.xml test_gandi.py
Author: tomaz
Date: Fri Mar 25 14:01:44 2011
New Revision: 1085375
URL: http://svn.apache.org/viewvc?rev=1085375&view=rev
Log:
Add more tests for the Gandi.net compute driver.
Changes submitted by Aymeric Barantal <mric at gandi dot net> as a part
of LIBCLOUD-76.
Added:
incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_reboot.xml
incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_stop.xml
Modified:
incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_info.xml
incubator/libcloud/trunk/test/compute/test_gandi.py
Modified: incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_info.xml
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_info.xml?rev=1085375&r1=1085374&r2=1085375&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_info.xml (original)
+++ incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_info.xml Fri Mar 25 14:01:44 2011
@@ -89,7 +89,7 @@
</member>
<member>
<name>state</name>
-<value><string>halted</string></value>
+<value><string>running</string></value>
</member>
<member>
<name>is_boot_disk</name>
@@ -130,7 +130,7 @@
</member>
<member>
<name>state</name>
-<value><string>halted</string></value>
+<value><string>running</string></value>
</member>
<member>
<name>flex_shares</name>
Added: incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_reboot.xml
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_reboot.xml?rev=1085375&view=auto
==============================================================================
--- incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_reboot.xml (added)
+++ incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_reboot.xml Fri Mar 25 14:01:44 2011
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<methodResponse>
+<params>
+<param>
+<value><struct>
+<member>
+<name>iface_id</name>
+<value><string></string></value>
+</member>
+<member>
+<name>date_updated</name>
+<value><dateTime.iso8601>20110325T13:18:27</dateTime.iso8601></value>
+</member>
+<member>
+<name>vm_id</name>
+<value><int>250133</int></value>
+</member>
+<member>
+<name>date_start</name>
+<value><string></string></value>
+</member>
+<member>
+<name>disk_id</name>
+<value><string></string></value>
+</member>
+<member>
+<name>source</name>
+<value><string>AB3917-GANDI</string></value>
+</member>
+<member>
+<name>step</name>
+<value><string>WAIT</string></value>
+</member>
+<member>
+<name>ip_id</name>
+<value><string></string></value>
+</member>
+<member>
+<name>date_created</name>
+<value><dateTime.iso8601>20110325T13:18:27</dateTime.iso8601></value>
+</member>
+<member>
+<name>type</name>
+<value><string>vm_reboot</string></value>
+</member>
+<member>
+<name>id</name>
+<value><int>637398</int></value>
+</member>
+</struct></value>
+</param>
+</params>
+</methodResponse>
\ No newline at end of file
Added: incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_stop.xml
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_stop.xml?rev=1085375&view=auto
==============================================================================
--- incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_stop.xml (added)
+++ incubator/libcloud/trunk/test/compute/fixtures/gandi/vm_stop.xml Fri Mar 25 14:01:44 2011
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<methodResponse>
+<params>
+<param>
+<value><struct>
+<member>
+<name>iface_id</name>
+<value><string></string></value>
+</member>
+<member>
+<name>date_updated</name>
+<value><dateTime.iso8601>20110325T13:19:52</dateTime.iso8601></value>
+</member>
+<member>
+<name>vm_id</name>
+<value><int>250133</int></value>
+</member>
+<member>
+<name>date_start</name>
+<value><string></string></value>
+</member>
+<member>
+<name>disk_id</name>
+<value><string></string></value>
+</member>
+<member>
+<name>source</name>
+<value><string>AB3917-GANDI</string></value>
+</member>
+<member>
+<name>step</name>
+<value><string>WAIT</string></value>
+</member>
+<member>
+<name>ip_id</name>
+<value><string></string></value>
+</member>
+<member>
+<name>date_created</name>
+<value><dateTime.iso8601>20110325T13:19:52</dateTime.iso8601></value>
+</member>
+<member>
+<name>type</name>
+<value><string>vm_stop</string></value>
+</member>
+<member>
+<name>id</name>
+<value><int>637399</int></value>
+</member>
+</struct></value>
+</param>
+</params>
+</methodResponse>
\ No newline at end of file
Modified: incubator/libcloud/trunk/test/compute/test_gandi.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/compute/test_gandi.py?rev=1085375&r1=1085374&r2=1085375&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/compute/test_gandi.py (original)
+++ incubator/libcloud/trunk/test/compute/test_gandi.py Fri Mar 25 14:01:44 2011
@@ -21,6 +21,7 @@ import httplib
import xmlrpclib
from libcloud.compute.drivers.gandi import GandiNodeDriver as Gandi
+from libcloud.compute.types import NodeState
from xml.etree import ElementTree as ET
from test import MockHttp
@@ -61,11 +62,21 @@ class GandiTests(unittest.TestCase):
sizes = self.driver.list_sizes()
self.assertTrue(len(sizes)>=1)
- def test_destroy_node(self):
+ def test_destroy_node_running(self):
nodes = self.driver.list_nodes()
- test_node = filter(lambda x: self.node_name in x.name, nodes)[0]
+ test_node = filter(lambda x: x.state == NodeState.RUNNING, nodes)[0]
self.assertTrue(self.driver.destroy_node(test_node))
+ def test_destroy_node_halted(self):
+ nodes = self.driver.list_nodes()
+ test_node = filter(lambda x: x.state == NodeState.TERMINATED, nodes)[0]
+ self.assertTrue(self.driver.destroy_node(test_node))
+
+ def test_reboot_node(self):
+ nodes = self.driver.list_nodes()
+ test_node = filter(lambda x: x.state == NodeState.RUNNING, nodes)[0]
+ self.assertTrue(self.driver.reboot_node(test_node))
+
def test_create_node(self):
login = 'libcloud'
passwd = ''.join(random.choice(string.letters + string.digits) for i in xrange(10))
@@ -120,5 +131,13 @@ class GandiMockHttp(MockHttp):
body = self.fixtures.load('vm_create_from.xml')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+ def _xmlrpc_2_0__vm_reboot(self, method, url, body, headers):
+ body = self.fixtures.load('vm_reboot.xml')
+ return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+ def _xmlrpc_2_0__vm_stop(self, method, url, body, headers):
+ body = self.fixtures.load('vm_stop.xml')
+ return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
if __name__ == '__main__':
sys.exit(unittest.main())