Merge pull request #623 from jeongda-young/license-name

라이센스 컬럼명 변경

Author: jschoiRR

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

@@ -46,17 +46,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import javax.annotation.PostConstruct;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
-// import javax.net.ssl.X509TrustManager;
-import javax.naming.ConfigurationException;
-import com.cloud.utils.security.CertificateHelper;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
@@ -844,6 +840,7 @@
 import com.cloud.utils.net.MacAddress;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.utils.nio.TrustAllManager;
+import com.cloud.utils.security.CertificateHelper;
 import com.cloud.utils.ssh.SSHKeysHelper;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.DiskProfile;
@@ -870,6 +867,7 @@
 import com.cloud.vm.dao.VMInstanceDao;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.JsonNode;
+import javax.naming.ConfigurationException;
 
 
 public class ManagementServerImpl extends ManagerBase implements ManagementServer, Configurable {
@@ -1257,7 +1255,7 @@ private void checkLicenseAndControlAgent(HostVO host) {
 
             // 라이센스 상태 확인
             JsonNode licenseStatus = getLicenseStatus(licenseApiUrl, ipAddress);
-            boolean isExpired = licenseStatus.get("expired").asBoolean();
+            boolean isExpired = licenseStatus.get("expiry_date").asBoolean();
 
             // 라이센스 상태에 따라 에이전트 제어
             if (isExpired) {
@@ -5940,8 +5938,8 @@ public LicenseCheckerResponse checkLicense(LicenseCheckCmd cmd) {
                         response.setSuccess(false);
                         response.setExpiryDate(null);
                     } else {
-                        boolean isExpired = jsonNode.get("expired").asBoolean();
-                        String expiryDateStr = jsonNode.get("expiry_date").asText();
+                        boolean isExpired = jsonNode.get("expiry_date").asBoolean();
+                        String expiryDateStr = jsonNode.get("expired").asText();
 
                         response.setSuccess(!isExpired);
                         response.setHasLicense(true);