Support for Block Storage API and basic support for Ceilometer

ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java

@@ -1,34 +1,31 @@
 package com.woorea.openstack.ceilometer;
 
-
 import com.woorea.openstack.base.client.OpenStackClient;
 import com.woorea.openstack.base.client.OpenStackClientConnector;
 import com.woorea.openstack.ceilometer.v2.api.MetersResource;
 import com.woorea.openstack.ceilometer.v2.api.ResourcesResource;
 
 public class Ceilometer extends OpenStackClient {
-
-	private final MetersResource METERS;
-
-	private final ResourcesResource RESOURCES;
-
-	public Ceilometer(String endpoint, OpenStackClientConnector connector) {
-		super(endpoint, connector);
-		METERS = new MetersResource(this);
-		RESOURCES = new ResourcesResource(this);
-	}
-
-	public Ceilometer(String endpoint) {
-		this(endpoint, null);
-
-	}
-
-	public ResourcesResource resources() {
-		return RESOURCES;
-	}
-
-	public MetersResource meters() {
-		return METERS;
-	}
-
+
+    private final MetersResource METERS;
+    private final ResourcesResource RESOURCES;
+
+    public Ceilometer(String endpoint, OpenStackClientConnector connector) {
+        super(endpoint, connector);
+        METERS = new MetersResource(this);
+        RESOURCES = new ResourcesResource(this);
+    }
+
+    public Ceilometer(String endpoint) {
+        this(endpoint, null);
+
+    }
+
+    public ResourcesResource resources() {
+        return RESOURCES;
+    }
+
+    public MetersResource meters() {
+        return METERS;
+    }
 }

ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/QueriableCeilometerCommand.java

@@ -1,11 +1,10 @@
 package com.woorea.openstack.ceilometer;
 
+import com.woorea.openstack.base.client.OpenStackRequest;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.woorea.openstack.base.client.OpenStackRequest;
-
 public abstract class QueriableCeilometerCommand<T,R> extends OpenStackRequest<R> {
 
 	protected List<String> fields = new ArrayList<String>();

ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java

@@ -1,71 +1,38 @@
 package com.woorea.openstack.ceilometer.v2.api;
 
-
+import com.woorea.openstack.base.client.HttpMethod;
 import com.woorea.openstack.base.client.OpenStackClient;
 import com.woorea.openstack.base.client.OpenStackRequest;
-import com.woorea.openstack.ceilometer.QueriableCeilometerCommand;
+import com.woorea.openstack.ceilometer.v2.model.Meter;
 import com.woorea.openstack.ceilometer.v2.model.Sample;
 
 public class MetersResource {
-
-	private final OpenStackClient CLIENT;
-
-	public MetersResource(OpenStackClient client) {
-		CLIENT = client;
-	}
-
-	public List list() {
-		return new List();
-	}
-
-	public Show show() {
-		return new Show();
-	}
-
-	public Statistics statistics() {
-		return new Statistics();
-	}
-
-	public class List extends QueriableCeilometerCommand<List, java.util.List<Sample>> {
-		public List() {
-			//return query(target.path("meters")).request(MediaType.APPLICATION_JSON).get(new GenericType<List<Meter>>() {});
-		}
-	}
-
-	public class Show extends QueriableCeilometerCommand<Show, java.util.List<Sample>> {
 
-		private String name;
-
-		public Show name(String name) {
-			this.name = name;
-			return this;
-		}
-
-		public Show() {
-//			if(name == null) {
-//				throw new UnsupportedOperationException("meter id is mandatory");
-//			}
-//			return query(target.path("meters").path(name)).request(MediaType.APPLICATION_JSON).get(new GenericType<List<Sample>>() {});
-		}
+    private final OpenStackClient CLIENT;
+
+    public MetersResource(OpenStackClient client) {
+        CLIENT = client;
+    }
+
+    public List list() {
+        return new List();
+    }
 
-	}
+    public Show show(String name) {
+        return new Show(name);
+    }
 
-	public class Statistics extends QueriableCeilometerCommand<Statistics, java.util.List<Statistics>> {
+    public class List extends OpenStackRequest<Meter[]> {
 
-		private String name;
-
-		public Statistics name(String name) {
-			this.name = name;
-			return this;
-		}
-
-		public Statistics() {
-//			if(name == null) {
-//				throw new UnsupportedOperationException("meter id is mandatory");
-//			}
-//			return query(target.path("meters").path(name).path("statistics")).request(MediaType.APPLICATION_JSON).get(new GenericType<List<Statistics>>(){});
-		}
+        public List() {
+            super(CLIENT, HttpMethod.GET, "/meters", null, Meter[].class);
+        }
+    }
 
-	}
+    public class Show extends OpenStackRequest<Sample[]> {
 
-}
+        public Show(String name) {
+            super(CLIENT, HttpMethod.GET, new StringBuilder("/meters/").append(name).toString(), null, Sample[].class);
+        }
+    }
+}

ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java

@@ -1,45 +1,38 @@
 package com.woorea.openstack.ceilometer.v2.api;
 
-import java.util.List;
-
+import com.woorea.openstack.base.client.HttpMethod;
 import com.woorea.openstack.base.client.OpenStackClient;
 import com.woorea.openstack.base.client.OpenStackRequest;
-import com.woorea.openstack.ceilometer.QueriableCeilometerCommand;
 import com.woorea.openstack.ceilometer.v2.model.Resource;
 
 public class ResourcesResource {
-
-	private final OpenStackClient CLIENT;
-
-	public ResourcesResource(OpenStackClient client) {
-		CLIENT = client;
-	}
-
-	public class ResourceList extends QueriableCeilometerCommand<ResourceList, List<Resource>> {
-
-		public ResourceList() {
-			OpenStackRequest request = new OpenStackRequest();
-			//return query(target.path("resources")).request(MediaType.APPLICATION_JSON).get(new GenericType<List<Resource>>() {});
-		}
-
-	}
-
-	public class ResourceShow extends OpenStackRequest<Void> {
-
-		private String id;
-
-		public ResourceShow id(String id) {
-			this.id = id;
-			return this;
-		}
-
-		public ResourceShow(OpenStackClient client) {
-//			if(id == null) {
-//				throw new UnsupportedOperationException("resource id is mandatory");
-//			}
-//			return target.path("resources").path(id).request(MediaType.APPLICATION_JSON).get(Resource.class);
-		}
-
-	}
 
+    private final OpenStackClient CLIENT;
+
+    public ResourcesResource(OpenStackClient client) {
+        CLIENT = client;
+    }
+
+    public List list() {
+        return new List();
+    }
+
+    public Show show(String id) {
+        return new Show(id);
+    }
+
+    public class List extends OpenStackRequest<Resource[]> {
+
+        public List() {
+            super(CLIENT, HttpMethod.GET, "/ressources", null, Resource[].class);
+
+        }
+    }
+
+    public class Show extends OpenStackRequest<Resource> {
+
+        public Show(String id) {
+            super(CLIENT, HttpMethod.GET, new StringBuilder("/ressources/").append(id).toString(), null, Resource.class);
+        }
+    }
 }

ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Alarm.java

@@ -0,0 +1,9 @@
+package com.woorea.openstack.ceilometer.v2.model;
+
+/**
+ * Model for Alarm
+ *
+ * @author VAL Informatique
+ */
+public class Alarm {
+}

ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Link.java

@@ -0,0 +1,36 @@
+package com.woorea.openstack.ceilometer.v2.model;
+
+import java.io.Serializable;
+
+/**
+ * Model for Link
+ *
+ * @author VAL Informatique
+ */
+public class Link implements Serializable {
+
+    private String rel;
+    private String href;
+
+    /**
+     * @return the rel
+     */
+    public String getRel() {
+        return rel;
+    }
+
+    /**
+     * @return the href
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Link [rel=" + rel + ", href=" + href + "]";
+    }
+}