Skip to content

<fix>[config]: update globalConfigOptions number range #4161

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

Closed
zstack-robot-2 wants to merge 1 commit into from
Closed

<fix>[config]: update globalConfigOptions number range #4161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions core/src/main/java/org/zstack/core/config/GlobalConfigFacadeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ public void validateGlobalConfig(String category, String name, String oldValue,
}
}

boolean isInteger = Integer.class.getName().equals(config.getType());
config.installQueryExtension(new GlobalConfigQueryExtensionPoint() {
@Override
public GlobalConfigOptions getConfigOptions() {
Expand All @@ -669,18 +670,24 @@ public GlobalConfigOptions getConfigOptions() {
if (at.validValues().length > 0) {
options.setValidValue(Arrays.asList(at.validValues()));
} else if (at.inNumberRange().length == 2){
options.setNumberLessThan(at.inNumberRange()[1] + 1);
options.setNumberGreaterThan(at.inNumberRange()[0] - 1);
options.setNumberLessThanOrEqual(at.inNumberRange()[1]);
options.setNumberGreaterThanOrEqual(at.inNumberRange()[0]);
} else if (at.numberLessThan() != Long.MAX_VALUE || at.numberGreaterThan() != Long.MIN_VALUE) {
options.setNumberLessThan(Long.MAX_VALUE);
options.setNumberGreaterThan(Long.MIN_VALUE);
if (isInteger) {
options.setNumberLessThanOrEqual((long) Integer.MAX_VALUE);
options.setNumberGreaterThanOrEqual((long) Integer.MIN_VALUE);
} else {
options.setNumberLessThanOrEqual(Long.MAX_VALUE);
options.setNumberGreaterThanOrEqual(Long.MIN_VALUE);
}
}

if (at.numberLessThan() != Long.MAX_VALUE) {
options.setNumberLessThan(at.numberLessThan());
options.setNumberLessThanOrEqual(at.numberLessThan());
}

if (at.numberGreaterThan() != Long.MIN_VALUE) {
options.setNumberGreaterThan(at.numberGreaterThan());
options.setNumberGreaterThanOrEqual(at.numberGreaterThan());
}

return options;
Expand Down
18 changes: 18 additions & 0 deletions core/src/main/java/org/zstack/core/config/GlobalConfigOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ public class GlobalConfigOptions {
private List<String> validValue;
private Long numberGreaterThan;
private Long numberLessThan;
private Long numberGreaterThanOrEqual;
private Long numberLessThanOrEqual;

public List<String> getValidValue() {
return validValue;
Expand All @@ -30,4 +32,20 @@ public Long getNumberLessThan() {
public void setNumberLessThan(Long numberLessThan) {
this.numberLessThan = numberLessThan;
}

public Long getNumberGreaterThanOrEqual() {
return numberGreaterThanOrEqual;
}

public void setNumberGreaterThanOrEqual(Long numberGreaterThanOrEqual) {
this.numberGreaterThanOrEqual = numberGreaterThanOrEqual;
}

public Long getNumberLessThanOrEqual() {
return numberLessThanOrEqual;
}

public void setNumberLessThanOrEqual(Long numberLessThanOrEqual) {
this.numberLessThanOrEqual = numberLessThanOrEqual;
}
}
12 changes: 12 additions & 0 deletions core/src/main/java/org/zstack/core/config/GlobalConfigOptionsDoc_zh_cn.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,16 @@ doc {
type "Long"
since "4.4.0"
}
field {
name "numberGreaterThanOrEqual"
desc "大于等于"
type "Long"
since "5.2.0"
}
field {
name "numberLessThanOrEqual"
desc "小于等于"
type "Long"
since "5.2.0"
}
}
16 changes: 16 additions & 0 deletions sdk/src/main/java/org/zstack/sdk/GlobalConfigOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,20 @@ public java.lang.Long getNumberLessThan() {
return this.numberLessThan;
}

public java.lang.Long numberGreaterThanOrEqual;
public void setNumberGreaterThanOrEqual(java.lang.Long numberGreaterThanOrEqual) {
this.numberGreaterThanOrEqual = numberGreaterThanOrEqual;
}
public java.lang.Long getNumberGreaterThanOrEqual() {
return this.numberGreaterThanOrEqual;
}

public java.lang.Long numberLessThanOrEqual;
public void setNumberLessThanOrEqual(java.lang.Long numberLessThanOrEqual) {
this.numberLessThanOrEqual = numberLessThanOrEqual;
}
public java.lang.Long getNumberLessThanOrEqual() {
return this.numberLessThanOrEqual;
}

}
12 changes: 6 additions & 6 deletions test/src/test/groovy/org/zstack/test/integration/core/config/GlobalConfigCase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ class GlobalConfigCase extends SubCase {
name = KVMGlobalConfig.VM_CREATE_CONCURRENCY.name
} as GetGlobalConfigOptionsResult

// number range for this category is {1, 10}
assert configOptions.options.numberGreaterThan == 0
assert configOptions.options.numberLessThan == 11
// number range for this category is {1, 10}, 1 <= value <= 10
assert configOptions.options.numberGreaterThanOrEqual == 1
assert configOptions.options.numberLessThanOrEqual == 10
}

void testGetNumberBoundary() {
Expand All @@ -103,9 +103,9 @@ class GlobalConfigCase extends SubCase {
name = KVMGlobalConfig.HOST_SYNC_LEVEL.name
} as GetGlobalConfigOptionsResult

// number boundary for this category is > 2
assert configOptions.options.numberGreaterThan == 2
assert configOptions.options.numberLessThan == Long.MAX_VALUE
// number boundary for this category is >=2 , range [2, 2147483647]
assert configOptions.options.numberGreaterThanOrEqual == 2
assert configOptions.options.numberLessThanOrEqual == (long) Integer.MAX_VALUE
}

void testFloatPointNumberTolerance() {
Expand Down