Merge pull request #621 from jeongda-young/License_UI

라이센스 UI에서 glue-api 호출 부분 수정

Author: jschoiRR

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -1305,6 +1305,7 @@ public class ApiConstants {
     public static final String DISASTER_RECOVERY_CLUSTER_VM_LIST = "disasterrecoveryclustervmlist";
     public static final String EXPIRY_DATE = "expirydate";
     public static final String LICENSE_CHECK = "licensecheck";
+    public static final String HAS_LICENSE = "haslicense";
 
     /**
      * This enum specifies IO Drivers, each option controls specific policies on I/O.

api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/LicenseCheckCmd.java

@@ -93,7 +93,6 @@ public long getEntityOwnerId() {
     @Override
     public void execute() throws ResourceUnavailableException, ServerApiException {
         try {
-            logger.info("라이센스 체크1");
             LicenseCheckerResponse response = _mgr.checkLicense(this);
 
             setResponseObject(response);

api/src/main/java/org/apache/cloudstack/api/response/LicenseCheckerResponse.java

@@ -37,6 +37,10 @@ public class LicenseCheckerResponse extends BaseResponse {
     @Param(description = "license success")
     private String success;
 
+    @SerializedName(ApiConstants.HAS_LICENSE)
+    @Param(description = "whether host has a valid license")
+    private String hasLicense;
+
     public Long getHostId() {
         return HostId;
     }
@@ -49,6 +53,10 @@ public String getSuccess() {
         return success;
     }
 
+    public String getHasLicense() {
+        return hasLicense;
+    }
+
     public void setHostId(long hostId) {
         this.HostId = Long.valueOf(hostId);
     }
@@ -60,4 +68,8 @@ public void setExpiryDate(Date expiryDate) {
     public void setSuccess(boolean isValid) {
         this.success = Boolean.toString(isValid);
     }
+
+    public void setHasLicense(boolean hasLicense) {
+        this.hasLicense = Boolean.toString(hasLicense);
+    }
 }

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -22,10 +22,10 @@
 import java.io.InputStreamReader;
 import java.lang.reflect.Field;
 import java.net.SocketTimeoutException;
-// import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -5883,7 +5883,6 @@ public void setLockControllerListener(final LockControllerListener lockControlle
 
     @Override
     public LicenseCheckerResponse checkLicense(LicenseCheckCmd cmd) {
-        logger.info("License check started");
         Long hostId = cmd.getHostId();
         if (hostId == null) {
             throw new InvalidParameterValueException("Host ID is required");
@@ -5894,22 +5893,112 @@ public LicenseCheckerResponse checkLicense(LicenseCheckCmd cmd) {
             throw new InvalidParameterValueException("Host not found: " + hostId);
         }
 
-        return checkLicensesForHosts(List.of(host)).getResponses().get(0);
-    }
-    private List<HostVO> getHostsToCheck(Long hostId) {
-        if (hostId != null) {
-            SearchBuilder<HostVO> sb = _hostDao.createSearchBuilder();
-            sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
-            SearchCriteria<HostVO> sc = sb.create();
-            sc.setParameters("id", hostId);
-            return _hostDao.search(sc, new Filter(HostVO.class, "id", true));
+        LicenseCheckerResponse response = new LicenseCheckerResponse();
+        response.setHostId(hostId);
+        response.setObjectName("licensecheck");
+
+        try {
+            String ipAddress = host.getPrivateIpAddress();
+            String licenseApiUrl = "https://" + ipAddress + ":8080/api/v1/license/isLicenseExpired";
+
+            HttpsURLConnection connection = null;
+            try {
+                // SSL 설정
+                final SSLContext sslContext = SSLUtils.getSSLContext();
+                sslContext.init(null, new TrustManager[]{new TrustAllManager()}, new SecureRandom());
+
+                URL url = new URL(licenseApiUrl);
+                connection = (HttpsURLConnection) url.openConnection();
+                connection.setSSLSocketFactory(sslContext.getSocketFactory());
+                connection.setHostnameVerifier((hostname, session) -> hostname.equals(ipAddress));
+                connection.setDoOutput(true);
+                connection.setRequestMethod("GET");
+                connection.setConnectTimeout(10000);
+                connection.setReadTimeout(180000);
+                connection.setRequestProperty("Accept", "application/json");
+                connection.setRequestProperty("Content-Type", "application/json");
+
+                int responseCode = connection.getResponseCode();
+
+                if (responseCode == 200) {
+                    BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                    StringBuilder responseData = new StringBuilder();
+                    String line;
+                    while ((line = in.readLine()) != null) {
+                        responseData.append(line);
+                    }
+                    in.close();
+
+                    // JSON 응답 파싱
+                    ObjectMapper mapper = new ObjectMapper();
+                    JsonNode jsonNode = mapper.readTree(responseData.toString());
+
+                    // 라이선스 정보 설정
+                    if (jsonNode.has("error")) {
+                        String errorMessage = jsonNode.get("error").asText();
+                        response.setHasLicense(false);
+                        response.setSuccess(false);
+                        response.setExpiryDate(null);
+                    } else {
+                        boolean isExpired = jsonNode.get("expired").asBoolean();
+                        String expiryDateStr = jsonNode.get("expiry_date").asText();
+
+                        response.setSuccess(!isExpired);
+                        response.setHasLicense(true);
+                        if (expiryDateStr != null && !expiryDateStr.isEmpty()) {
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                            Date expiryDate = sdf.parse(expiryDateStr);
+                            response.setExpiryDate(expiryDate);
+                        }
+                    }
+                } else {
+                    response.setHasLicense(false);
+                    response.setSuccess(false);
+                    response.setExpiryDate(null);
+                }
+            } finally {
+                if (connection != null) {
+                    connection.disconnect();
+                }
+            }
+            return response;
+        } catch (Exception e) {
+            throw new CloudRuntimeException("라이선스 체크 실패: " + e.getMessage());
         }
-        return _hostDao.listAll();
     }
-    public ListResponse<LicenseCheckerResponse> listLicenseChecks(final LicenseCheckCmd cmd) {
-        final Long hostId = cmd.getHostId();
-        List<HostVO> hosts = getHostsToCheck(hostId);
-        return checkLicensesForHosts(hosts);
+
+    private Date getLicenseExpiryDate(String apiUrl, String ipAddress) throws Exception {
+        HttpsURLConnection connection = null;
+        try {
+            final SSLContext sslContext = SSLUtils.getSSLContext();
+            sslContext.init(null, new TrustManager[]{new TrustAllManager()}, new SecureRandom());
+
+            URL url = new URL(apiUrl);
+            connection = (HttpsURLConnection) url.openConnection();
+            connection.setSSLSocketFactory(sslContext.getSocketFactory());
+            connection.setHostnameVerifier((hostname, session) -> hostname.equals(ipAddress));
+            connection.setDoOutput(true);
+            connection.setRequestMethod("GET");
+            connection.setConnectTimeout(10000);
+            connection.setReadTimeout(180000);
+            connection.setRequestProperty("Accept", "application/json");
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+
+            if (connection.getResponseCode() == 200) {
+                try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                    String dateStr = in.readLine();
+                    if (dateStr != null && !dateStr.isEmpty()) {
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        return sdf.parse(dateStr);
+                    }
+                }
+            }
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+        return null;
     }
 
     private ListResponse<LicenseCheckerResponse> checkLicensesForHosts(List<HostVO> hosts) {

ui/src/components/view/DetailsTab.vue

@@ -193,13 +193,23 @@
     <DedicateData :resource="dataResource" v-if="dedicatedSectionActive" />
     <VmwareData :resource="dataResource" v-if="$route.meta.name === 'zone' && 'listVmwareDcs' in $store.getters.apis" />
   </a-list>
+  <div class="license-info">
+    <a-descriptions-item label="라이센스 만료일">
+      {{ dataResource.licenseExpiryDate || '정보 없음' }}
+    </a-descriptions-item>
+    <a-descriptions-item label="라이센스 상태">
+      {{ dataResource.hasLicense ? '있음' : '없음' }}
+      ({{ dataResource.licenseValid ? '유효함' : '만료됨' }})
+    </a-descriptions-item>
+  </div>
 </template>
 
 <script>
 import DedicateData from './DedicateData'
 import HostInfo from '@/views/infra/HostInfo'
 import VmwareData from './VmwareData'
 import { genericCompare } from '@/utils/sort'
+import { api } from '@/api'
 
 export default {
   name: 'DetailsTab',
@@ -478,21 +488,37 @@ export default {
       return `${this.$t('message.alert.licenseexpired')} ${this.resource.licenseExpiryDate} ${this.isLicenseExpired(this.resource.licenseExpiryDate) ? this.$t('message.license.renewal.required') : '(' + this.calculateDday(this.resource.licenseExpiryDate) + this.$t('message.license.days.left') + ')'}`
     },
     async fetchLicenseInfo () {
-      if (this.resource && this.resource.ipaddress) {
-        try {
-          const response = await fetch(`https://${this.resource.ipaddress}:8080/api/v1/license/isLicenseExpired`)
-          const data = await response.json()
-          if (data.error) {
-            this.dataResource.licenseExpiryDate = ''
+      if (!this.resource || !this.resource.id) {
+        return
+      }
+
+      const params = {
+        hostid: this.resource.id
+      }
+
+      api('licenseCheck', params).then(response => {
+        const licenseData = response?.null?.licensecheck
+
+        if (licenseData) {
+          if (licenseData.expirydate) {
+            const expiryDate = new Date(licenseData.expirydate)
+            this.dataResource.licenseExpiryDate = expiryDate.toLocaleDateString('ko-KR')
           } else {
-            this.dataResource.licenseExpiryDate = data.expiry_date
+            this.dataResource.licenseExpiryDate = '만료일 정보 없음'
           }
-        } catch (error) {
-          console.error('라이선스 정보를 가져오는데 실패했습니다:', error)
+
+          this.dataResource.hostId = licenseData.hostid
+          this.dataResource.hasLicense = licenseData.haslicense === 'true'
+          this.dataResource.licenseValid = licenseData.success === 'true'
         }
-      }
+      }).catch(error => {
+        console.error('라이선스 정보를 가져오는데 실패했습니다:', error)
+        this.dataResource.licenseExpiryDate = '조회 실패'
+        this.dataResource.hasLicense = false
+        this.dataResource.licenseValid = false
+        this.$notifyError(error)
+      })
     },
-
     isLicenseExpired (expiryDate) {
       const today = new Date()
       const expiry = new Date(expiryDate)