Skip to content

Commit d377b90

Browse files
author
gitlab
committed
Merge branch 'ZSV-11496@@2' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'
<fix>[kms]: distinguish kms trust state See merge request zstackio/zstack!9384
2 parents 309ea39 + b296237 commit d377b90

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

conf/db/zsv/V5.0.0__schema.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `zstack`.`KmsVO` (
6565
`kmipVersion` varchar(32) DEFAULT NULL,
6666
`username` varchar(255) DEFAULT NULL,
6767
`password` varchar(255) DEFAULT NULL,
68-
`trusted` boolean NOT NULL DEFAULT FALSE,
68+
`trustState` varchar(32) NOT NULL DEFAULT 'MUTUAL_UNTRUSTED',
6969
`activeIdentityUuid` varchar(32) DEFAULT NULL,
7070
`serverCertExpiredDate` timestamp NULL DEFAULT NULL,
7171
`serverCertPem` text DEFAULT NULL,

sdk/src/main/java/org/zstack/sdk/KmsInventory.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public java.lang.String getUsername() {
3737
return this.username;
3838
}
3939

40-
public boolean trusted;
41-
public void setTrusted(boolean trusted) {
42-
this.trusted = trusted;
40+
public java.lang.String trustState;
41+
public void setTrustState(java.lang.String trustState) {
42+
this.trustState = trustState;
4343
}
44-
public boolean getTrusted() {
45-
return this.trusted;
44+
public java.lang.String getTrustState() {
45+
return this.trustState;
4646
}
4747

4848
public java.lang.String activeIdentityUuid;

0 commit comments

Comments
 (0)