Skip to content

Rename CreateConditionCmd class to CreateConditionForVmAutoScalingCmd #11819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+66 −66
Open

Rename CreateConditionCmd class to CreateConditionForVmAutoScalingCmd #11819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0700cb7
rename CreateConditionCmd class to CreateConditionForVmAutoScalingCmd
erikbocks Sep 25, 2025
bdce6c0
rename other auto scale related class names
erikbocks Oct 27, 2025
eb872b9
address Wei's reviews
erikbocks Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions api/src/main/java/com/cloud/network/as/AutoScaleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -68,19 +68,19 @@ public interface AutoScaleService {

List<? extends AutoScaleVmGroup> listAutoScaleVmGroups(ListAutoScaleVmGroupsCmd listAutoScaleVmGroupsCmd);

Counter createCounter(CreateCounterCmd cmd);
Counter createCounter(CreateAutoScaleCounterCmd cmd);

Counter getCounter(long counterId);

boolean deleteCounter(long counterId) throws ResourceInUseException;

List<? extends Counter> listCounters(ListCountersCmd cmd);
List<? extends Counter> listCounters(ListAutoScaleCountersCmd cmd);

Condition createCondition(CreateConditionCmd cmd);
Condition createCondition(CreateAutoScaleConditionCmd cmd);

List<? extends Condition> listConditions(ListConditionsCmd cmd);
List<? extends Condition> listConditions(ListAutoScaleConditionsCmd cmd);

boolean deleteCondition(long conditionId) throws ResourceInUseException;

Condition updateCondition(UpdateConditionCmd cmd) throws ResourceInUseException;
Condition updateCondition(UpdateAutoScaleConditionCmd cmd) throws ResourceInUseException;
}
2 changes: 1 addition & 1 deletion ...and/admin/autoscale/CreateCounterCmd.java → .../autoscale/CreateAutoScaleCounterCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

// ///////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion ...and/admin/autoscale/DeleteCounterCmd.java → .../autoscale/DeleteAutoScaleCounterCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /////////////////////
Expand Down
2 changes: 1 addition & 1 deletion ...nd/user/autoscale/CreateConditionCmd.java → ...utoscale/CreateAutoScaleConditionCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

// ///////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion ...nd/user/autoscale/DeleteConditionCmd.java → ...utoscale/DeleteAutoScaleConditionCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /////////////////////
Expand Down
2 changes: 1 addition & 1 deletion ...and/user/autoscale/ListConditionsCmd.java → ...autoscale/ListAutoScaleConditionsCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /////////////////////
Expand Down
2 changes: 1 addition & 1 deletion ...mmand/user/autoscale/ListCountersCmd.java → ...r/autoscale/ListAutoScaleCountersCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

// ///////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion ...nd/user/autoscale/UpdateConditionCmd.java → ...utoscale/UpdateAutoScaleConditionCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /////////////////////
Expand Down
12 changes: 6 additions & 6 deletions .../command/test/UpdateConditionCmdTest.java → ...test/UpdateAutoScaleConditionCmdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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());
}
Expand All @@ -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());
}
Expand Down
20 changes: 10 additions & 10 deletions server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -1527,7 +1527,7 @@ public Condition createCondition(CreateConditionCmd cmd) {
}

@Override
public List<? extends Counter> listCounters(ListCountersCmd cmd) {
public List<? extends Counter> listCounters(ListAutoScaleCountersCmd cmd) {
String name = cmd.getName();
Long id = cmd.getId();
String source = cmd.getSource();
Expand All @@ -1549,7 +1549,7 @@ public List<? extends Counter> listCounters(ListCountersCmd cmd) {
}

@Override
public List<? extends Condition> listConditions(ListConditionsCmd cmd) {
public List<? extends Condition> listConditions(ListAutoScaleConditionsCmd cmd) {
Long id = cmd.getId();
Long counterId = cmd.getCounterId();
Long policyId = cmd.getPolicyId();
Expand Down Expand Up @@ -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);
Expand Down
28 changes: 14 additions & 14 deletions server/src/main/java/com/cloud/server/ManagementServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -3698,8 +3698,8 @@ public List<Class<?>> 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);
Expand Down Expand Up @@ -3859,22 +3859,22 @@ public List<Class<?>> 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);
Expand Down
Loading
Loading