rename CreateConditionCmd class to CreateConditionForVmAutoScalingCmd

Author: erikbocks

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

@@ -22,7 +22,7 @@
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
-import org.apache.cloudstack.api.command.user.autoscale.CreateConditionCmd;
+import org.apache.cloudstack.api.command.user.autoscale.CreateConditionForVmAutoScalingCmd;
 import org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;
 import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd;
 import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd;
@@ -76,7 +76,7 @@ public interface AutoScaleService {
 
     List<? extends Counter> listCounters(ListCountersCmd cmd);
 
-    Condition createCondition(CreateConditionCmd cmd);
+    Condition createCondition(CreateConditionForVmAutoScalingCmd cmd);
 
     List<? extends Condition> listConditions(ListConditionsCmd cmd);
 

api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java renamed to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionForVmAutoScalingCmd.java

@@ -37,7 +37,7 @@
 
 @APICommand(name = "createCondition", description = "Creates a condition for VM auto scaling", responseObject = ConditionResponse.class, entityType = {Condition.class},
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateConditionCmd extends BaseAsyncCreateCmd {
+public class CreateConditionForVmAutoScalingCmd extends BaseAsyncCreateCmd {
     private static final String s_name = "conditionresponse";
 
     // ///////////////////////////////////////////////////

server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java

@@ -54,7 +54,7 @@
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
-import org.apache.cloudstack.api.command.user.autoscale.CreateConditionCmd;
+import org.apache.cloudstack.api.command.user.autoscale.CreateConditionForVmAutoScalingCmd;
 import org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;
 import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd;
 import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd;
@@ -1493,7 +1493,7 @@ public Counter getCounter(long counterId) {
 
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_CONDITION_CREATE, eventDescription = "Condition", create = true)
-    public Condition createCondition(CreateConditionCmd cmd) {
+    public Condition createCondition(CreateConditionForVmAutoScalingCmd cmd) {
         Account caller = CallContext.current().getCallingAccount();
         Account owner = accountMgr.finalizeOwner(caller, cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
         accountMgr.checkAccess(caller, null, true, owner);

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -360,7 +360,7 @@
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
-import org.apache.cloudstack.api.command.user.autoscale.CreateConditionCmd;
+import org.apache.cloudstack.api.command.user.autoscale.CreateConditionForVmAutoScalingCmd;
 import org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScalePolicyCmd;
 import org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleVmGroupCmd;
 import org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleVmProfileCmd;
@@ -3859,7 +3859,7 @@ public List<Class<?>> getCommands() {
         cmdList.add(CreateAutoScalePolicyCmd.class);
         cmdList.add(CreateAutoScaleVmGroupCmd.class);
         cmdList.add(CreateAutoScaleVmProfileCmd.class);
-        cmdList.add(CreateConditionCmd.class);
+        cmdList.add(CreateConditionForVmAutoScalingCmd.class);
         cmdList.add(DeleteAutoScalePolicyCmd.class);
         cmdList.add(DeleteAutoScaleVmGroupCmd.class);
         cmdList.add(DeleteAutoScaleVmProfileCmd.class);

server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java

@@ -53,7 +53,7 @@
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;
 import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
-import org.apache.cloudstack.api.command.user.autoscale.CreateConditionCmd;
+import org.apache.cloudstack.api.command.user.autoscale.CreateConditionForVmAutoScalingCmd;
 import org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd;
 import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
 import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd;
@@ -514,8 +514,8 @@ public void testDeleteCounterWithUsedCounter() throws ResourceInUseException {
     }
 
     @Test
-    public void testCreateConditionCmd() throws IllegalArgumentException {
-        CreateConditionCmd cmd = new CreateConditionCmd();
+    public void testCreateConditionForVmAutoScalingCmd() throws IllegalArgumentException {
+        CreateConditionForVmAutoScalingCmd cmd = new CreateConditionForVmAutoScalingCmd();
 
         ReflectionTestUtils.setField(cmd, "counterId", counterId);
         ReflectionTestUtils.setField(cmd, "relationalOperator", String.valueOf(relationalOperator));
@@ -528,8 +528,8 @@ public void testCreateConditionCmd() throws IllegalArgumentException {
     }
 
     @Test(expected = InvalidParameterValueException.class)
-    public void testCreateConditionCmdWithInvalidOperator() throws IllegalArgumentException {
-        CreateConditionCmd cmd = new CreateConditionCmd();
+    public void testCreateConditionForVmAutoScalingCmdWithInvalidOperator() throws IllegalArgumentException {
+        CreateConditionForVmAutoScalingCmd cmd = new CreateConditionForVmAutoScalingCmd();
 
         ReflectionTestUtils.setField(cmd, "counterId", counterId);
         ReflectionTestUtils.setField(cmd, "relationalOperator", INVALID);
@@ -541,8 +541,8 @@ public void testCreateConditionCmdWithInvalidOperator() throws IllegalArgumentEx
     }
 
     @Test(expected = InvalidParameterValueException.class)
-    public void testCreateConditionCmdWithInvalidThreshold() throws IllegalArgumentException {
-        CreateConditionCmd cmd = new CreateConditionCmd();
+    public void testCreateConditionForVmAutoScalingCmdWithInvalidThreshold() throws IllegalArgumentException {
+        CreateConditionForVmAutoScalingCmd cmd = new CreateConditionForVmAutoScalingCmd();
 
         ReflectionTestUtils.setField(cmd, "counterId", counterId);
         ReflectionTestUtils.setField(cmd, "relationalOperator", String.valueOf(relationalOperator));