Merge pull request #437 from csm1sh/master

add support to list available zone list

Author: gondor

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

@@ -20,6 +20,8 @@ public interface BlockStorageService extends RestService {
 	 */
 	BlockVolumeSnapshotService snapshots();
 
+	CinderZoneService zones();
+	
 	/**
 	 * Gets the Absolute limits used by this tenant
 	 * 

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

@@ -0,0 +1,15 @@
+package org.openstack4j.api.storage;
+
+import java.util.List;
+
+import org.openstack4j.common.RestService;
+import org.openstack4j.openstack.storage.block.domain.AvailabilityZone;
+
+/**
+  * @author Jeff Hu
+  * list all available cinder zones
+  */
+public interface CinderZoneService extends RestService {
+
+	List<? extends AvailabilityZone> list();
+}

core/src/main/java/org/openstack4j/openstack/provider/DefaultAPIProvider.java

@@ -67,6 +67,7 @@
 import org.openstack4j.api.storage.BlockVolumeService;
 import org.openstack4j.api.storage.BlockVolumeSnapshotService;
 import org.openstack4j.api.storage.BlockVolumeTransferService;
+import org.openstack4j.api.storage.CinderZoneService;
 import org.openstack4j.api.storage.ObjectStorageAccountService;
 import org.openstack4j.api.storage.ObjectStorageContainerService;
 import org.openstack4j.api.storage.ObjectStorageObjectService;
@@ -137,6 +138,7 @@
 import org.openstack4j.openstack.storage.block.internal.BlockVolumeServiceImpl;
 import org.openstack4j.openstack.storage.block.internal.BlockVolumeSnapshotServiceImpl;
 import org.openstack4j.openstack.storage.block.internal.BlockVolumeTransferServiceImpl;
+import org.openstack4j.openstack.storage.block.internal.CinderZoneServiceImpl;
 import org.openstack4j.openstack.storage.object.internal.ObjectStorageAccountServiceImpl;
 import org.openstack4j.openstack.storage.object.internal.ObjectStorageContainerServiceImpl;
 import org.openstack4j.openstack.storage.object.internal.ObjectStorageObjectServiceImpl;
@@ -192,6 +194,7 @@ public void initialize() {
 		bind(AlarmService.class, AlarmServiceImpl.class);
 		bind(HypervisorService.class, HypervisorServiceImpl.class);
 		bind(ZoneService.class, ZoneServiceImpl.class);
+		bind(CinderZoneService.class, CinderZoneServiceImpl.class);
 		bind(HeatService.class, HeatServiceImpl.class);
 		bind(StackService.class, StackServiceImpl.class);
 		bind(TemplateService.class, TemplateServiceImpl.class);

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

@@ -0,0 +1,35 @@
+package org.openstack4j.openstack.storage.block.domain;
+
+import org.openstack4j.model.ModelEntity;
+
+/**
+ * Availability Zone Model Entity
+ * 
+ * @author Jeff Hu 
+ */
+public interface AvailabilityZone extends ModelEntity {
+
+    /**
+     * @return zone's state
+     */
+    ZoneState getZoneState();
+
+
+    /**
+     * @return zone's name
+     */
+    String getZoneName();
+    
+    
+    public interface ZoneState extends ModelEntity {
+
+        /**
+         * @return the state of zone
+         */
+        boolean getAvailable();
+    }
+
+
+
+}
+

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

@@ -0,0 +1,73 @@
+package org.openstack4j.openstack.storage.block.domain;
+
+import static com.google.common.base.Objects.toStringHelper;
+
+import java.util.List;
+
+import org.openstack4j.openstack.common.ListResult;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+public class ExtAvailabilityZone implements AvailabilityZone {
+
+    private static final long serialVersionUID = 1L;
+    
+    ExtZoneState zoneState;
+    String zoneName;
+        
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ZoneState getZoneState() {
+        return zoneState;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getZoneName() {
+        return zoneName;
+    }
+
+
+    @JsonRootName("zoneState")
+    static class ExtZoneState implements ZoneState {
+        private static final long serialVersionUID = 1L;
+        
+        boolean available;
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean getAvailable() {
+            return available;
+        }
+        
+        @Override
+        public String toString() {
+            return toStringHelper(this).omitNullValues()
+                     .add("available", available)
+                     .toString();
+        }
+    }
+    
+    
+    public static class AvailabilityZones extends ListResult<ExtAvailabilityZone> {
+
+        private static final long serialVersionUID = 1L;
+        
+        @JsonProperty("availabilityZoneInfo")
+        private List<ExtAvailabilityZone> result;
+
+        @Override
+        protected List<ExtAvailabilityZone> value() {
+            return result;
+        }
+
+        
+    }
+}

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

@@ -5,6 +5,7 @@
 import org.openstack4j.api.storage.BlockStorageService;
 import org.openstack4j.api.storage.BlockVolumeService;
 import org.openstack4j.api.storage.BlockVolumeSnapshotService;
+import org.openstack4j.api.storage.CinderZoneService;
 import org.openstack4j.model.storage.block.BlockLimits;
 import org.openstack4j.openstack.storage.block.domain.CinderBlockLimits;
 
@@ -47,4 +48,10 @@ public BlockQuotaSetService quotaSets() {
         return Apis.get(BlockQuotaSetService.class);
     }
 
+    @Override
+    public CinderZoneService zones()
+    {
+       return Apis.get(CinderZoneService.class); 
+    }
+
 }

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

@@ -0,0 +1,20 @@
+package org.openstack4j.openstack.storage.block.internal;
+
+import java.util.List;
+
+import org.openstack4j.api.storage.CinderZoneService;
+import org.openstack4j.openstack.storage.block.domain.AvailabilityZone;
+import org.openstack4j.openstack.storage.block.domain.ExtAvailabilityZone.AvailabilityZones;
+
+public class CinderZoneServiceImpl  extends BaseBlockStorageServices implements CinderZoneService
+{
+
+    @Override
+    public List<? extends AvailabilityZone> list()
+    {
+        String uri =  "/os-availability-zone";
+        return get(AvailabilityZones.class, uri).execute().getList();
+    }
+
+
+}