Merge pull request #326 from ablecloud-team/ablestack-diplo

diplo merge

Author: Dajeong-Park

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

@@ -1254,6 +1254,7 @@ public class ApiConstants {
 
     public static final String SHAREABLE = "shareable";
     public static final String KVDO_ENABLE = "kvdoenable";
+    public static final String KVDO_IN_USE = "kvdoinuse";
     public static final String VBMC_PORT = "vbmcport";
     public static final String IS_TAG_A_RULE = "istagarule";
     public static final String LINK_STATE = "linkstate";

api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java

@@ -110,6 +110,11 @@ public class ListServiceOfferingsCmd extends BaseListProjectAndAccountResourcesC
             since = "4.20.0")
     private Long templateId;
 
+    @Parameter(name = ApiConstants.KVDO_ENABLE, type = CommandType.BOOLEAN,
+    required=false, description = "Whether to KVDO compression and deduplication the volume",
+    since = "4.20")
+    private Boolean kvdoEnable;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -171,6 +176,10 @@ public Long getTemplateId() {
         return templateId;
     }
 
+    public Boolean getKvdoEnable() {
+        return kvdoEnable;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java

@@ -95,7 +95,7 @@ public class GetUploadParamsForTemplateCmd extends AbstractGetUploadParamsCmd {
     private String templateTag;
 
     @Parameter(name = ApiConstants.KVDO_ENABLE, type = CommandType.BOOLEAN, description = "Whether to KVDO compression and deduplication the volume", since = "4.20")
-    private Boolean kvodEnable;
+    private Boolean kvdoEnable;
 
     @Parameter(name=ApiConstants.DEPLOY_AS_IS,
             type = CommandType.BOOLEAN,
@@ -167,7 +167,7 @@ public String getTemplateTag() {
     }
 
     public Boolean isKvdoEnable() {
-        return kvodEnable;
+        return kvdoEnable;
     }
 
     public boolean isDeployAsIs() {

api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java

@@ -111,6 +111,11 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd implements User
             since = "4.20")
     private String arch;
 
+    @Parameter(name = ApiConstants.KVDO_ENABLE, type = CommandType.BOOLEAN,
+            required=false, description = "Whether to KVDO compression and deduplication the volume",
+            since = "4.20")
+    private Boolean kvdoEnable;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -183,6 +188,10 @@ public boolean listInReadyState() {
         return onlyReady;
     }
 
+    public Boolean getKvdoEnable() {
+        return kvdoEnable;
+    }
+
     @Parameter(name = ApiConstants.SHOW_RESOURCE_ICON, type = CommandType.BOOLEAN, description = "flag to display the resource image for the templates")
     private Boolean showIcon;
 

api/src/main/java/org/apache/cloudstack/api/command/user/vm/CloneVMCmd.java

@@ -73,7 +73,7 @@ public class CloneVMCmd extends BaseAsyncCreateCmd implements UserCmd {
     @Parameter(name = ApiConstants.START_VM, type = CommandType.BOOLEAN, required = true, description = "true if start vm after creating; defaulted to false if not specified")
     private Boolean startVm;
 
-    @Parameter(name = ApiConstants.CLONE_TYPE, type = CommandType.STRING, description = "select fast(linked) clone type or full clone type(default is fast clone)")
+    @Parameter(name = ApiConstants.CLONE_TYPE, type = CommandType.STRING, description = "select fast(linked) clone type or full clone type(default is full clone)")
     private String type;
 
     @Parameter(name=ApiConstants.COUNT, type=CommandType.INTEGER, description="count of clone vm")

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

@@ -412,6 +412,10 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
     @Param(description = "Whether to KVDO compression and deduplication the volume", since = "4.20")
     private Boolean kvdoEnable;
 
+    @SerializedName(ApiConstants.KVDO_IN_USE)
+    @Param(description = "Whether the virtual machine uses a compressed/deduplicated volume", since = "4.20")
+    private Boolean kvdoInUse;
+
     @SerializedName((ApiConstants.VM_TYPE))
     @Param(description = "User VM type", since = "4.20.0")
     private String vmType;
@@ -1206,6 +1210,7 @@ public String getQemuAgentVersion() {
     public void setQemuAgentVersion(String qemuAgentVersion) {
         this.qemuAgentVersion = qemuAgentVersion;
     }
+
     public boolean getKvdoEnable() {
         return kvdoEnable;
     }
@@ -1214,6 +1219,14 @@ public void setKvdoEnable(boolean kvdoEnable) {
         this.kvdoEnable = kvdoEnable;
     }
 
+    public boolean getKvdoInUse() {
+        return kvdoInUse;
+    }
+
+    public void setKvdoInUse(boolean kvdoInUse) {
+        this.kvdoInUse = kvdoInUse;
+    }
+
     public void setVmType(String vmType) {
         this.vmType = vmType;
     }

engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql

@@ -50,12 +50,12 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Storage', 'DEFAULT', 'UserVm
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Storage', 'DEFAULT', 'StorageManager', 'create.volume.from.snapshot.wait', '10800', 'In second, timeout for create template from snapshot');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Storage', 'DEFAULT', 'TemplateManager', 'primary.storage.download.wait', '10800', 'In second, timeout for download template to primary storage');
 
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT', 'management-server', 'usage.execution.timezone', null, 'The timezone to use for usage job execution time');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT', 'management-server', 'usage.execution.timezone', 'Asia/Seoul', 'The timezone to use for usage job execution time');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT', 'management-server', 'usage.stats.job.aggregation.range', '1440', 'The range of time for aggregating the user statistics specified in minutes (e.g. 1440 for daily, 60 for hourly.');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT', 'management-server', 'usage.stats.job.exec.time', '00:15', 'The time at which the usage statistics aggregation job will run as an HH24:MM time, e.g. 00:30 to run at 12:30am.');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT', 'management-server', 'enable.usage.server', 'true', 'Flag for enabling usage');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT', 'management-server', 'direct.network.stats.interval', '86400', 'Interval (in seconds) to collect stats from Traffic Monitor');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT', 'management-server', 'usage.aggregation.timezone', 'GMT', 'The timezone to use for usage stats aggregation');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT', 'management-server', 'usage.aggregation.timezone', 'Asia/Seoul', 'The timezone to use for usage stats aggregation');
 
 
 INSERT IGNORE INTO `cloud`.`guest_os` (category_id, name, display_name) VALUES (6, NULL, "Windows PV");

framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaConfig.java

@@ -27,7 +27,7 @@ public interface QuotaConfig {
     public static final ConfigKey<String> QuotaEnableEnforcement = new ConfigKey<String>("Advanced", String.class, "quota.enable.enforcement", "false",
             "Enable the usage quota enforcement, i.e. on true when exceeding quota the respective account will be locked.", true);
 
-    public static final ConfigKey<String> QuotaCurrencySymbol = new ConfigKey<String>("Advanced", String.class, "quota.currency.symbol", "$",
+    public static final ConfigKey<String> QuotaCurrencySymbol = new ConfigKey<String>("Advanced", String.class, "quota.currency.symbol", "₩",
             "The symbol for the currency in use to measure usage.", true);
 
     public static final ConfigKey<String> QuotaCurrencyLocale = new ConfigKey<String>("Advanced", String.class, "quota.currency.locale", null,

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -5672,10 +5672,6 @@ public String mapRbdDevice(final KVMPhysicalDisk disk, boolean kvdoEnable){
             Script.runSimpleBashScript("rbd map " + disk.getPath() + " --id " + pool.getAuthUserName());
             device = Script.runSimpleBashScript("rbd showmapped | grep \""+splitPoolImage[0]+"[ ]*"+splitPoolImage[1]+"\" | grep -o \"[^ ]*[ ]*$\"");
         }
-
-        // kvdo가 활성화 되어있음
-        device = Script.runSimpleBashScript("rbd showmapped | grep \""+splitPoolImage[0]+"[ ]*"+splitPoolImage[1]+"\" | grep -o \"[^ ]*[ ]*$\"");
-
         if(kvdoEnable){
             try {
                 createKvdoCmdLine(splitPoolImage[0], pool.getAuthUserName(), splitPoolImage[1], String.valueOf(disk.getSize()));

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

@@ -185,7 +185,7 @@
 public class KubernetesClusterManagerImpl extends ManagerBase implements KubernetesClusterService {
 
     private static final String DEFAULT_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_NAME = "쿠버네테스 서비스에 대한 기본 네트워크오퍼링";
-    private static final String DEFAULT_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_DISPLAY_TEXT = "Network Offering used for CloudStack Kubernetes service";
+    private static final String DEFAULT_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_DISPLAY_TEXT = "쿠버네테스 서비스에 대한 기본 네트워크오퍼링";
     private static final String DEFAULT_NSX_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_NAME = "DefaultNSXNetworkOfferingforKubernetesService";
     private static final String DEFAULT_NSX_VPC_TIER_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_NAME = "DefaultNSXVPCNetworkOfferingforKubernetesService";
     private static final String DEFAULT_NSX_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_DISPLAY_TEXT = "Network Offering for NSX CloudStack Kubernetes Service";