Merge pull request #287 from e3ky/master

Added create and delete ceilometer alarms functionality

Author: gondor

core/src/main/java/org/openstack4j/api/Builders.java

@@ -49,6 +49,7 @@
 import org.openstack4j.model.sahara.builder.ServiceConfigBuilder;
 import org.openstack4j.model.storage.block.builder.VolumeBuilder;
 import org.openstack4j.model.storage.block.builder.VolumeSnapshotBuilder;
+import org.openstack4j.model.telemetry.builder.AlarmBuilder;
 import org.openstack4j.openstack.common.GenericLink;
 import org.openstack4j.openstack.compute.domain.NovaBlockDeviceMappingCreate;
 import org.openstack4j.openstack.compute.domain.NovaFlavor;
@@ -94,6 +95,7 @@
 import org.openstack4j.openstack.sahara.domain.SaharaServiceConfig;
 import org.openstack4j.openstack.storage.block.domain.CinderVolume;
 import org.openstack4j.openstack.storage.block.domain.CinderVolumeSnapshot;
+import org.openstack4j.openstack.telemetry.domain.CeilometerAlarm;
 
 /**
  * A utility class to quickly access available Builders within the OpenStack API
@@ -464,5 +466,13 @@ public static ServiceConfigBuilder serviceConfig() {
     public static QuotaSetUpdateBuilder quotaSet() {
         return NovaQuotaSetUpdate.builder();
     }
+    
+    /**
+     * The builder to create an Alarm
+     * @return the image builder
+     */
+    public static AlarmBuilder alarm() {
+        return CeilometerAlarm.builder();
+    }
 
 }

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

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import org.openstack4j.common.RestService;
+import org.openstack4j.model.compute.ActionResponse;
 import org.openstack4j.model.telemetry.Alarm;
 
 /**
@@ -32,5 +33,15 @@ public interface AlarmService extends RestService {
 	 */
 	void update(String id, Alarm a);
 
-	
+	/**
+	 * Create an alarm
+	 * 
+	 */
+	Alarm create(Alarm alarm);
+
+	/**
+	 * Delete a specified alarm
+	 * 
+	 */
+	ActionResponse delete(String id);
 }

core/src/main/java/org/openstack4j/model/telemetry/Alarm.java

@@ -2,7 +2,12 @@
 
 import java.util.List;
 
+import org.openstack4j.common.Buildable;
 import org.openstack4j.model.ModelEntity;
+import org.openstack4j.model.common.BasicResource;
+import org.openstack4j.model.telemetry.builder.AlarmBuilder;
+import org.openstack4j.openstack.telemetry.domain.CeilometerAlarm.CeilometerQuery;
+import org.openstack4j.openstack.telemetry.domain.CeilometerAlarm.CeilometerThresholdRule;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -12,7 +17,7 @@
  * 
  * @author Massimiliano Romano
  */
-public interface Alarm extends ModelEntity {
+public interface Alarm extends ModelEntity,BasicResource, Buildable<AlarmBuilder>  {
 
 	List<String> getAlarmActions();
 
@@ -94,6 +99,14 @@ public interface ThresholdRule{
 		ComparisonOperator getComparisonOperator();
 		boolean getExcludeOutliers();
 
+		void setMeterName(String meterName);
+		void setEvaluationPeriods(int evaluationPeriod);
+		void setStatistic(Statistic statistic);
+		void setPeriod(int period);
+		void setThreshold(float threshold);
+		void setQuery(List<CeilometerQuery> query);
+		void setComparisonOperator(ComparisonOperator comparisonOperator);
+		void setExcludeOutliers(boolean excludeOutliers);
 
 
 		public enum Statistic {
@@ -146,6 +159,27 @@ public interface Query{
 			String getField();
 			String getValue();
 			ComparisonOperator getOp();
+			void setField(String field);
+			void setValue(String value);
+			void setOp(ComparisonOperator comparisonOperator);
 		}
 	}
-}
+	
+	void setName(String name);
+
+	void setType(Type type);
+	
+	void setUserId(String userId);
+	
+	void setAlarmActions(List<String> alarmActions);
+	
+	void setDescription(String description);
+	
+	void setInsufficientDataActions(List<String> insufficientDataActions);
+	
+	void setOkActions(List<String> okActions);
+	
+	void setRepeateActions(Boolean repeatActions);
+
+	void setThresholdRule(CeilometerThresholdRule tr);
+}

core/src/main/java/org/openstack4j/model/telemetry/builder/AlarmBuilder.java

@@ -0,0 +1,32 @@
+package org.openstack4j.model.telemetry.builder;
+
+import java.util.List;
+
+import org.openstack4j.common.Buildable.Builder;
+import org.openstack4j.model.telemetry.Alarm;
+import org.openstack4j.model.telemetry.Alarm.Type;
+import org.openstack4j.openstack.telemetry.domain.CeilometerAlarm.CeilometerThresholdRule;
+
+/**
+ * An alarm builder
+ * 
+ * @author Martin Belperchinov
+ */
+
+public interface AlarmBuilder extends Builder<AlarmBuilder, Alarm>{
+
+	AlarmBuilder name(String name);
+	
+	AlarmBuilder okActions(List<String> okActions);
+	
+	AlarmBuilder alarmActions(List<String> alarmActions);
+	
+	AlarmBuilder type(Type type);
+	
+	AlarmBuilder thresholeRule(CeilometerThresholdRule te);
+	
+	AlarmBuilder repeatActions(boolean repeatActions);
+	
+	AlarmBuilder description(String description);
+
+}

core/src/main/java/org/openstack4j/openstack/telemetry/domain/CeilometerAlarm.java

@@ -2,9 +2,11 @@
 
 import java.util.List;
 
+import org.openstack4j.model.common.builder.BasicResourceBuilder;
 import org.openstack4j.model.telemetry.Alarm;
 import org.openstack4j.model.telemetry.Alarm.ThresholdRule.ComparisonOperator;
 import org.openstack4j.model.telemetry.Alarm.ThresholdRule.Query;
+import org.openstack4j.model.telemetry.builder.AlarmBuilder;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
@@ -84,7 +86,6 @@ public class CeilometerAlarm implements Alarm {
 	@JsonProperty("timestamp")
 	private String timestamp;
 
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -112,11 +113,11 @@ public Type getType() {
 	/**
    * {@inheritDoc}
    */
-  @Override
-  public String getUserId() {
-    return userId;
-  }
-	
+	@Override
+	public String getUserId() {
+		return userId;
+	}
+  	
 	/**
 	 * {@inheritDoc}
 	 */
@@ -271,6 +272,45 @@ public boolean getExcludeOutliers() {
 			return excludeOutliers;
 		}
 
+		@Override
+		public void setMeterName(String meterName) {
+			this.meterName = meterName;
+		}
+
+		@Override
+		public void setEvaluationPeriods(int evaluationPeriod) {
+			this.evaluationPeriods = evaluationPeriod;
+		}
+
+		@Override
+		public void setStatistic(Statistic statistic) {
+			this.statistic = statistic;
+		}
+
+		@Override
+		public void setPeriod(int period) {
+			this.period = period;
+		}
+
+		@Override
+		public void setThreshold(float threshold) {
+			this.threshold = threshold;
+		}
+
+		@Override
+		public void setQuery(List<CeilometerQuery> query) {
+			this.query = query;			
+		}
+
+		@Override
+		public void setComparisonOperator(ComparisonOperator comparisonOperator) {
+			this.comparisonOperator = comparisonOperator;			
+		}
+
+		@Override
+		public void setExcludeOutliers(boolean excludeOutliers) {
+			this.excludeOutliers = excludeOutliers;			
+		}
 	}
 
 	public static class CeilometerQuery implements Query{
@@ -299,5 +339,160 @@ public String getValue() {
 		public ComparisonOperator getOp() {
 			return op;
 		}
+		
+		@Override
+		public void setField(String field) {
+			this.field = field;			
+		}
+
+		@Override
+		public void setValue(String value) {
+			this.value = value;			
+		}
+
+		@Override
+		public void setOp(ComparisonOperator comparisonOperator) {
+			this.op = comparisonOperator;			
+		}
+	}
+	
+	public static AlarmBuilder builder() {
+		return new AlarmConcreteBuilder();
 	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setType(Type type) {
+		 this.type = type;
+	}
+	
+	@Override
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	@Override
+	public void setAlarmActions(List<String> alarmActions) {
+		this.alarmActions = alarmActions;
+		
+	}
+
+	@Override
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Override
+	public void setInsufficientDataActions(List<String> insufficientDataActions) {
+		this.insufficientDataActions = insufficientDataActions;
+	}
+
+	@Override
+	public void setOkActions(List<String> okActions) {
+		this.okActions = okActions;
+	}
+
+	@Override
+	public void setRepeateActions(Boolean repeatActions) {
+		this.repeatActions = repeatActions;
+	}
+	
+	@Override
+	public String getId() {
+		return this.alarmId;
+	}
+
+
+	@Override
+	public void setId(String id) {
+		this.alarmId = id;
+	}
+
+	@Override
+	public void setThresholdRule(CeilometerThresholdRule tr) {
+		this.thresholdRule = (CeilometerThresholdRule) tr;
+	}
+
+	@Override
+	public AlarmBuilder toBuilder() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	public static class AlarmConcreteBuilder extends BasicResourceBuilder<Alarm, AlarmConcreteBuilder> implements AlarmBuilder {
+
+		private CeilometerAlarm m;
+		
+		AlarmConcreteBuilder() {
+		 	this(new CeilometerAlarm());
+		}
+		
+		AlarmConcreteBuilder(CeilometerAlarm m) {
+			this.m = m;
+		}
+
+		
+		@Override
+		public Alarm build() {
+			return m;
+		}
+
+		@Override
+		public AlarmBuilder from(Alarm in) {
+			this.m = (CeilometerAlarm) in;
+			return this;
+		}
+
+		@Override
+		public AlarmBuilder okActions(List<String> okActions) {
+			this.m.okActions = okActions;
+			return this;
+		}
+
+		@Override
+		protected Alarm reference() {
+			return m;
+		}
+
+		@Override
+		public AlarmBuilder type(Type type) {
+			this.m.type = type;
+			return this;
+		}
+
+		@Override
+		public AlarmBuilder thresholeRule(CeilometerThresholdRule tr) {
+			this.m.thresholdRule = tr;
+			return this;
+		}
+
+		@Override
+		public AlarmBuilder repeatActions(boolean repeatActions) {
+			m.repeatActions = repeatActions;
+			return this;
+		}
+
+		@Override
+		public AlarmBuilder description(String description) {
+			m.description = description;
+			return this;
+		}
+
+		@Override
+		public AlarmBuilder alarmActions(List<String> alarmActions) {
+			this.m.alarmActions = alarmActions;
+			return this;
+		}
+
+    }
 }