Merge pull request #989 from baseman79/master

Add additional properties of block device mapping api v2

Author: auhlig

core/src/main/java/org/openstack4j/model/compute/builder/BlockDeviceMappingBuilder.java

@@ -83,6 +83,30 @@ public interface BlockDeviceMappingBuilder extends Buildable.Builder<BlockDevice
 	 */
 	BlockDeviceMappingBuilder volumeSize(Integer size);
 
-	
+    /**
+     * Used to set the disk_bus, low level detail that some hypervisors
+     * (currently only libvirt) may support.
+     * 
+     * @see <a href=
+     *      "https://docs.openstack.org/developer/nova/block_device_mapping.html#block-device-mapping-v2">https://docs.openstack.org/developer/nova/block_device_mapping.html#block-device-mapping-v2</a>
+     * 
+     * @param disk_bus
+     *            type, e.g ide, usb, virtio, scsi
+     * @return BlockDeviceMappingBuilder
+     */
+    BlockDeviceMappingBuilder diskBus(String diskBus);
+
+    /**
+     * Used to set the device_type, low level detail that some hypervisors
+     * (currently only libvirt) may support.
+     * 
+     * @see <a href=
+     *      "https://docs.openstack.org/developer/nova/block_device_mapping.html#block-device-mapping-v2">https://docs.openstack.org/developer/nova/block_device_mapping.html#block-device-mapping-v2</a>
+     * 
+     * @param device_type,
+     *            disk, cdrom, floppy, lun
+     * @return BlockDeviceMappingBuilder
+     */
+    BlockDeviceMappingBuilder deviceType(String deviceType);
 
 }

core/src/main/java/org/openstack4j/openstack/compute/domain/NovaBlockDeviceMappingCreate.java

@@ -5,6 +5,8 @@
 import org.openstack4j.model.compute.BlockDeviceMappingCreate;
 import org.openstack4j.model.compute.builder.BlockDeviceMappingBuilder;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -27,6 +29,14 @@ public class NovaBlockDeviceMappingCreate implements BlockDeviceMappingCreate {
 	@JsonProperty("volume_id")
 	public String volumeId;
 
+    @JsonInclude(Include.NON_NULL)
+    @JsonProperty("disk_bus")
+    public String diskBus;
+
+    @JsonInclude(Include.NON_NULL)
+    @JsonProperty("device_type")
+    public String deviceType;
+
 	public static NovaBlockDeviceMappingBuilder builder() {
 		return new NovaBlockDeviceMappingBuilder(new NovaBlockDeviceMappingCreate());
 	}
@@ -99,6 +109,18 @@ public BlockDeviceMappingBuilder volumeSize(Integer volumeSize) {
             return this;
         }
 
+        @Override
+        public BlockDeviceMappingBuilder diskBus(String diskBus) {
+            create.diskBus = diskBus;
+            return this;
+        }
+
+        @Override
+        public BlockDeviceMappingBuilder deviceType(String deviceType) {
+            create.deviceType = deviceType;
+            return this;
+        }
+
 		@Override
 		public BlockDeviceMappingCreate build() {
 			return create;