You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by wo...@apache.org on 2010/08/30 18:52:53 UTC

svn commit: r990862 - /incubator/libcloud/sandbox/java/trunk/src/drivers/ibm/IBMDriver.java

Author: woodser
Date: Mon Aug 30 16:52:53 2010
New Revision: 990862

URL: http://svn.apache.org/viewvc?rev=990862&view=rev
Log:
Added support for two currently undocumented instance states: 12=Deprovision_pending, 13=Restart_pending.

Modified:
    incubator/libcloud/sandbox/java/trunk/src/drivers/ibm/IBMDriver.java

Modified: incubator/libcloud/sandbox/java/trunk/src/drivers/ibm/IBMDriver.java
URL: http://svn.apache.org/viewvc/incubator/libcloud/sandbox/java/trunk/src/drivers/ibm/IBMDriver.java?rev=990862&r1=990861&r2=990862&view=diff
==============================================================================
--- incubator/libcloud/sandbox/java/trunk/src/drivers/ibm/IBMDriver.java (original)
+++ incubator/libcloud/sandbox/java/trunk/src/drivers/ibm/IBMDriver.java Mon Aug 30 16:52:53 2010
@@ -9,6 +9,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
+import base.ConnectionKey;
 import base.Node;
 import base.NodeDriver;
 import base.NodeState;
@@ -49,6 +50,8 @@ public class IBMDriver extends NodeDrive
 		NODE_STATE_MAP.put(9, NodeState.PENDING);
 		NODE_STATE_MAP.put(10, NodeState.PENDING);
 		NODE_STATE_MAP.put(11, NodeState.TERMINATED);
+		NODE_STATE_MAP.put(12, NodeState.PENDING);	// Deprovision pending
+		NODE_STATE_MAP.put(13, NodeState.PENDING);	// Restart pending
 	}
 
 	public String getName() {
@@ -74,7 +77,7 @@ public class IBMDriver extends NodeDrive
 			}
 		}
 		
-		String encoded = connection.encodeDataMap(data);
+		String encoded = ConnectionKey.urlEncodeMap(data);
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type", "application/x-www-form-urlencoded");
 		IResponse response = connection.request("POST", REST_BASE + "/instances", headers, null, encoded);
@@ -88,7 +91,7 @@ public class IBMDriver extends NodeDrive
 		Map<String, String> data = new HashMap<String, String>();
 		data.put("state", "restart");
 		IResponse response = connection.request("PUT", REST_BASE + "/instances/"
-				+ node.getId(), headers, null, connection.encodeDataMap(data));
+				+ node.getId(), headers, null, ConnectionKey.urlEncodeMap(data));
 		new IBMHandler(response);
 		return response.getStatus() == 200;
 	}