VM Autoscaling with virtual router

api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java

@@ -18,17 +18,13 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.cloud.network.as.AutoScalePolicy;
 import com.cloud.network.as.AutoScaleVmGroup;
-import com.cloud.network.as.AutoScaleVmProfile;
 import com.cloud.network.as.Condition;
 import com.cloud.network.as.Counter;
-import com.cloud.network.lb.LoadBalancingRule.LbAutoScalePolicy;
-import com.cloud.network.lb.LoadBalancingRule.LbAutoScaleVmGroup;
-import com.cloud.network.lb.LoadBalancingRule.LbAutoScaleVmProfile;
-import com.cloud.network.lb.LoadBalancingRule.LbCondition;
 import com.cloud.network.lb.LoadBalancingRule.LbDestination;
 import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy;
 import com.cloud.network.lb.LoadBalancingRule.LbSslCert;
@@ -377,46 +373,64 @@ public String getMonitorState() {
 
     public static class CounterTO implements Serializable {
         private static final long serialVersionUID = 2L;
+        private final Long id;
         private final String name;
-        private final String source;
+        private final Counter.Source source;
         private final String value;
+        private final String provider;
 
-        public CounterTO(String name, String source, String value) {
+        public CounterTO(Long id, String name, Counter.Source source, String value, String provider) {
+            this.id = id;
             this.name = name;
             this.source = source;
             this.value = value;
+            this.provider = provider;
+        }
+
+        public Long getId() {
+            return id;
         }
 
         public String getName() {
             return name;
         }
 
-        public String getSource() {
+        public Counter.Source getSource() {
             return source;
         }
 
         public String getValue() {
             return value;
         }
+
+        public String getProvider() {
+            return provider;
+        }
     }
 
     public static class ConditionTO implements Serializable {
         private static final long serialVersionUID = 2L;
+        private final Long id;
         private final long threshold;
-        private final String relationalOperator;
+        private final Condition.Operator relationalOperator;
         private final CounterTO counter;
 
-        public ConditionTO(long threshold, String relationalOperator, CounterTO counter) {
+        public ConditionTO(Long id, long threshold, Condition.Operator relationalOperator, CounterTO counter) {
+            this.id = id;
             this.threshold = threshold;
             this.relationalOperator = relationalOperator;
             this.counter = counter;
         }
 
+        public Long getId() {
+            return id;
+        }
+
         public long getThreshold() {
             return threshold;
         }
 
-        public String getRelationalOperator() {
+        public Condition.Operator getRelationalOperator() {
             return relationalOperator;
         }
 
@@ -430,14 +444,16 @@ public static class AutoScalePolicyTO implements Serializable {
         private final long id;
         private final int duration;
         private final int quietTime;
-        private String action;
+        private final Date lastQuietTime;
+        private AutoScalePolicy.Action action;
         boolean revoked;
         private final List<ConditionTO> conditions;
 
-        public AutoScalePolicyTO(long id, int duration, int quietTime, String action, List<ConditionTO> conditions, boolean revoked) {
+        public AutoScalePolicyTO(long id, int duration, int quietTime, Date lastQuietTime, AutoScalePolicy.Action action, List<ConditionTO> conditions, boolean revoked) {
             this.id = id;
             this.duration = duration;
             this.quietTime = quietTime;
+            this.lastQuietTime = lastQuietTime;
             this.conditions = conditions;
             this.action = action;
             this.revoked = revoked;
@@ -455,7 +471,11 @@ public int getQuietTime() {
             return quietTime;
         }
 
-        public String getAction() {
+        public Date getLastQuietTime() {
+            return lastQuietTime;
+        }
+
+        public AutoScalePolicy.Action getAction() {
             return action;
         }
 
@@ -476,7 +496,7 @@ public static class AutoScaleVmProfileTO implements Serializable {
         private final String templateId;
         private final String otherDeployParams;
         private final List<Pair<String, String>> counterParamList;
-        private final Integer destroyVmGraceperiod;
+        private final Integer expungeVmGracePeriod;
         private final String cloudStackApiUrl;
         private final String autoScaleUserApiKey;
         private final String autoScaleUserSecretKey;
@@ -485,14 +505,14 @@ public static class AutoScaleVmProfileTO implements Serializable {
 
         public AutoScaleVmProfileTO(String zoneId, String domainId, String cloudStackApiUrl, String autoScaleUserApiKey, String autoScaleUserSecretKey,
                 String serviceOfferingId, String templateId, String vmName, String networkId, String otherDeployParams, List<Pair<String, String>> counterParamList,
-                Integer destroyVmGraceperiod) {
+                Integer expungeVmGracePeriod) {
             this.zoneId = zoneId;
             this.domainId = domainId;
             this.serviceOfferingId = serviceOfferingId;
             this.templateId = templateId;
             this.otherDeployParams = otherDeployParams;
             this.counterParamList = counterParamList;
-            this.destroyVmGraceperiod = destroyVmGraceperiod;
+            this.expungeVmGracePeriod = expungeVmGracePeriod;
             this.cloudStackApiUrl = cloudStackApiUrl;
             this.autoScaleUserApiKey = autoScaleUserApiKey;
             this.autoScaleUserSecretKey = autoScaleUserSecretKey;
@@ -524,8 +544,8 @@ public List<Pair<String, String>> getCounterParamList() {
             return counterParamList;
         }
 
-        public Integer getDestroyVmGraceperiod() {
-            return destroyVmGraceperiod;
+        public Integer getExpungeVmGracePeriod() {
+            return expungeVmGracePeriod;
         }
 
         public String getCloudStackApiUrl() {
@@ -551,18 +571,22 @@ public String getNetworkId() {
 
     public static class AutoScaleVmGroupTO implements Serializable {
         private static final long serialVersionUID = 2L;
+
+        private final Long id;
         private final String uuid;
         private final int minMembers;
         private final int maxMembers;
         private final int memberPort;
         private final int interval;
         private final List<AutoScalePolicyTO> policies;
         private final AutoScaleVmProfileTO profile;
-        private final String state;
-        private final String currentState;
+        private final AutoScaleVmGroup.State state;
+        private final AutoScaleVmGroup.State currentState;
+        private final Long loadBalancerId;
 
-        AutoScaleVmGroupTO(String uuid, int minMembers, int maxMembers, int memberPort, int interval, List<AutoScalePolicyTO> policies, AutoScaleVmProfileTO profile,
-                String state, String currentState) {
+        public AutoScaleVmGroupTO(Long id, String uuid, int minMembers, int maxMembers, int memberPort, int interval, List<AutoScalePolicyTO> policies, AutoScaleVmProfileTO profile,
+                           AutoScaleVmGroup.State state, AutoScaleVmGroup.State currentState, Long loadBalancerId) {
+            this.id = id;
             this.uuid = uuid;
             this.minMembers = minMembers;
             this.maxMembers = maxMembers;
@@ -572,6 +596,11 @@ public static class AutoScaleVmGroupTO implements Serializable {
             this.profile = profile;
             this.state = state;
             this.currentState = currentState;
+            this.loadBalancerId = loadBalancerId;
+        }
+
+        public Long getId() {
+            return id;
         }
 
         public String getUuid() {
@@ -602,44 +631,16 @@ public AutoScaleVmProfileTO getProfile() {
             return profile;
         }
 
-        public String getState() {
+        public AutoScaleVmGroup.State getState() {
             return state;
         }
 
-        public String getCurrentState() {
+        public AutoScaleVmGroup.State getCurrentState() {
             return currentState;
         }
-    }
 
-    public void setAutoScaleVmGroup(LbAutoScaleVmGroup lbAutoScaleVmGroup) {
-        List<LbAutoScalePolicy> lbAutoScalePolicies = lbAutoScaleVmGroup.getPolicies();
-        List<AutoScalePolicyTO> autoScalePolicyTOs = new ArrayList<AutoScalePolicyTO>(lbAutoScalePolicies.size());
-        for (LbAutoScalePolicy lbAutoScalePolicy : lbAutoScalePolicies) {
-            List<LbCondition> lbConditions = lbAutoScalePolicy.getConditions();
-            List<ConditionTO> conditionTOs = new ArrayList<ConditionTO>(lbConditions.size());
-            for (LbCondition lbCondition : lbConditions) {
-                Counter counter = lbCondition.getCounter();
-                CounterTO counterTO = new CounterTO(counter.getName(), counter.getSource().toString(), "" + counter.getValue());
-                Condition condition = lbCondition.getCondition();
-                ConditionTO conditionTO = new ConditionTO(condition.getThreshold(), condition.getRelationalOperator().toString(), counterTO);
-                conditionTOs.add(conditionTO);
-            }
-            AutoScalePolicy autoScalePolicy = lbAutoScalePolicy.getPolicy();
-            autoScalePolicyTOs.add(new AutoScalePolicyTO(autoScalePolicy.getId(), autoScalePolicy.getDuration(), autoScalePolicy.getQuietTime(),
-                autoScalePolicy.getAction(), conditionTOs, lbAutoScalePolicy.isRevoked()));
-        }
-        LbAutoScaleVmProfile lbAutoScaleVmProfile = lbAutoScaleVmGroup.getProfile();
-        AutoScaleVmProfile autoScaleVmProfile = lbAutoScaleVmProfile.getProfile();
-
-        AutoScaleVmProfileTO autoScaleVmProfileTO =
-            new AutoScaleVmProfileTO(lbAutoScaleVmProfile.getZoneId(), lbAutoScaleVmProfile.getDomainId(), lbAutoScaleVmProfile.getCsUrl(),
-                lbAutoScaleVmProfile.getAutoScaleUserApiKey(), lbAutoScaleVmProfile.getAutoScaleUserSecretKey(), lbAutoScaleVmProfile.getServiceOfferingId(),
-                lbAutoScaleVmProfile.getTemplateId(), lbAutoScaleVmProfile.getVmName(), lbAutoScaleVmProfile.getNetworkId(), autoScaleVmProfile.getOtherDeployParams(),
-                autoScaleVmProfile.getCounterParams(), autoScaleVmProfile.getDestroyVmGraceperiod());
-
-        AutoScaleVmGroup autoScaleVmGroup = lbAutoScaleVmGroup.getVmGroup();
-        autoScaleVmGroupTO =
-            new AutoScaleVmGroupTO(autoScaleVmGroup.getUuid(), autoScaleVmGroup.getMinMembers(), autoScaleVmGroup.getMaxMembers(), autoScaleVmGroup.getMemberPort(),
-                autoScaleVmGroup.getInterval(), autoScalePolicyTOs, autoScaleVmProfileTO, autoScaleVmGroup.getState(), lbAutoScaleVmGroup.getCurrentState());
+        public Long getLoadBalancerId() {
+            return loadBalancerId;
+        }
     }
 }

api/src/main/java/com/cloud/event/EventTypes.java

@@ -559,6 +559,7 @@ public class EventTypes {
     public static final String EVENT_COUNTER_DELETE = "COUNTER.DELETE";
     public static final String EVENT_CONDITION_CREATE = "CONDITION.CREATE";
     public static final String EVENT_CONDITION_DELETE = "CONDITION.DELETE";
+    public static final String EVENT_CONDITION_UPDATE = "CONDITION.UPDATE";
     public static final String EVENT_AUTOSCALEPOLICY_CREATE = "AUTOSCALEPOLICY.CREATE";
     public static final String EVENT_AUTOSCALEPOLICY_UPDATE = "AUTOSCALEPOLICY.UPDATE";
     public static final String EVENT_AUTOSCALEPOLICY_DELETE = "AUTOSCALEPOLICY.DELETE";
@@ -570,6 +571,8 @@ public class EventTypes {
     public static final String EVENT_AUTOSCALEVMGROUP_UPDATE = "AUTOSCALEVMGROUP.UPDATE";
     public static final String EVENT_AUTOSCALEVMGROUP_ENABLE = "AUTOSCALEVMGROUP.ENABLE";
     public static final String EVENT_AUTOSCALEVMGROUP_DISABLE = "AUTOSCALEVMGROUP.DISABLE";
+    public static final String EVENT_AUTOSCALEVMGROUP_SCALEDOWN = "AUTOSCALEVMGROUP.SCALEDOWN";
+    public static final String EVENT_AUTOSCALEVMGROUP_SCALEUP = "AUTOSCALEVMGROUP.SCALEUP";
 
     public static final String EVENT_BAREMETAL_DHCP_SERVER_ADD = "PHYSICAL.DHCP.ADD";
     public static final String EVENT_BAREMETAL_DHCP_SERVER_DELETE = "PHYSICAL.DHCP.DELETE";
@@ -1038,6 +1041,8 @@ public class EventTypes {
         entityEventDetails.put(EVENT_AUTOSCALEVMGROUP_UPDATE, AutoScaleVmGroup.class);
         entityEventDetails.put(EVENT_AUTOSCALEVMGROUP_ENABLE, AutoScaleVmGroup.class);
         entityEventDetails.put(EVENT_AUTOSCALEVMGROUP_DISABLE, AutoScaleVmGroup.class);
+        entityEventDetails.put(EVENT_AUTOSCALEVMGROUP_SCALEDOWN, AutoScaleVmGroup.class);
+        entityEventDetails.put(EVENT_AUTOSCALEVMGROUP_SCALEUP, AutoScaleVmGroup.class);
         entityEventDetails.put(EVENT_GUEST_VLAN_RANGE_DEDICATE, GuestVlan.class);
         entityEventDetails.put(EVENT_DEDICATED_GUEST_VLAN_RANGE_RELEASE, GuestVlan.class);
 

api/src/main/java/com/cloud/network/Network.java

@@ -285,6 +285,7 @@ public static class Capability {
         public static final Capability NoVlan = new Capability("NoVlan");
         public static final Capability PublicAccess = new Capability("PublicAccess");
         public static final Capability ExtraDhcpOptions = new Capability("ExtraDhcpOptions");
+        public static final Capability VmAutoScaling = new Capability("VmAutoScaling");
 
         private final String name;
 

api/src/main/java/com/cloud/network/as/AutoScaleCounter.java

@@ -25,10 +25,11 @@ public class AutoScaleCounter {
     public static class AutoScaleCounterType {
         private String _name;
 
-        public static final AutoScaleCounterType Snmp = new AutoScaleCounterType("snmp");
-        public static final AutoScaleCounterType Netscaler = new AutoScaleCounterType("netscaler");
-        public static final AutoScaleCounterType Cpu = new AutoScaleCounterType("cpu");
-        public static final AutoScaleCounterType Memory = new AutoScaleCounterType("memory");
+        public static final AutoScaleCounterType Snmp = new AutoScaleCounterType(Counter.Source.SNMP.name());
+        public static final AutoScaleCounterType Cpu = new AutoScaleCounterType(Counter.Source.CPU.name());
+        public static final AutoScaleCounterType Memory = new AutoScaleCounterType(Counter.Source.MEMORY.name());
+        public static final AutoScaleCounterType Netscaler = new AutoScaleCounterType(Counter.Source.NETSCALER.name());
+        public static final AutoScaleCounterType VirtualRouter = new AutoScaleCounterType(Counter.Source.VIRTUALROUTER.name());
 
         public AutoScaleCounterType(String name) {
             _name = name;

api/src/main/java/com/cloud/network/as/AutoScalePolicy.java

@@ -21,9 +21,26 @@
 
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.commons.lang3.StringUtils;
 
 public interface AutoScalePolicy extends ControlledEntity, InternalIdentity {
 
+    enum Action {
+        SCALEUP, SCALEDOWN;
+
+        public static Action fromValue(String action) {
+            if (StringUtils.isBlank(action)) {
+                return null;
+            } else if (action.equalsIgnoreCase("ScaleUp")) {
+                return SCALEUP;
+            } else if (action.equalsIgnoreCase("ScaleDown")) {
+                return SCALEDOWN;
+            } else {
+                throw new IllegalArgumentException("Unexpected AutoScale action : " + action);
+            }
+        }
+    }
+
     @Override
     long getId();
 
@@ -33,8 +50,8 @@ public interface AutoScalePolicy extends ControlledEntity, InternalIdentity {
 
     public int getQuietTime();
 
-    public Date getLastQuiteTime();
+    public Date getLastQuietTime();
 
-    public String getAction();
+    public Action getAction();
 
 }

api/src/main/java/com/cloud/network/as/AutoScaleService.java

@@ -31,6 +31,7 @@
 import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScalePolicyCmd;
 import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
 import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd;
+import org.apache.cloudstack.api.command.user.autoscale.UpdateConditionCmd;
 
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.exception.ResourceUnavailableException;
@@ -57,7 +58,7 @@ public interface AutoScaleService {
 
     boolean configureAutoScaleVmGroup(CreateAutoScaleVmGroupCmd cmd) throws ResourceUnavailableException;
 
-    boolean deleteAutoScaleVmGroup(long vmGroupId);
+    boolean deleteAutoScaleVmGroup(long vmGroupId, Boolean cleanup);
 
     AutoScaleVmGroup updateAutoScaleVmGroup(UpdateAutoScaleVmGroupCmd cmd);
 
@@ -78,4 +79,6 @@ public interface AutoScaleService {
     List<? extends Condition> listConditions(ListConditionsCmd cmd);
 
     boolean deleteCondition(long conditionId) throws ResourceInUseException;
+
+    Condition updateCondition(UpdateConditionCmd cmd) throws ResourceInUseException;
 }