New commands for blockVolume

extend
reset_status

Author: ggerve

core/src/main/java/org/openstack4j/api/storage/BlockVolumeService.java

@@ -63,6 +63,24 @@ public interface BlockVolumeService extends RestService {
 	 */
 	ActionResponse forceDelete(String volumeId);
 
+	/**
+	 * Resets the specified volume status.
+	 *
+	 * @param volumeId the volume id
+	 * @param status new volume status
+	 * @return the action response
+	 */
+	ActionResponse resetState(String volumeId, Volume.Status status);
+
+	/**
+	 * Extends the specified volume size.
+	 *
+	 * @param volumeId the volume id
+	 * @param newSize new volume size
+	 * @return the action response
+	 */
+	ActionResponse extend(String volumeId, Integer newSize);
+
 	/**
 	 * Creates a new Block Storage Volume
 	 * @param volume the volume for create

core/src/main/java/org/openstack4j/openstack/storage/block/domain/ExtendAction.java

@@ -0,0 +1,27 @@
+package org.openstack4j.openstack.storage.block.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.openstack4j.model.ModelEntity;
+import org.openstack4j.model.storage.block.Volume;
+
+@JsonRootName("os-extend")
+public class ExtendAction implements ModelEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@JsonProperty("new_size")
+	private final Integer newSize;
+
+	public ExtendAction(Integer newSize) {
+		this.newSize = newSize;
+	}
+
+	public static ExtendAction create(Integer newSize) {
+		return new ExtendAction(newSize);
+	}
+
+	public Integer getNewSize() {
+		return newSize;
+	}
+}

core/src/main/java/org/openstack4j/openstack/storage/block/domain/ResetStatusAction.java

@@ -0,0 +1,27 @@
+package org.openstack4j.openstack.storage.block.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.openstack4j.model.ModelEntity;
+import org.openstack4j.model.storage.block.Volume;
+
+@JsonRootName("os-reset_status")
+public class ResetStatusAction implements ModelEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@JsonProperty("status")
+	private final Volume.Status status;
+
+	public ResetStatusAction(Volume.Status status) {
+		this.status = status;
+	}
+
+	public static ResetStatusAction create(Volume.Status status) {
+		return new ResetStatusAction(status);
+	}
+
+	public Volume.Status getStatus() {
+		return status;
+	}
+}

core/src/main/java/org/openstack4j/openstack/storage/block/internal/BlockVolumeServiceImpl.java

@@ -19,8 +19,10 @@
 import org.openstack4j.openstack.storage.block.domain.CinderVolume.Volumes;
 import org.openstack4j.openstack.storage.block.domain.CinderVolumeMigration;
 import org.openstack4j.openstack.storage.block.domain.CinderVolumeType.VolumeTypes;
+import org.openstack4j.openstack.storage.block.domain.ExtendAction;
 import org.openstack4j.openstack.storage.block.domain.ForceDeleteAction;
 import org.openstack4j.openstack.storage.block.domain.CinderVolumeUploadImage;
+import org.openstack4j.openstack.storage.block.domain.ResetStatusAction;
 
 /**
  * Manages Volumes and Volume Type based operations against Block Storage (Cinder)
@@ -72,25 +74,49 @@ public ActionResponse delete(String volumeId) {
         return deleteWithResponse(uri("/volumes/%s", volumeId)).execute();
     }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ActionResponse forceDelete(String volumeId) {
-		checkNotNull(volumeId);
-		return post(ActionResponse.class, uri("/volumes/%s/action", volumeId))
-    		    .entity(new ForceDeleteAction())
-    		    .execute();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Volume create(Volume volume) {
-		checkNotNull(volume);
-		return post(CinderVolume.class, uri("/volumes")).entity(volume).execute();
-	}
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ActionResponse forceDelete(String volumeId) {
+        checkNotNull(volumeId);
+        return post(ActionResponse.class, uri("/volumes/%s/action", volumeId))
+                .entity(new ForceDeleteAction())
+                .execute();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ActionResponse resetState(String volumeId, Volume.Status status) {
+        checkNotNull(volumeId);
+        checkNotNull(status);
+        return post(ActionResponse.class, uri("/volumes/%s/action", volumeId))
+                .entity(new ResetStatusAction(status))
+                .execute();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ActionResponse extend(String volumeId, Integer newSize) {
+        checkNotNull(volumeId);
+        checkNotNull(newSize);
+        return post(ActionResponse.class, uri("/volumes/%s/action", volumeId))
+                .entity(new ExtendAction(newSize))
+                .execute();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Volume create(Volume volume) {
+        checkNotNull(volume);
+        return post(CinderVolume.class, uri("/volumes")).entity(volume).execute();
+    }
 
     /**
      * {@inheritDoc}