Merge branch 'ablecloud-team:ablestack-diplo' into mold-main#2025

jschoiRR · web-flow · commit 4bfa0e1b7221 · 2025-04-02T11:57:03.000+09:00
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -1306,7 +1306,7 @@ public class ApiConstants {
     public static final String EXPIRY_DATE = "expirydate";
     public static final String LICENSE_CHECK = "licensecheck";
     public static final String HAS_LICENSE = "haslicense";
-
+    public static final String ISSUED_DATE = "issueddate";
     /**
      * This enum specifies IO Drivers, each option controls specific policies on I/O.
      * Qemu guests support "threads" and "native" options Since 0.8.8 ; "io_uring" is supported Since 6.3.0 (QEMU 5.0).
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/LicenseCheckCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/LicenseCheckCmd.java
@@ -55,6 +55,11 @@ public class LicenseCheckCmd extends BaseCmd {
               description = "license expiry date")
     private Date expiryDate;
 
+    @Parameter(name = ApiConstants.ISSUED_DATE,
+                type = CommandType.DATE,
+                description = "license issued date")
+    private Date issuedDate;
+
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -68,6 +73,10 @@ public Date getExpiryDate() {
         return expiryDate;
     }
 
+    public Date getIssuedDate() {
+        return issuedDate;
+    }
+
 
     public void setHostId(Long hostId) {
         this.hostId = hostId;
@@ -76,6 +85,10 @@ public void setExpiryDate(Date expiryDate) {
         this.expiryDate = expiryDate;
     }
 
+    public void setIssuedDate(Date issuedDate) {
+        this.issuedDate = issuedDate;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/LicenseCheckerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LicenseCheckerResponse.java
@@ -33,6 +33,10 @@ public class LicenseCheckerResponse extends BaseResponse {
     @Param(description = "license expiry date")
     private Date expiryDate;
 
+    @SerializedName(ApiConstants.ISSUED_DATE)
+    @Param(description = "license issued date")
+    private Date issuedDate;
+
     @SerializedName(ApiConstants.SUCCESS)
     @Param(description = "license success")
     private String success;
@@ -49,6 +53,10 @@ public Date getExpiryDate() {
         return expiryDate;
     }
 
+    public Date getIssuedDate() {
+        return issuedDate;
+    }
+
     public String getSuccess() {
         return success;
     }
@@ -65,6 +73,10 @@ public void setExpiryDate(Date expiryDate) {
         this.expiryDate = expiryDate;
     }
 
+    public void setIssuedDate(Date issuedDate) {
+        this.issuedDate = issuedDate;
+    }
+
     public void setSuccess(boolean isValid) {
         this.success = Boolean.toString(isValid);
     }
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -1256,36 +1256,58 @@ private void checkLicenseAndControlAgent(HostVO host) {
             // 라이센스 상태 확인
             JsonNode licenseStatus = getLicenseStatus(licenseApiUrl, ipAddress);
             boolean isExpired = licenseStatus.get("expiry_date").asBoolean();
+            boolean isIssued = licenseStatus.get("issued_date").asBoolean();
+            String expiryDateStr = licenseStatus.get("expired").asText();
+            String issuedDateStr = licenseStatus.get("issued").asText();
 
-            // 라이센스 상태에 따라 에이전트 제어
-            if (isExpired) {
-                // 만료된 경우 에이전트 중지
-                controlHostAgent(host, "stop");
-                logger.info("License expired - stopping agent for host: " + host.getId());
+            logger.info("License check - isIssued: " + isIssued + ", isExpired: " + isExpired);
+            logger.info("License dates - issued: " + issuedDateStr + ", expired: " + expiryDateStr);
 
-                // HA 비활성화 처리
-                handleExpiredLicense(host);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date currentDate = new Date();
+            Date issuedDate = null;
+            Date expiryDate = null;
+
+            if (issuedDateStr != null && !issuedDateStr.isEmpty()) {
+                issuedDate = sdf.parse(issuedDateStr);
+            }
+
+            if (expiryDateStr != null && !expiryDateStr.isEmpty()) {
+                expiryDate = sdf.parse(expiryDateStr);
+            }
+
+            // 라이선스 유효성 검사: 발급되지 않았거나 만료되었으면 false
+            boolean isValid = !isExpired && isIssued;
+
+            // 라이선스 상태에 따라 에이전트 제어
+            if (isValid) {
+                // 유효한 경우 에이전트 시작
+                controlHostAgent(host, "start");
+                logger.info("License valid - starting agent for host: " + host.getId());
 
                 // 알림 전송
                 _alertMgr.sendAlert(
                     AlertManager.AlertType.ALERT_TYPE_HOST,
                     host.getDataCenterId(),
                     host.getId(),
-                    "License expired for host " + host.getName(),
-                    "The license has expired. Agent has been stopped for host " + host.getName()
+                    "License valid for host " + host.getName(),
+                    "The license is valid. Agent has been started for host " + host.getName()
                 );
             } else {
-                // 유효한 경우 에이전트 시작
-                controlHostAgent(host, "start");
-                logger.info("License valid - starting agent for host: " + host.getId());
+                // 만료된 경우 에이전트 중지
+                controlHostAgent(host, "stop");
+                logger.info("License expired or not yet valid - stopping agent for host: " + host.getId());
+
+                // HA 비활성화 처리
+                handleExpiredLicense(host);
 
                 // 알림 전송
                 _alertMgr.sendAlert(
                     AlertManager.AlertType.ALERT_TYPE_HOST,
                     host.getDataCenterId(),
                     host.getId(),
-                    "License valid for host " + host.getName(),
-                    "The license is valid. Agent has been started for host " + host.getName()
+                    "License expired or not yet valid for host " + host.getName(),
+                    "The license has expired or is not yet valid. Agent has been stopped for host " + host.getName()
                 );
             }
         } catch (Exception e) {
@@ -5939,15 +5961,30 @@ public LicenseCheckerResponse checkLicense(LicenseCheckCmd cmd) {
                         response.setExpiryDate(null);
                     } else {
                         boolean isExpired = jsonNode.get("expiry_date").asBoolean();
+                        boolean isIssued = jsonNode.get("issued_date").asBoolean();
                         String expiryDateStr = jsonNode.get("expired").asText();
+                        String issuedDateStr = jsonNode.get("issued").asText();
+
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date currentDate = new Date();
+                        Date issuedDate = null;
+                        Date expiryDate = null;
+
+                        if (issuedDateStr != null && !issuedDateStr.isEmpty()) {
+                            issuedDate = sdf.parse(issuedDateStr);
+                            response.setIssuedDate(issuedDate);
+                        }
 
-                        response.setSuccess(!isExpired);
-                        response.setHasLicense(true);
                         if (expiryDateStr != null && !expiryDateStr.isEmpty()) {
-                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                            Date expiryDate = sdf.parse(expiryDateStr);
+                            expiryDate = sdf.parse(expiryDateStr);
                             response.setExpiryDate(expiryDate);
                         }
+
+                        // 라이선스 유효성 검사: 발급되지 않았거나 만료되었으면 false
+                        boolean isValid = !isExpired && isIssued;
+
+                        response.setSuccess(isValid);
+                        response.setHasLicense(true);
                     }
                 } else {
                     response.setHasLicense(false);
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
@@ -4751,7 +4751,7 @@
 "message.dr.mirrored.cluster.disable": "If you disable the selected disaster recovery cluster, all mirroring virtual machines in the secondary cluster will be deleted. If you wish to disable, please enter the phrase 'I would like to disable it'.",
 "message.success.disable.disaster.recovery.cluster": "Successfully disabled disaster recovery cluster",
 "message.error.confirm.create.dr.mirroring.vm": "Mirroring virtual machines cannot be created if compression deduplication is enabled.",
-"message.alert.licenseexpired": "License Expired Date",
+"message.alert.licenseexpired": "License Effective Date",
 "message.license.renewal.required": "It's past work. Please renew.",
 "message.license.not.found": "License file not found. Please register.",
 "message.license.days.left": "Expires in a few days."
diff --git a/ui/public/locales/ko_KR.json b/ui/public/locales/ko_KR.json
@@ -4751,7 +4751,7 @@
 "message.dr.mirrored.cluster.disable": "\uc120\ud0dd\ud55c \uc7ac\ud574\ubcf5\uad6c \ud074\ub7ec\uc2a4\ud130\ub97c \ube44\ud65c\uc131\ud654\ud558\ub294 \uacbd\uc6b0 Secondary \ud074\ub7ec\uc2a4\ud130\uc758 \ubbf8\ub7ec\ub9c1 \uac00\uc0c1\uba38\uc2e0\uc774 \uc804\ubd80 \uc0ad\uc81c\ub429\ub2c8\ub2e4. \ube44\ud65c\uc131\ud654\ub97c \uc6d0\ud558\uc2dc\uba74 '\ube44\ud65c\uc131\ud654\ud558\uaca0\uc2b5\ub2c8\ub2e4' \ubb38\uad6c\ub97c \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
 "message.success.disable.disaster.recovery.cluster": "\uc7ac\ud574\ubcf5\uad6c \ud074\ub7ec\uc2a4\ud130\ub97c \uc131\uacf5\uc801\uc73c\ub85c \ube44\ud65c\uc131\ud654\ud588\uc2b5\ub2c8\ub2e4.",
 "message.error.confirm.create.dr.mirroring.vm": "\uc555\ucd95/\uc911\ubcf5\uc81c\uac70 \uae30\ub2a5\uc774 \ud65c\uc131\ud654\ub418\uc5b4\uc788\ub294 \uacbd\uc6b0 \ubbf8\ub7ec\ub9c1 \uac00\uc0c1\uba38\uc2e0\uc744 \uc0dd\uc131\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
-"message.alert.licenseexpired": "\ub77c\uc774\uc13c\uc2a4 \ub9cc\ub8cc \uc77c\uc790",
+"message.alert.licenseexpired": "\ub77c\uc774\uc13c\uc2a4 \uc720\ud6a8 \uc77c\uc790",
 "message.license.renewal.required": "\ub77c\uc774\uc13c\uc2a4 \uc720\ud6a8\uae30\uac04\uc774 \uc9c0\ub0ac\uc2b5\ub2c8\ub2e4. \uc2e0\uaddc \ub77c\uc774\uc120\uc2a4\ub97c \ub4f1\ub85d \ud6c4 \uc0ac\uc6a9\ud574 \uc8fc\uc138\uc694.",
 "message.license.not.found": "\ub77c\uc774\uc120\uc2a4 \uc815\ubcf4\ub97c \ud655\uc778\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc2e0\uaddc \ub77c\uc774\uc120\uc2a4 \ub4f1\ub85d \ud6c4 \uc0ac\uc6a9\ud574 \uc8fc\uc138\uc694.",
 "message.license.days.left": "\uc77c \ud6c4 \ub9cc\ub8cc"
diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue
@@ -25,8 +25,9 @@
   </a-alert>
   <div v-if="['host'].includes($route.meta.name)">
     <a-alert type="error" :showIcon="true" v-if="!dataResource.licenseExpiryDate" :message="$t('message.license.not.found')" />
-    <a-alert type="error" :showIcon="true" v-else-if="isLicenseExpired(dataResource.licenseExpiryDate)" :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseExpiryDate + '(' + $t('message.license.renewal.required') + ')'" />
-    <a-alert type="success" :showIcon="true" v-else :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseExpiryDate + '(' + calculateDday(dataResource.licenseExpiryDate) + $t('message.license.days.left') + ')'" />
+    <a-alert type="error" :showIcon="true" v-else-if="isLicenseNotStarted(dataResource.licenseStartDate)" :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + ' ~ ' + dataResource.licenseExpiryDate+ '(' + calculateDday(dataResource.licenseExpiryDate) + $t('message.license.days.left') + ')'" />
+    <a-alert type="error" :showIcon="true" v-else-if="isLicenseExpired(dataResource.licenseExpiryDate)" :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + ' ~ ' + dataResource.licenseExpiryDate + '(' + $t('message.license.renewal.required') + ')'" />
+    <a-alert type="success" :showIcon="true" v-else :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + ' ~ ' + dataResource.licenseExpiryDate + '(' + calculateDday(dataResource.licenseExpiryDate) + $t('message.license.days.left') + ')'" />
   </div>
   <a-alert v-if="ip4routes" type="info" :showIcon="true" :message="$t('label.add.upstream.ipv4.routes')">
     <template #description>
@@ -474,8 +475,10 @@ export default {
     fetchLicenseInfo () {
       api('licenseCheck', { hostid: this.resource.id }).then(response => {
         const licenseData = response?.null?.licensecheck
-        if (licenseData.expirydate) {
+        if (licenseData) {
           var expiryDate = new Date(licenseData.expirydate)
+          var issuedDate = new Date(licenseData.issueddate)
+          this.dataResource.licenseStartDate = issuedDate.getFullYear() + '-' + this.leftPad(issuedDate.getMonth() + 1) + '-' + this.leftPad(issuedDate.getDate())
           this.dataResource.licenseExpiryDate = expiryDate.getFullYear() + '-' + this.leftPad(expiryDate.getMonth() + 1) + '-' + this.leftPad(expiryDate.getDate())
           this.dataResource.hostId = licenseData.hostid
           this.dataResource.hasLicense = licenseData.haslicense === 'true'
@@ -486,6 +489,7 @@ export default {
             this.licenseStateType = 'success'
           }
         } else {
+          this.dataResource.licenseStartDate = ''
           this.dataResource.licenseExpiryDate = ''
           this.dataResource.hasLicense = false
           this.dataResource.licenseValid = false
@@ -510,6 +514,11 @@ export default {
         return value
       }
       return `0${value}`
+    },
+    isLicenseNotStarted (startDate) {
+      const today = new Date()
+      const start = new Date(startDate)
+      return today < start
     }
   }
 }
