Index: test/compute/fixtures/opennebula_2_0/compute_5.xml
===================================================================
--- test/compute/fixtures/opennebula_2_0/compute_5.xml	(revision 1240450)
+++ test/compute/fixtures/opennebula_2_0/compute_5.xml	(working copy)
@@ -3,7 +3,7 @@
     <ID>5</ID>
     <NAME>Compute 5</NAME>
     <INSTANCE_TYPE>small</INSTANCE_TYPE>
-    <STATE>RUNNING</STATE>
+    <STATE>ACTIVE</STATE>
     <DISK>
         <STORAGE href='http://www.opennebula.org/storage/5' name='Ubuntu 9.04 LAMP'/>
         <TYPE>DISK</TYPE>
Index: test/compute/fixtures/opennebula_2_0/compute_15.xml
===================================================================
--- test/compute/fixtures/opennebula_2_0/compute_15.xml	(revision 1240450)
+++ test/compute/fixtures/opennebula_2_0/compute_15.xml	(working copy)
@@ -3,7 +3,7 @@
     <ID>15</ID>
     <NAME>Compute 15</NAME>
     <INSTANCE_TYPE>small</INSTANCE_TYPE>
-    <STATE>RUNNING</STATE>
+    <STATE>ACTIVE</STATE>
     <DISK>
         <STORAGE href='http://www.opennebula.org/storage/15' name='Ubuntu 9.04 LAMP'/>
         <TYPE>DISK</TYPE>
Index: test/compute/fixtures/opennebula_1_4/compute_5.xml
===================================================================
--- test/compute/fixtures/opennebula_1_4/compute_5.xml	(revision 1240450)
+++ test/compute/fixtures/opennebula_1_4/compute_5.xml	(working copy)
@@ -2,7 +2,7 @@
 <COMPUTE>
     <ID>5</ID>
     <NAME>Compute 5</NAME>
-    <STATE>RUNNING</STATE>
+    <STATE>ACTIVE</STATE>
     <STORAGE>
         <DISK image="5" dev="sda1"/>
         <FS size="512" format="ext3" dev="sda3"/>
Index: test/compute/fixtures/opennebula_1_4/compute_15.xml
===================================================================
--- test/compute/fixtures/opennebula_1_4/compute_15.xml	(revision 1240450)
+++ test/compute/fixtures/opennebula_1_4/compute_15.xml	(working copy)
@@ -2,7 +2,7 @@
 <COMPUTE>
     <ID>15</ID>
     <NAME>Compute 15</NAME>
-    <STATE>RUNNING</STATE>
+    <STATE>ACTIVE</STATE>
     <STORAGE>
         <DISK image="15" dev="sda1"/>
         <FS size="512" format="ext3" dev="sda3"/>
Index: test/compute/fixtures/opennebula_3_2/compute_5.xml
===================================================================
--- test/compute/fixtures/opennebula_3_2/compute_5.xml	(revision 1240450)
+++ test/compute/fixtures/opennebula_3_2/compute_5.xml	(working copy)
@@ -3,7 +3,7 @@
     <ID>5</ID>
     <NAME>Compute 5</NAME>
     <INSTANCE_TYPE>small</INSTANCE_TYPE>
-    <STATE>RUNNING</STATE>
+    <STATE>ACTIVE</STATE>
     <DISK>
         <STORAGE href='http://www.opennebula.org/storage/5' name='Ubuntu 9.04 LAMP'/>
         <TYPE>DISK</TYPE>
Index: test/compute/test_opennebula.py
===================================================================
--- test/compute/test_opennebula.py	(revision 1240450)
+++ test/compute/test_opennebula.py	(working copy)
@@ -90,7 +90,7 @@
         self.assertEqual(node.id, '5')
         self.assertEqual(node.name, 'Compute 5')
         self.assertEqual(node.state,
-                         OpenNebulaNodeDriver.NODE_STATE_MAP['RUNNING'])
+                         OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE'])
         self.assertEqual(node.public_ips[0].name, None)
         self.assertEqual(node.public_ips[0].id, '5')
         self.assertEqual(node.public_ips[0].address, '192.168.0.1')
@@ -122,7 +122,7 @@
         self.assertEqual(node.id, '5')
         self.assertEqual(node.name, 'Compute 5')
         self.assertEqual(node.state,
-                         OpenNebulaNodeDriver.NODE_STATE_MAP['RUNNING'])
+                         OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE'])
         self.assertEqual(node.public_ips[0].id, '5')
         self.assertEqual(node.public_ips[0].name, None)
         self.assertEqual(node.public_ips[0].address, '192.168.0.1')
@@ -138,7 +138,7 @@
         self.assertEqual(node.id, '15')
         self.assertEqual(node.name, 'Compute 15')
         self.assertEqual(node.state,
-                         OpenNebulaNodeDriver.NODE_STATE_MAP['RUNNING'])
+                         OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE'])
         self.assertEqual(node.public_ips[0].id, '5')
         self.assertEqual(node.public_ips[0].name, None)
         self.assertEqual(node.public_ips[0].address, '192.168.0.2')
@@ -274,7 +274,7 @@
         self.assertEqual(node.id, '5')
         self.assertEqual(node.name, 'Compute 5')
         self.assertEqual(node.state,
-                         OpenNebulaNodeDriver.NODE_STATE_MAP['RUNNING'])
+                         OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE'])
         self.assertEqual(node.public_ips[0].id, '5')
         self.assertEqual(node.public_ips[0].name, 'Network 5')
         self.assertEqual(node.public_ips[0].address, '192.168.0.1')
@@ -314,7 +314,7 @@
         self.assertEqual(node.id, '5')
         self.assertEqual(node.name, 'Compute 5')
         self.assertEqual(node.state,
-                         OpenNebulaNodeDriver.NODE_STATE_MAP['RUNNING'])
+                         OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE'])
         self.assertEqual(node.public_ips[0].id, '5')
         self.assertEqual(node.public_ips[0].name, 'Network 5')
         self.assertEqual(node.public_ips[0].address, '192.168.0.1')
@@ -352,7 +352,7 @@
         self.assertEqual(node.id, '15')
         self.assertEqual(node.name, 'Compute 15')
         self.assertEqual(node.state,
-                         OpenNebulaNodeDriver.NODE_STATE_MAP['RUNNING'])
+                         OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE'])
         self.assertEqual(node.public_ips[0].id, '5')
         self.assertEqual(node.public_ips[0].name, 'Network 5')
         self.assertEqual(node.public_ips[0].address, '192.168.0.2')
@@ -390,7 +390,7 @@
         self.assertEqual(node.id, '25')
         self.assertEqual(node.name, 'Compute 25')
         self.assertEqual(node.state,
-                         OpenNebulaNodeDriver.NODE_STATE_MAP['UNKNOWN'])
+                         NodeState.UNKNOWN)
         self.assertEqual(node.public_ips[0].id, '5')
         self.assertEqual(node.public_ips[0].name, 'Network 5')
         self.assertEqual(node.public_ips[0].address, '192.168.0.3')
Index: libcloud/compute/drivers/opennebula.py
===================================================================
--- libcloud/compute/drivers/opennebula.py	(revision 1240450)
+++ libcloud/compute/drivers/opennebula.py	(working copy)
@@ -267,17 +267,14 @@
     type = Provider.OPENNEBULA
 
     NODE_STATE_MAP = {
+        'INIT': NodeState.PENDING,
         'PENDING': NodeState.PENDING,
         'HOLD': NodeState.PENDING,
-        'PROLOG': NodeState.PENDING,
-        'RUNNING': NodeState.RUNNING,
-        'MIGRATE': NodeState.PENDING,
-        'EPILOG': NodeState.TERMINATED,
+        'ACTIVE': NodeState.RUNNING,
         'STOPPED': NodeState.TERMINATED,
         'SUSPENDED': NodeState.PENDING,
-        'FAILED': NodeState.TERMINATED,
-        'UNKNOWN': NodeState.UNKNOWN,
-        'DONE': NodeState.TERMINATED}
+        'DONE': NodeState.TERMINATED,
+        'FAILED': NodeState.TERMINATED}
 
     def __new__(cls, key, secret=None, api_version=DEFAULT_API_VERSION,
                 **kwargs):