Skip to content

Commit 1c2df1a

Browse files
Apply Nitin's suggestions
1 parent 98e5091 commit 1c2df1a

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ public class ApiConstants {
152152
public static final String ICMP_TYPE = "icmptype";
153153
public static final String ID = "id";
154154
public static final String IDS = "ids";
155-
public static final String ID_PREVIOUS_ACL_RULE = "previousaclruleid";
156-
public static final String ID_NEXT_ACL_RULE = "nextaclruleid";
155+
public static final String PREVIOUS_ACL_RULE_ID = "previousaclruleid";
156+
public static final String NEXT_ACL_RULE_ID = "nextaclruleid";
157157
public static final String INTERNAL_DNS1 = "internaldns1";
158158
public static final String INTERNAL_DNS2 = "internaldns2";
159159
public static final String INTERVAL_TYPE = "intervaltype";

api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public class MoveNetworkAclItemCmd extends BaseAsyncCustomIdCmd {
3737
@Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true, description = "The ID of the network ACL rule that is being moved to a new position.")
3838
private String uuidRuleBeingMoved;
3939

40-
@Parameter(name = ApiConstants.ID_PREVIOUS_ACL_RULE, type = CommandType.STRING, description = "The ID of the first rule that is right before the new position where the rule being moved is going to be placed. This value can be 'NULL' if the rule is being moved to the first position of the network ACL list.")
40+
@Parameter(name = ApiConstants.PREVIOUS_ACL_RULE_ID, type = CommandType.STRING, description = "The ID of the first rule that is right before the new position where the rule being moved is going to be placed. This value can be 'NULL' if the rule is being moved to the first position of the network ACL list.")
4141
private String previousAclRuleUuid;
4242

43-
@Parameter(name = ApiConstants.ID_NEXT_ACL_RULE, type = CommandType.STRING, description = "The ID of the rule that is right after the new position where the rule being moved is going to be placed. This value can be 'NULL' if the rule is being moved to the last position of the network ACL list.")
43+
@Parameter(name = ApiConstants.NEXT_ACL_RULE_ID, type = CommandType.STRING, description = "The ID of the rule that is right after the new position where the rule being moved is going to be placed. This value can be 'NULL' if the rule is being moved to the last position of the network ACL list.")
4444
private String nextAclRuleUuid;
4545

4646
@Override

server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ public int compare(NetworkACLItemVO o1, NetworkACLItemVO o2) {
984984
}
985985

986986
/**
987-
* Mover an ACL to the space between to other rules. If there is already enough room to accommodate the ACL rule being moved, we simply get the 'number' field from the previous ACL rule and add one, and then define this new value as the 'number' value for the ACL rule being moved.
987+
* Moves an ACL to the space between to other rules. If there is already enough room to accommodate the ACL rule being moved, we simply get the 'number' field from the previous ACL rule and add one, and then define this new value as the 'number' value for the ACL rule being moved.
988988
* Otherwise, we will need to make room. This process is executed via {@link #updateAclRuleToNewPositionAndExecuteShiftIfNecessary(NetworkACLItemVO, int, List, int)}, which will create the space between ACL rules if necessary. This involves shifting ACL rules to accommodate the rule being moved.
989989
*/
990990
protected NetworkACLItem moveRuleBetweenAclRules(NetworkACLItemVO ruleBeingMoved, List<NetworkACLItemVO> allAclRules, NetworkACLItemVO previousRule, NetworkACLItemVO nextRule) {

0 commit comments

Comments
 (0)