add detach method to blockstorage api

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

@@ -174,7 +174,15 @@ public interface BlockVolumeService extends RestService {
 	 * @return
 	 */
 	ActionResponse forceDetach(String volumeId, String initiator,String attachmentId  );
-
+
+	/**
+	 * Detach volume from server
+	 * @author capitek-xuning（首信科技-徐宁）
+	 * @param volumeId
+	 * @param attachmentId
+	 * @return
+	 */
+	ActionResponse detach(String volumeId, String attachmentId);
 
 	/**
 	 * Update volume bootable status.

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

@@ -27,6 +27,9 @@ public class CinderVolumeAttachment implements VolumeAttachment {
 
 	@JsonProperty
 	private String server_id;
+
+	@JsonProperty
+	private String attachment_id;
 
 	@JsonProperty
 	private String volume_id;

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

@@ -0,0 +1,37 @@
+package org.openstack4j.openstack.storage.block.domain;
+
+import org.openstack4j.model.ModelEntity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+/**
+ * os-detach
+ * @author capitek-xuning（首信科技-徐宁）
+ *
+ */
+@JsonRootName("os-detach")
+public class DetachAction implements ModelEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * The ID of the attachment.
+	 */
+	@JsonProperty("attachment_id")
+	private String attachmentId;
+
+	/**
+	 * @author capitek-xuning（首信科技-徐宁）
+	 * @param attachmentId The ID of the attachment.
+	 */
+	public DetachAction(String attachmentId) {
+		super();
+		this.attachmentId = attachmentId;
+	}
+
+	public String getAttachmentId() {
+		return attachmentId;
+	}
+
+}

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

@@ -247,4 +247,20 @@ public ActionResponse forceDetach(String volumeId, String initiator, String atta
         ForceDetachAction detach = new ForceDetachAction(attachmentId, connector);
         return post(ActionResponse.class, uri("/volumes/%s/action", volumeId)).entity(detach).execute();
     }
+
+	/**
+	 * Detach volume from server
+	 * @author capitek-xuning（首信科技-徐宁）
+	 * @param volumeId
+	 * @param attachmentId
+	 * @return
+	 */
+	@Override
+	public ActionResponse detach(String volumeId, String attachmentId) {
+		checkNotNull(volumeId);
+		checkNotNull(attachmentId);
+		DetachAction detach = new DetachAction(attachmentId);
+		return post(ActionResponse.class, uri("/volumes/%s/action", volumeId)).entity(detach).execute();
+	}
+
 }