diff --git a/api/src/main/java/com/cloud/network/as/AutoScaleService.java b/api/src/main/java/com/cloud/network/as/AutoScaleService.java index 4aef10f8de9e..490885770c9f 100644 --- a/api/src/main/java/com/cloud/network/as/AutoScaleService.java +++ b/api/src/main/java/com/cloud/network/as/AutoScaleService.java @@ -18,20 +18,20 @@ import java.util.List; -import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd; +import org.apache.cloudstack.api.command.admin.autoscale.CreateAutoScaleCounterCmd; +import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleConditionCmd; 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.ListAutoScalePoliciesCmd; import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd; import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd; -import org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd; -import org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleConditionsCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleCountersCmd; 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 org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleConditionCmd; import com.cloud.exception.ResourceInUseException; import com.cloud.exception.ResourceUnavailableException; @@ -68,19 +68,19 @@ public interface AutoScaleService { List listAutoScaleVmGroups(ListAutoScaleVmGroupsCmd listAutoScaleVmGroupsCmd); - Counter createCounter(CreateCounterCmd cmd); + Counter createCounter(CreateAutoScaleCounterCmd cmd); Counter getCounter(long counterId); boolean deleteCounter(long counterId) throws ResourceInUseException; - List listCounters(ListCountersCmd cmd); + List listCounters(ListAutoScaleCountersCmd cmd); - Condition createCondition(CreateConditionCmd cmd); + Condition createCondition(CreateAutoScaleConditionCmd cmd); - List listConditions(ListConditionsCmd cmd); + List listConditions(ListAutoScaleConditionsCmd cmd); boolean deleteCondition(long conditionId) throws ResourceInUseException; - Condition updateCondition(UpdateConditionCmd cmd) throws ResourceInUseException; + Condition updateCondition(UpdateAutoScaleConditionCmd cmd) throws ResourceInUseException; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateAutoScaleCounterCmd.java similarity index 98% rename from api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateAutoScaleCounterCmd.java index 013d0f966ddf..28aa9ae74b8c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateAutoScaleCounterCmd.java @@ -34,7 +34,7 @@ @APICommand(name = "createCounter", description = "Adds metric counter for VM auto scaling", responseObject = CounterResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class CreateCounterCmd extends BaseAsyncCreateCmd { +public class CreateAutoScaleCounterCmd extends BaseAsyncCreateCmd { private static final String s_name = "counterresponse"; // /////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteAutoScaleCounterCmd.java similarity index 98% rename from api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteAutoScaleCounterCmd.java index b7b2ce5cb70d..d57e5a4937d1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteAutoScaleCounterCmd.java @@ -34,7 +34,7 @@ @APICommand(name = "deleteCounter", description = "Deletes a counter for VM auto scaling", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class DeleteCounterCmd extends BaseAsyncCmd { +public class DeleteAutoScaleCounterCmd extends BaseAsyncCmd { // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleConditionCmd.java similarity index 98% rename from api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleConditionCmd.java index 0ffb9afdac4d..0f059e124cd8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleConditionCmd.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 CreateAutoScaleConditionCmd extends BaseAsyncCreateCmd { private static final String s_name = "conditionresponse"; // /////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleConditionCmd.java similarity index 98% rename from api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleConditionCmd.java index 9590012e0375..26d2cab4d741 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleConditionCmd.java @@ -37,7 +37,7 @@ @APICommand(name = "deleteCondition", description = "Removes a condition for VM auto scaling", responseObject = SuccessResponse.class, entityType = {Condition.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class DeleteConditionCmd extends BaseAsyncCmd { +public class DeleteAutoScaleConditionCmd extends BaseAsyncCmd { // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleConditionsCmd.java similarity index 97% rename from api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleConditionsCmd.java index febf937d75f6..303d743781c7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleConditionsCmd.java @@ -34,7 +34,7 @@ @APICommand(name = "listConditions", description = "List Conditions for VM auto scaling", responseObject = ConditionResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class ListConditionsCmd extends BaseListProjectAndAccountResourcesCmd { +public class ListAutoScaleConditionsCmd extends BaseListProjectAndAccountResourcesCmd { // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleCountersCmd.java similarity index 98% rename from api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleCountersCmd.java index d03584fd63d5..66e01377bc87 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleCountersCmd.java @@ -33,7 +33,7 @@ @APICommand(name = "listCounters", description = "List the counters for VM auto scaling", responseObject = CounterResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class ListCountersCmd extends BaseListCmd { +public class ListAutoScaleCountersCmd extends BaseListCmd { private static final String s_name = "counterresponse"; // /////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleConditionCmd.java similarity index 98% rename from api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleConditionCmd.java index 4ed8244ff0c9..8805bd83510d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleConditionCmd.java @@ -39,7 +39,7 @@ @APICommand(name = "updateCondition", description = "Updates a condition for VM auto scaling", responseObject = SuccessResponse.class, entityType = {Condition.class}, authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.18.0") -public class UpdateConditionCmd extends BaseAsyncCmd { +public class UpdateAutoScaleConditionCmd extends BaseAsyncCmd { // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateConditionCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateAutoScaleConditionCmdTest.java similarity index 93% rename from api/src/test/java/org/apache/cloudstack/api/command/test/UpdateConditionCmdTest.java rename to api/src/test/java/org/apache/cloudstack/api/command/test/UpdateAutoScaleConditionCmdTest.java index 7d6f8dc35b7e..4cda4af23722 100644 --- a/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateConditionCmdTest.java +++ b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateAutoScaleConditionCmdTest.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.user.autoscale.UpdateConditionCmd; +import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleConditionCmd; import org.apache.cloudstack.api.response.ConditionResponse; import org.junit.Assert; @@ -39,9 +39,9 @@ import static org.mockito.Mockito.when; -public class UpdateConditionCmdTest { +public class UpdateAutoScaleConditionCmdTest { - private UpdateConditionCmd updateConditionCmd; + private UpdateAutoScaleConditionCmd updateConditionCmd; private Condition condition; private AutoScaleService autoScaleService; @@ -61,7 +61,7 @@ public void setUp() { entityMgr = Mockito.spy(EntityManager.class); responseGenerator = Mockito.spy(ResponseGenerator.class); - updateConditionCmd = new UpdateConditionCmd(); + updateConditionCmd = new UpdateAutoScaleConditionCmd(); ReflectionTestUtils.setField(updateConditionCmd,"_autoScaleService", autoScaleService); ReflectionTestUtils.setField(updateConditionCmd,"_entityMgr", entityMgr); @@ -96,7 +96,7 @@ public void verifyUpdateConditionCmd() { @Test public void testCreateSuccess() { try { - Mockito.when(autoScaleService.updateCondition(Mockito.any(UpdateConditionCmd.class))).thenReturn(condition); + Mockito.when(autoScaleService.updateCondition(Mockito.any(UpdateAutoScaleConditionCmd.class))).thenReturn(condition); } catch (ResourceInUseException ex) { Assert.fail("Got exception: " + ex.getMessage()); } @@ -117,7 +117,7 @@ public void testCreateFailure() { ResourceInUseException exception = new ResourceInUseException("Resource in use"); try { - Mockito.when(autoScaleService.updateCondition(Mockito.any(UpdateConditionCmd.class))).thenThrow(exception); + Mockito.when(autoScaleService.updateCondition(Mockito.any(UpdateAutoScaleConditionCmd.class))).thenThrow(exception); } catch (ResourceInUseException ex) { Assert.fail("Got exception: " + ex.getMessage()); } diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java index 90380b77e440..911e3b491564 100644 --- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java @@ -50,20 +50,20 @@ import org.apache.cloudstack.api.BaseCmd.HTTPMethod; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd; +import org.apache.cloudstack.api.command.admin.autoscale.CreateAutoScaleCounterCmd; +import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleConditionCmd; 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.ListAutoScalePoliciesCmd; import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd; import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd; -import org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd; -import org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleConditionsCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleCountersCmd; 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 org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleConditionCmd; import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; import org.apache.cloudstack.config.ApiServiceConfiguration; import org.apache.cloudstack.context.CallContext; @@ -1454,7 +1454,7 @@ public AutoScaleVmGroup disableAutoScaleVmGroup(Long id) { @Override @ActionEvent(eventType = EventTypes.EVENT_COUNTER_CREATE, eventDescription = "Counter", create = true) @DB - public Counter createCounter(CreateCounterCmd cmd) { + public Counter createCounter(CreateAutoScaleCounterCmd cmd) { String source = cmd.getSource().toUpperCase(); String name = cmd.getName(); String value = cmd.getValue(); @@ -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(CreateAutoScaleConditionCmd cmd) { Account caller = CallContext.current().getCallingAccount(); Account owner = accountMgr.finalizeOwner(caller, cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId()); accountMgr.checkAccess(caller, null, true, owner); @@ -1527,7 +1527,7 @@ public Condition createCondition(CreateConditionCmd cmd) { } @Override - public List listCounters(ListCountersCmd cmd) { + public List listCounters(ListAutoScaleCountersCmd cmd) { String name = cmd.getName(); Long id = cmd.getId(); String source = cmd.getSource(); @@ -1549,7 +1549,7 @@ public List listCounters(ListCountersCmd cmd) { } @Override - public List listConditions(ListConditionsCmd cmd) { + public List listConditions(ListAutoScaleConditionsCmd cmd) { Long id = cmd.getId(); Long counterId = cmd.getCounterId(); Long policyId = cmd.getPolicyId(); @@ -1631,7 +1631,7 @@ public boolean deleteCondition(long conditionId) throws ResourceInUseException { @Override @ActionEvent(eventType = EventTypes.EVENT_CONDITION_UPDATE, eventDescription = "update a condition") - public Condition updateCondition(UpdateConditionCmd cmd) throws ResourceInUseException { + public Condition updateCondition(UpdateAutoScaleConditionCmd cmd) throws ResourceInUseException { Long conditionId = cmd.getId(); /* Check if entity is in database */ ConditionVO condition = getEntityInDatabase(CallContext.current().getCallingAccount(), "Condition", conditionId, conditionDao); diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 3f811c152f00..859443a47cd4 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -64,8 +64,8 @@ import org.apache.cloudstack.api.command.admin.address.ReleasePodIpCmdByAdmin; import org.apache.cloudstack.api.command.admin.affinitygroup.UpdateVMAffinityGroupCmdByAdmin; import org.apache.cloudstack.api.command.admin.alert.GenerateAlertCmd; -import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd; -import org.apache.cloudstack.api.command.admin.autoscale.DeleteCounterCmd; +import org.apache.cloudstack.api.command.admin.autoscale.CreateAutoScaleCounterCmd; +import org.apache.cloudstack.api.command.admin.autoscale.DeleteAutoScaleCounterCmd; import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd; import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd; @@ -360,22 +360,22 @@ 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.CreateAutoScaleConditionCmd; 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; -import org.apache.cloudstack.api.command.user.autoscale.DeleteConditionCmd; +import org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleConditionCmd; import org.apache.cloudstack.api.command.user.autoscale.DisableAutoScaleVmGroupCmd; import org.apache.cloudstack.api.command.user.autoscale.EnableAutoScaleVmGroupCmd; 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; -import org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd; -import org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleConditionsCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleCountersCmd; 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 org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleConditionCmd; import org.apache.cloudstack.api.command.user.bucket.CreateBucketCmd; import org.apache.cloudstack.api.command.user.bucket.DeleteBucketCmd; import org.apache.cloudstack.api.command.user.bucket.ListBucketsCmd; @@ -3698,8 +3698,8 @@ public List> getCommands() { cmdList.add(EnableAccountCmd.class); cmdList.add(LockAccountCmd.class); cmdList.add(UpdateAccountCmd.class); - cmdList.add(CreateCounterCmd.class); - cmdList.add(DeleteCounterCmd.class); + cmdList.add(CreateAutoScaleCounterCmd.class); + cmdList.add(DeleteAutoScaleCounterCmd.class); cmdList.add(AddClusterCmd.class); cmdList.add(DeleteClusterCmd.class); cmdList.add(ListClustersCmd.class); @@ -3859,22 +3859,22 @@ public List> getCommands() { cmdList.add(CreateAutoScalePolicyCmd.class); cmdList.add(CreateAutoScaleVmGroupCmd.class); cmdList.add(CreateAutoScaleVmProfileCmd.class); - cmdList.add(CreateConditionCmd.class); + cmdList.add(CreateAutoScaleConditionCmd.class); cmdList.add(DeleteAutoScalePolicyCmd.class); cmdList.add(DeleteAutoScaleVmGroupCmd.class); cmdList.add(DeleteAutoScaleVmProfileCmd.class); - cmdList.add(DeleteConditionCmd.class); + cmdList.add(DeleteAutoScaleConditionCmd.class); cmdList.add(DisableAutoScaleVmGroupCmd.class); cmdList.add(EnableAutoScaleVmGroupCmd.class); cmdList.add(ListAutoScalePoliciesCmd.class); cmdList.add(ListAutoScaleVmGroupsCmd.class); cmdList.add(ListAutoScaleVmProfilesCmd.class); - cmdList.add(ListConditionsCmd.class); - cmdList.add(ListCountersCmd.class); + cmdList.add(ListAutoScaleConditionsCmd.class); + cmdList.add(ListAutoScaleCountersCmd.class); cmdList.add(UpdateAutoScalePolicyCmd.class); cmdList.add(UpdateAutoScaleVmGroupCmd.class); cmdList.add(UpdateAutoScaleVmProfileCmd.class); - cmdList.add(UpdateConditionCmd.class); + cmdList.add(UpdateAutoScaleConditionCmd.class); cmdList.add(ListCapabilitiesCmd.class); cmdList.add(ListEventsCmd.class); cmdList.add(ListEventTypesCmd.class); diff --git a/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java b/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java index 7ddd0d612138..a4b02e74a78c 100644 --- a/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java +++ b/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java @@ -49,15 +49,15 @@ import org.apache.cloudstack.annotation.dao.AnnotationDao; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd; +import org.apache.cloudstack.api.command.admin.autoscale.CreateAutoScaleCounterCmd; +import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleConditionCmd; 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.ListCountersCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleCountersCmd; 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 org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleConditionCmd; import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; import org.apache.cloudstack.config.ApiServiceConfiguration; import org.apache.cloudstack.context.CallContext; @@ -429,7 +429,7 @@ public void tearDown() { @Test public void testCreateCounterCmd() throws IllegalArgumentException { - CreateCounterCmd cmd = new CreateCounterCmd(); + CreateAutoScaleCounterCmd cmd = new CreateAutoScaleCounterCmd(); ReflectionTestUtils.setField(cmd, ApiConstants.NAME, counterName); ReflectionTestUtils.setField(cmd, ApiConstants.PROVIDER, counterProvider); ReflectionTestUtils.setField(cmd, ApiConstants.SOURCE, counterSource.toString()); @@ -443,7 +443,7 @@ public void testCreateCounterCmd() throws IllegalArgumentException { @Test(expected = InvalidParameterValueException.class) public void testCreateCounterCmdWithInvalidSource() throws IllegalArgumentException { - CreateCounterCmd cmd = new CreateCounterCmd(); + CreateAutoScaleCounterCmd cmd = new CreateAutoScaleCounterCmd(); ReflectionTestUtils.setField(cmd, ApiConstants.NAME, counterName); ReflectionTestUtils.setField(cmd, ApiConstants.PROVIDER, counterProvider); ReflectionTestUtils.setField(cmd, ApiConstants.SOURCE, INVALID); @@ -456,7 +456,7 @@ public void testCreateCounterCmdWithInvalidSource() throws IllegalArgumentExcept @Test(expected = InvalidParameterValueException.class) public void testCreateCounterCmdWithInvalidProvider() throws IllegalArgumentException { - CreateCounterCmd cmd = new CreateCounterCmd(); + CreateAutoScaleCounterCmd cmd = new CreateAutoScaleCounterCmd(); ReflectionTestUtils.setField(cmd, ApiConstants.NAME, counterName); ReflectionTestUtils.setField(cmd, ApiConstants.PROVIDER, INVALID); ReflectionTestUtils.setField(cmd, ApiConstants.SOURCE, counterSource.toString()); @@ -472,7 +472,7 @@ public void testListCounters() { List countersMock = Arrays.asList(counterMock); when(counterDao.listCounters(any(), any(), any(), any(), any(), any())).thenReturn(countersMock); - ListCountersCmd cmd = new ListCountersCmd(); + ListAutoScaleCountersCmd cmd = new ListAutoScaleCountersCmd(); ReflectionTestUtils.setField(cmd, ApiConstants.PROVIDER, counterProvider); List counters = autoScaleManagerImplSpy.listCounters(cmd); @@ -481,7 +481,7 @@ public void testListCounters() { @Test(expected = InvalidParameterValueException.class) public void testListCountersWithInvalidProvider() { - ListCountersCmd cmd = new ListCountersCmd(); + ListAutoScaleCountersCmd cmd = new ListAutoScaleCountersCmd(); ReflectionTestUtils.setField(cmd, ApiConstants.PROVIDER, INVALID); List counters = autoScaleManagerImplSpy.listCounters(cmd); @@ -514,8 +514,8 @@ public void testDeleteCounterWithUsedCounter() throws ResourceInUseException { } @Test - public void testCreateConditionCmd() throws IllegalArgumentException { - CreateConditionCmd cmd = new CreateConditionCmd(); + public void testCreateConditionForVmAutoScalingCmd() throws IllegalArgumentException { + CreateAutoScaleConditionCmd cmd = new CreateAutoScaleConditionCmd(); 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 { + CreateAutoScaleConditionCmd cmd = new CreateAutoScaleConditionCmd(); 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 { + CreateAutoScaleConditionCmd cmd = new CreateAutoScaleConditionCmd(); ReflectionTestUtils.setField(cmd, "counterId", counterId); ReflectionTestUtils.setField(cmd, "relationalOperator", String.valueOf(relationalOperator)); @@ -585,7 +585,7 @@ public void testUpdateCondition() throws ResourceInUseException { when(conditionDao.update(eq(conditionId), any())).thenReturn(true); - UpdateConditionCmd cmd = new UpdateConditionCmd(); + UpdateAutoScaleConditionCmd cmd = new UpdateAutoScaleConditionCmd(); ReflectionTestUtils.setField(cmd, "id", conditionId); ReflectionTestUtils.setField(cmd, "relationalOperator", String.valueOf(relationalOperator)); @@ -599,7 +599,7 @@ public void testUpdateCondition() throws ResourceInUseException { @Test(expected = InvalidParameterValueException.class) public void testUpdateConditionWithInvalidOperator() throws ResourceInUseException { - UpdateConditionCmd cmd = new UpdateConditionCmd(); + UpdateAutoScaleConditionCmd cmd = new UpdateAutoScaleConditionCmd(); ReflectionTestUtils.setField(cmd, "id", conditionId); ReflectionTestUtils.setField(cmd, "relationalOperator", INVALID); @@ -612,7 +612,7 @@ public void testUpdateConditionWithInvalidOperator() throws ResourceInUseExcepti @Test(expected = InvalidParameterValueException.class) public void testUpdateConditionWithInvalidThreshold() throws ResourceInUseException { - UpdateConditionCmd cmd = new UpdateConditionCmd(); + UpdateAutoScaleConditionCmd cmd = new UpdateAutoScaleConditionCmd(); ReflectionTestUtils.setField(cmd, "id", conditionId); ReflectionTestUtils.setField(cmd, "relationalOperator", String.valueOf(relationalOperator)); @@ -645,7 +645,7 @@ public void testUpdateConditionWithPolicies() throws ResourceInUseException { Mockito.doReturn(searchCriteriaMock2).when(searchBuilderMock2).create(); Mockito.doReturn(Arrays.asList(asVmGroupMock)).when(autoScaleVmGroupDao).search(searchCriteriaMock2, null); - UpdateConditionCmd cmd = new UpdateConditionCmd(); + UpdateAutoScaleConditionCmd cmd = new UpdateAutoScaleConditionCmd(); ReflectionTestUtils.setField(cmd, "id", conditionId); ReflectionTestUtils.setField(cmd, "relationalOperator", String.valueOf(relationalOperator));