Skip to content

Commit 16a6b0f

Browse files
erikbockserikbocks
committed
rename other auto scale related class names
1 parent a8645f3 commit 16a6b0f

File tree

12 files changed

+63
-63
lines changed

12 files changed

+63
-63
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818

1919
import java.util.List;
2020

21-
import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;
21+
import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterForAutoScaleConditionCmd;
22+
import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleConditionCmd;
2223
import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
2324
import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;
2425
import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
25-
import org.apache.cloudstack.api.command.user.autoscale.CreateConditionForVmAutoScalingCmd;
2626
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;
2727
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd;
2828
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd;
29-
import org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd;
30-
import org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd;
29+
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleConditionsCmd;
30+
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleConditionCountersCmd;
3131
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScalePolicyCmd;
3232
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
3333
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd;
34-
import org.apache.cloudstack.api.command.user.autoscale.UpdateConditionCmd;
34+
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleConditionCmd;
3535

3636
import com.cloud.exception.ResourceInUseException;
3737
import com.cloud.exception.ResourceUnavailableException;
@@ -68,17 +68,17 @@ public interface AutoScaleService {
6868

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

71-
Counter createCounter(CreateCounterCmd cmd);
71+
Counter createCounter(CreateCounterForAutoScaleConditionCmd cmd);
7272

7373
boolean deleteCounter(long counterId) throws ResourceInUseException;
7474

75-
List<? extends Counter> listCounters(ListCountersCmd cmd);
75+
List<? extends Counter> listCounters(ListAutoScaleConditionCountersCmd cmd);
7676

77-
Condition createCondition(CreateConditionForVmAutoScalingCmd cmd);
77+
Condition createCondition(CreateAutoScaleConditionCmd cmd);
7878

79-
List<? extends Condition> listConditions(ListConditionsCmd cmd);
79+
List<? extends Condition> listConditions(ListAutoScaleConditionsCmd cmd);
8080

8181
boolean deleteCondition(long conditionId) throws ResourceInUseException;
8282

83-
Condition updateCondition(UpdateConditionCmd cmd) throws ResourceInUseException;
83+
Condition updateCondition(UpdateAutoScaleConditionCmd cmd) throws ResourceInUseException;
8484
}

‎api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java‎ renamed to ‎api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterForAutoScaleConditionCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
@APICommand(name = "createCounter", description = "Adds metric counter for VM auto scaling", responseObject = CounterResponse.class,
3535
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
36-
public class CreateCounterCmd extends BaseAsyncCreateCmd {
36+
public class CreateCounterForAutoScaleConditionCmd extends BaseAsyncCreateCmd {
3737
private static final String s_name = "counterresponse";
3838

3939
// ///////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java‎ renamed to ‎api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteAutoScaleConditionCounterCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
@APICommand(name = "deleteCounter", description = "Deletes a counter for VM auto scaling", responseObject = SuccessResponse.class,
3636
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
37-
public class DeleteCounterCmd extends BaseAsyncCmd {
37+
public class DeleteAutoScaleConditionCounterCmd extends BaseAsyncCmd {
3838

3939
// ///////////////////////////////////////////////////
4040
// ////////////// API parameters /////////////////////

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

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

4343
// ///////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java‎ renamed to ‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleConditionCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
@APICommand(name = "deleteCondition", description = "Removes a condition for VM auto scaling", responseObject = SuccessResponse.class, entityType = {Condition.class},
3939
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
40-
public class DeleteConditionCmd extends BaseAsyncCmd {
40+
public class DeleteAutoScaleConditionCmd extends BaseAsyncCmd {
4141

4242
// ///////////////////////////////////////////////////
4343
// ////////////// API parameters /////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java‎ renamed to ‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleConditionCountersCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
@APICommand(name = "listCounters", description = "List the counters for VM auto scaling", responseObject = CounterResponse.class,
3535
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
36-
public class ListCountersCmd extends BaseListCmd {
36+
public class ListAutoScaleConditionCountersCmd extends BaseListCmd {
3737
private static final String s_name = "counterresponse";
3838

3939
// ///////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java‎ renamed to ‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleConditionsCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
@APICommand(name = "listConditions", description = "List Conditions for VM auto scaling", responseObject = ConditionResponse.class,
3636
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
37-
public class ListConditionsCmd extends BaseListProjectAndAccountResourcesCmd {
37+
public class ListAutoScaleConditionsCmd extends BaseListProjectAndAccountResourcesCmd {
3838

3939
// ///////////////////////////////////////////////////
4040
// ////////////// API parameters /////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java‎ renamed to ‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleConditionCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
@APICommand(name = "updateCondition", description = "Updates a condition for VM auto scaling", responseObject = SuccessResponse.class, entityType = {Condition.class},
4040
authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User},
4141
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.18.0")
42-
public class UpdateConditionCmd extends BaseAsyncCmd {
42+
public class UpdateAutoScaleConditionCmd extends BaseAsyncCmd {
4343

4444
// ///////////////////////////////////////////////////
4545
// ////////////// API parameters /////////////////////

‎api/src/test/java/org/apache/cloudstack/api/command/test/UpdateConditionCmdTest.java‎ renamed to ‎api/src/test/java/org/apache/cloudstack/api/command/test/UpdateAutoScaleConditionCmdTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.cloudstack.api.ApiErrorCode;
2929
import org.apache.cloudstack.api.ResponseGenerator;
3030
import org.apache.cloudstack.api.ServerApiException;
31-
import org.apache.cloudstack.api.command.user.autoscale.UpdateConditionCmd;
31+
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleConditionCmd;
3232
import org.apache.cloudstack.api.response.ConditionResponse;
3333

3434
import org.junit.Assert;
@@ -39,9 +39,9 @@
3939

4040
import static org.mockito.Mockito.when;
4141

42-
public class UpdateConditionCmdTest {
42+
public class UpdateAutoScaleConditionCmdTest {
4343

44-
private UpdateConditionCmd updateConditionCmd;
44+
private UpdateAutoScaleConditionCmd updateConditionCmd;
4545
private Condition condition;
4646

4747
private AutoScaleService autoScaleService;
@@ -61,7 +61,7 @@ public void setUp() {
6161
entityMgr = Mockito.spy(EntityManager.class);
6262
responseGenerator = Mockito.spy(ResponseGenerator.class);
6363

64-
updateConditionCmd = new UpdateConditionCmd();
64+
updateConditionCmd = new UpdateAutoScaleConditionCmd();
6565

6666
ReflectionTestUtils.setField(updateConditionCmd,"_autoScaleService", autoScaleService);
6767
ReflectionTestUtils.setField(updateConditionCmd,"_entityMgr", entityMgr);
@@ -96,7 +96,7 @@ public void verifyUpdateConditionCmd() {
9696
@Test
9797
public void testCreateSuccess() {
9898
try {
99-
Mockito.when(autoScaleService.updateCondition(Mockito.any(UpdateConditionCmd.class))).thenReturn(condition);
99+
Mockito.when(autoScaleService.updateCondition(Mockito.any(UpdateAutoScaleConditionCmd.class))).thenReturn(condition);
100100
} catch (ResourceInUseException ex) {
101101
Assert.fail("Got exception: " + ex.getMessage());
102102
}
@@ -117,7 +117,7 @@ public void testCreateFailure() {
117117

118118
ResourceInUseException exception = new ResourceInUseException("Resource in use");
119119
try {
120-
Mockito.when(autoScaleService.updateCondition(Mockito.any(UpdateConditionCmd.class))).thenThrow(exception);
120+
Mockito.when(autoScaleService.updateCondition(Mockito.any(UpdateAutoScaleConditionCmd.class))).thenThrow(exception);
121121
} catch (ResourceInUseException ex) {
122122
Assert.fail("Got exception: " + ex.getMessage());
123123
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@
5050
import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
5151
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
5252
import org.apache.cloudstack.api.ServerApiException;
53-
import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;
53+
import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterForAutoScaleConditionCmd;
54+
import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleConditionCmd;
5455
import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
5556
import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;
5657
import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
57-
import org.apache.cloudstack.api.command.user.autoscale.CreateConditionForVmAutoScalingCmd;
5858
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;
5959
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd;
6060
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd;
61-
import org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd;
62-
import org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd;
61+
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleConditionsCmd;
62+
import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleConditionCountersCmd;
6363
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScalePolicyCmd;
6464
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
6565
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd;
66-
import org.apache.cloudstack.api.command.user.autoscale.UpdateConditionCmd;
66+
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleConditionCmd;
6767
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
6868
import org.apache.cloudstack.config.ApiServiceConfiguration;
6969
import org.apache.cloudstack.context.CallContext;
@@ -1454,7 +1454,7 @@ public AutoScaleVmGroup disableAutoScaleVmGroup(Long id) {
14541454
@Override
14551455
@ActionEvent(eventType = EventTypes.EVENT_COUNTER_CREATE, eventDescription = "Counter", create = true)
14561456
@DB
1457-
public Counter createCounter(CreateCounterCmd cmd) {
1457+
public Counter createCounter(CreateCounterForAutoScaleConditionCmd cmd) {
14581458
String source = cmd.getSource().toUpperCase();
14591459
String name = cmd.getName();
14601460
Counter.Source src;
@@ -1482,7 +1482,7 @@ public Counter createCounter(CreateCounterCmd cmd) {
14821482

14831483
@Override
14841484
@ActionEvent(eventType = EventTypes.EVENT_CONDITION_CREATE, eventDescription = "Condition", create = true)
1485-
public Condition createCondition(CreateConditionForVmAutoScalingCmd cmd) {
1485+
public Condition createCondition(CreateAutoScaleConditionCmd cmd) {
14861486
Account caller = CallContext.current().getCallingAccount();
14871487
Account owner = accountMgr.finalizeOwner(caller, cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
14881488
accountMgr.checkAccess(caller, null, true, owner);
@@ -1516,7 +1516,7 @@ public Condition createCondition(CreateConditionForVmAutoScalingCmd cmd) {
15161516
}
15171517

15181518
@Override
1519-
public List<? extends Counter> listCounters(ListCountersCmd cmd) {
1519+
public List<? extends Counter> listCounters(ListAutoScaleConditionCountersCmd cmd) {
15201520
String name = cmd.getName();
15211521
Long id = cmd.getId();
15221522
String source = cmd.getSource();
@@ -1538,7 +1538,7 @@ public List<? extends Counter> listCounters(ListCountersCmd cmd) {
15381538
}
15391539

15401540
@Override
1541-
public List<? extends Condition> listConditions(ListConditionsCmd cmd) {
1541+
public List<? extends Condition> listConditions(ListAutoScaleConditionsCmd cmd) {
15421542
Long id = cmd.getId();
15431543
Long counterId = cmd.getCounterId();
15441544
Long policyId = cmd.getPolicyId();
@@ -1620,7 +1620,7 @@ public boolean deleteCondition(long conditionId) throws ResourceInUseException {
16201620

16211621
@Override
16221622
@ActionEvent(eventType = EventTypes.EVENT_CONDITION_UPDATE, eventDescription = "update a condition")
1623-
public Condition updateCondition(UpdateConditionCmd cmd) throws ResourceInUseException {
1623+
public Condition updateCondition(UpdateAutoScaleConditionCmd cmd) throws ResourceInUseException {
16241624
Long conditionId = cmd.getId();
16251625
/* Check if entity is in database */
16261626
ConditionVO condition = getEntityInDatabase(CallContext.current().getCallingAccount(), "Condition", conditionId, conditionDao);

0 commit comments

Comments
 (0)