Merge pull request #507 from iviireczech/master

Add Volume 'tenantId' attribute support
ContainX · Nov 15, 2015 · 8afc135 · 8afc135
2 parents 9396678 + 3c6e88f
commit 8afc135
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/core-test/src/main/java/org/openstack4j/api/storage/VolumeTests.java b/core-test/src/main/java/org/openstack4j/api/storage/VolumeTests.java
@@ -31,6 +31,7 @@ public void listVolumesV1() throws Exception {
         respondWith("/storage/v1/volumes.json");
         List<? extends Volume> volumes = os().blockStorage().volumes().list();
         assertEquals(volumes.size(), 3);
+        assertEquals(volumes.get(0).getTenantId(), "b0b5ed7ae06049688349fe43737796d4");
 
         // Check that the list request is the one we expect
         RecordedRequest listRequest = server.takeRequest();
@@ -84,6 +85,8 @@ public void getVolumeV1() throws Exception {
         assertEquals(attachments.get(0).getId(), "8a9287b7-4f4d-4213-8d75-63470f19f27c");
         assertEquals(attachments.get(0).getServerId(), "eaa6a54d-35c1-40ce-831d-bb61f991e1a9");
         assertEquals(attachments.get(0).getVolumeId(), "8a9287b7-4f4d-4213-8d75-63470f19f27c");
+
+        assertEquals(volume.getTenantId(), "b0b5ed7ae06049688349fe43737796d4");
     }
 
     @SuppressWarnings("unchecked")

diff --git a/core/src/main/java/org/openstack4j/model/storage/block/Volume.java b/core/src/main/java/org/openstack4j/model/storage/block/Volume.java
@@ -146,4 +146,9 @@ public static MigrationStatus fromValue(String migrationStatus) {
 	 * @return the status of volume migrate status, default null
 	 */
 	MigrationStatus getMigrateStatus();
+
+	/**
+	 * @return the tenant id
+	 */
+	String getTenantId();
 }
diff --git a/core/src/main/java/org/openstack4j/openstack/storage/block/domain/CinderVolume.java b/core/src/main/java/org/openstack4j/openstack/storage/block/domain/CinderVolume.java
@@ -59,6 +59,8 @@ public class CinderVolume implements Volume {
 	private Map<String, Object> imageMetadata;
 	@JsonProperty("os-vol-mig-status-attr:migstat")
 	private MigrationStatus migrateStatus;
+	@JsonProperty("os-vol-tenant-attr:tenant_id")
+	private String tenantId;
 	/**
 	 * {@inheritDoc}
 	 */
@@ -194,7 +196,15 @@ public Map<String, String> getMetaData() {
 	public List<? extends VolumeAttachment> getAttachments() {
 		return attachments;
 	}
-
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getTenantId() {
+		return tenantId;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */