Skip to content

Commit 4f6851f

Browse files
Some missed inclusivity changes - use inclusive words/terms as appropriate. (#5131)
1 parent 8e33cf7 commit 4f6851f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class MoveNetworkAclItemCmd extends BaseAsyncCustomIdCmd {
4343
@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

46-
@Parameter(name = ApiConstants.MOVE_ACL_CONSISTENCY_HASH, type = CommandType.STRING, description = "Md5 hash used to check the consistency of the ACL rule list before applying the ACL rule move. This check is useful to manage concurrency problems that may happen when multiple users are editing the same ACL rule listing. The parameter is not required. Therefore, if the user does not send it, he/she is assuming the risk of moving ACL rules without checking the consistency of the access control list before executing the move. We use MD5 hash function on a String that is composed of all UUIDs of the ACL rules in concatenated in their respective order (order defined via 'number' field).")
46+
@Parameter(name = ApiConstants.MOVE_ACL_CONSISTENCY_HASH, type = CommandType.STRING, description = "Md5 hash used to check the consistency of the ACL rule list before applying the ACL rule move. This check is useful to manage concurrency problems that may happen when multiple users are editing the same ACL rule listing. The parameter is not required. Therefore, if the user does not send it, they assume the risk of moving ACL rules without checking the consistency of the access control list before executing the move. We use MD5 hash function on a String that is composed of all UUIDs of the ACL rules in concatenated in their respective order (order defined via 'number' field).")
4747
private String aclConsistencyHash;
4848

4949
@Override

test/integration/component/test_acl_isolatednetwork.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ def test_20_1_deployvm_user_incrossnetwork(self):
926926
self.cleanup.append(vm)
927927
self.fail("User is allowed to deploy VM in a network that is not self-owned ")
928928
except Exception as e:
929-
self.debug("When user tries to deploy vm in a network that does not belong to him %s" % e)
929+
self.debug("When user tries to deploy vm in a network that does not belong to the user %s" % e)
930930
if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.UNABLE_TO_USE_NETWORK):
931931
self.fail("Error message validation failed when User is allowed to deploy VM in a network that is not self-owned ")
932932

0 commit comments

Comments
 (0)