diff --git a/conf/db/zsv/V5.1.0__schema.sql b/conf/db/zsv/V5.1.0__schema.sql index a7bf75ea026..0151462546f 100644 --- a/conf/db/zsv/V5.1.0__schema.sql +++ b/conf/db/zsv/V5.1.0__schema.sql @@ -115,7 +115,7 @@ CALL CREATE_INDEX('AccountVO', 'idxAccountVOname', 'name'); CALL DELETE_INDEX('AccountVO', 'name'); ALTER TABLE `zstack`.`AccountVO` ADD CONSTRAINT `uqAccountVOSourceName` UNIQUE (`source`, `name`); --- Feature: ZCenter License & License Client | ZSV-12274 +-- Feature: ZCenter License & License Client | ZSV-12274, ZSV-12506 CREATE TABLE IF NOT EXISTS `zstack`.`LicenseAuthorizedNodeVO` ( `uuid` char(32) NOT NULL UNIQUE, @@ -134,12 +134,15 @@ CREATE TABLE IF NOT EXISTS `zstack`.`LicenseAuthorizedNodeVO` ( CREATE TABLE IF NOT EXISTS `zstack`.`LicenseAuthorizedCapacityVO` ( `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT, `nodeUuid` char(32) NOT NULL, - `resourceUuid` char(32) DEFAULT NULL, - `resourceInfo` text DEFAULT NULL, + `prodInfo` varchar(255) NOT NULL, `quotaType` varchar(64) NOT NULL, - `quota` bigint unsigned DEFAULT 0, + `quota` bigint unsigned NOT NULL DEFAULT 0, `licenseType` varchar(64) NOT NULL, - `type` varchar(64) NOT NULL, + `state` varchar(64) NOT NULL DEFAULT 'active', + `issueTime` timestamp NOT NULL DEFAULT '1999-12-31 23:59:59', + `expireTime` timestamp NOT NULL DEFAULT '1999-12-31 23:59:59', + `localUsed` bigint unsigned NOT NULL DEFAULT 0, + `otherUsed` bigint unsigned NOT NULL DEFAULT 0, `lastOpDate` timestamp NOT NULL DEFAULT '1999-12-31 23:59:59' ON UPDATE CURRENT_TIMESTAMP, `createDate` timestamp NOT NULL DEFAULT '1999-12-31 23:59:59', PRIMARY KEY (`id`), diff --git a/sdk/src/main/java/org/zstack/sdk/license/entity/server/LicenseAuthorizedCapacityInventory.java b/sdk/src/main/java/org/zstack/sdk/license/entity/server/LicenseAuthorizedCapacityInventory.java index 5dfea9d0625..94842192322 100644 --- a/sdk/src/main/java/org/zstack/sdk/license/entity/server/LicenseAuthorizedCapacityInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/license/entity/server/LicenseAuthorizedCapacityInventory.java @@ -20,20 +20,12 @@ public java.lang.String getNodeUuid() { return this.nodeUuid; } - public java.lang.String resourceUuid; - public void setResourceUuid(java.lang.String resourceUuid) { - this.resourceUuid = resourceUuid; + public java.lang.String prodInfo; + public void setProdInfo(java.lang.String prodInfo) { + this.prodInfo = prodInfo; } - public java.lang.String getResourceUuid() { - return this.resourceUuid; - } - - public java.lang.String resourceInfo; - public void setResourceInfo(java.lang.String resourceInfo) { - this.resourceInfo = resourceInfo; - } - public java.lang.String getResourceInfo() { - return this.resourceInfo; + public java.lang.String getProdInfo() { + return this.prodInfo; } public java.lang.String quotaType; @@ -60,12 +52,44 @@ public java.lang.String getLicenseType() { return this.licenseType; } - public java.lang.String type; - public void setType(java.lang.String type) { - this.type = type; + public java.lang.String state; + public void setState(java.lang.String state) { + this.state = state; + } + public java.lang.String getState() { + return this.state; + } + + public java.sql.Timestamp issueTime; + public void setIssueTime(java.sql.Timestamp issueTime) { + this.issueTime = issueTime; + } + public java.sql.Timestamp getIssueTime() { + return this.issueTime; + } + + public java.sql.Timestamp expireTime; + public void setExpireTime(java.sql.Timestamp expireTime) { + this.expireTime = expireTime; + } + public java.sql.Timestamp getExpireTime() { + return this.expireTime; + } + + public java.lang.Long localUsed; + public void setLocalUsed(java.lang.Long localUsed) { + this.localUsed = localUsed; + } + public java.lang.Long getLocalUsed() { + return this.localUsed; + } + + public java.lang.Long otherUsed; + public void setOtherUsed(java.lang.Long otherUsed) { + this.otherUsed = otherUsed; } - public java.lang.String getType() { - return this.type; + public java.lang.Long getOtherUsed() { + return this.otherUsed; } public java.sql.Timestamp createDate;