Merge pull request woorea#127 from kovaliovs/master

woorea · woorea · commit abf4e4f57935 · 2014-03-13T02:08:52.000+01:00
Fix password field name
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java
@@ -12,7 +12,7 @@ public class User implements Serializable {
 	
 	private String username;
 	
-	@JsonProperty("OS_KSADM_password")
+	@JsonProperty("OS-KSADM:password")
 	private String password;
 	
 	private String tenantId;
diff --git a/nova-client/src/main/java/com/woorea/openstack/nova/api/ServersResource.java b/nova-client/src/main/java/com/woorea/openstack/nova/api/ServersResource.java
@@ -230,15 +230,13 @@ public ReverResizeAction(String id) {
 
 	}
 
-	public class CreateImageAction extends Action<Server> {
+    public class CreateImageAction extends Action<Void> {
 
-		private CreateImage action;
+        public CreateImageAction(String id, CreateImage createImage) {
+            super(id, Entity.json(createImage), Void.class);
+        }
 
-		public CreateImageAction(String id) {
-			super(id, Entity.json(new CreateImage()), Server.class);
-		}
-
-	}
+    }
 
 	public class StartServer extends OpenStackRequest<Void> {
 
@@ -264,6 +262,10 @@ public StopServer(String id) {
 
 	}
 
+    public CreateImageAction createImage(String id, CreateImage createImage) {
+        return new CreateImageAction(id, createImage);
+    }
+
 	public StartServer start(String id) {
 		return new StartServer(id);
 	}
diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
@@ -63,6 +63,7 @@ public ObjectMapper getContext(Class<?> type) {
 		DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
 		DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
 		DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+		DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
 
 		WRAPPED_MAPPER = new ObjectMapper();
 
@@ -71,6 +72,7 @@ public ObjectMapper getContext(Class<?> type) {
 		WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
 		WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
 		WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+		WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
 
 		providerFactory = new OpenStackProviderFactory();
 	}
@@ -107,7 +109,8 @@ public <T> OpenStackResponse request(OpenStackRequest<T> request) {
 
 		if (response.getStatus() == HttpStatus.SC_OK
 				|| response.getStatus() == HttpStatus.SC_CREATED
-				|| response.getStatus() == HttpStatus.SC_NO_CONTENT) {
+				|| response.getStatus() == HttpStatus.SC_NO_CONTENT
+				|| response.getStatus() == HttpStatus.SC_ACCEPTED) {
 			return new RESTEasyResponse(client, response);
 		}
 
