Merge pull request #781 from simonklb/ceilometer-sample-query

Add query capabilities to new ceilometer sample

Author: vinodborole

core/src/main/java/org/openstack4j/api/telemetry/SampleService.java

@@ -4,11 +4,14 @@
 
 import org.openstack4j.common.RestService;
 import org.openstack4j.model.telemetry.Sample;
+import org.openstack4j.model.telemetry.SampleCriteria;
 
 
 public interface SampleService extends RestService{
 
 	List<? extends Sample> list();
+
+	List<? extends Sample> list(SampleCriteria criteria);
 
 	Sample get(String sampleId);
 }

core/src/main/java/org/openstack4j/openstack/telemetry/internal/SampleServiceImpl.java

@@ -6,6 +6,7 @@
 
 import org.openstack4j.api.telemetry.SampleService;
 import org.openstack4j.model.telemetry.Sample;
+import org.openstack4j.model.telemetry.SampleCriteria;
 import org.openstack4j.openstack.telemetry.domain.CeiloMeterSample;
 
 /**
@@ -16,6 +17,10 @@
 
 public class SampleServiceImpl extends BaseTelemetryServices implements SampleService {
 
+    private static final String FIELD = "q.field";
+    private static final String OPER = "q.op";
+    private static final String VALUE = "q.value";
+
     /**
      * {@inheritDoc}
      */
@@ -25,6 +30,23 @@ public List<? extends Sample> list() {
         return wrapList(samples);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<? extends Sample> list(SampleCriteria criteria) {
+        Invocation<CeiloMeterSample[]> invocation = get(CeiloMeterSample[].class, uri("/samples"));
+        if (criteria != null && !criteria.getCriteriaParams().isEmpty()) {
+            for (SampleCriteria.NameOpValue c : criteria.getCriteriaParams()) {
+                invocation.param(FIELD, c.getField());
+                invocation.param(OPER, c.getOperator().getQueryValue());
+                invocation.param(VALUE, c.getValue());
+            }
+        }
+        CeiloMeterSample[] samples = invocation.execute();
+        return wrapList(samples);
+    }
+
     /**
      * {@inheritDoc}
      */