Merge pull request #597 from jschoiRR/mold-main#2025

[Mold API] zone 추가 마법사 > 기본스토리지 > 제공자/프로토콜 변경 시 값 세팅되도록 수정(ablestack 선택시 => glueblock, glueblock, gluefilesystem 선택시 => ablestack)

Author: jschoiRR

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,

server/src/main/java/com/cloud/configuration/Config.java

@@ -1225,7 +1225,7 @@ public enum Config {
             null),
 
     // Usage
-    UsageExecutionTimezone("Usage", ManagementServer.class, String.class, "usage.execution.timezone", null, "The timezone to use for usage job execution time", null),
+    UsageExecutionTimezone("Usage", ManagementServer.class, String.class, "usage.execution.timezone", "Asia/Seoul", "The timezone to use for usage job execution time", null),
     UsageStatsJobAggregationRange(
             "Usage",
             ManagementServer.class,
@@ -1259,7 +1259,7 @@ public enum Config {
             null,
             "Interval (in days) to check sanity of usage data. To disable set it to 0 or negative.",
             null),
-    UsageAggregationTimezone("Usage", ManagementServer.class, String.class, "usage.aggregation.timezone", "GMT", "The timezone to use for usage stats aggregation", null),
+    UsageAggregationTimezone("Usage", ManagementServer.class, String.class, "usage.aggregation.timezone", "Asia/Seoul", "The timezone to use for usage stats aggregation", null),
     TrafficSentinelIncludeZones(
             "Usage",
             ManagementServer.class,

ui/public/locales/ko_KR.json

@@ -4530,16 +4530,16 @@
 "iso.direct.download.failure": "ISO.\uc9c1\uc811.\ub2e4\uc6b4\ub85c\ub4dc.\uc2e4\ud328",
 "system.vm.diagnostics": "\uc2dc\uc2a4\ud15c.VM.\uc9c4\ub2e8",
 "system.rolling.maintenance": "\uc2dc\uc2a4\ud15c.\ub864\ub9c1.\uc720\uc9c0\ubcf4\uc218",
-"sharedfs.create": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc0dd\uc131",
-"sharedfs.start": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc7ac\uc2dc\uc791",
-"sharedfs.update": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc5c5\ub370\uc774\ud2b8",
-"sharedfs.change.service.offering": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc11c\ube44\uc2a4.\uc624\ud37c\ub9c1.\ubcc0\uacbd",
-"sharedfs.change.disk.offering": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\ub514\uc2a4\ud06c.\uc624\ud37c\ub9c1.\ubcc0\uacbd",
-"sharedfs.stop": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc815\uc9c0",
-"sharedfs.restart": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc2dc\uc791",
-"sharedfs.destroy": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\ud30c\uae30",
-"sharedfs.expunge": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\uc0ad\uc81c",
-"sharedfs.recover": "\uacf5\uc720.\ud30c\uc77c.\uc2dc\uc2a4\ud15c.\ubcf5\uad6c",
+"sharedfs.create": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\uc0dd\uc131",
+"sharedfs.start": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\uc7ac\uc2dc\uc791",
+"sharedfs.update": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\uc5c5\ub370\uc774\ud2b8",
+"sharedfs.change.service.offering": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\uc11c\ube44\uc2a4\uc624\ud37c\ub9c1.\ubcc0\uacbd",
+"sharedfs.change.disk.offering": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\ub514\uc2a4\ud06c\uc624\ud37c\ub9c1.\ubcc0\uacbd",
+"sharedfs.stop": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\uc815\uc9c0",
+"sharedfs.restart": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\uc2dc\uc791",
+"sharedfs.destroy": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\ud30c\uae30",
+"sharedfs.expunge": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\uc0ad\uc81c",
+"sharedfs.recover": "\uacf5\uc720\ud30c\uc77c\uc2dc\uc2a4\ud15c.\ubcf5\uad6c",
 "host.rolling.maintenance": "\ud638\uc2a4\ud2b8.\ub864\ub9c1.\uc720\uc9c0\ubcf4\uc218",
 "cluster.rolling.maintenance": "\ud074\ub7ec\uc2a4\ud130.\ub864\ub9c1.\uc720\uc9c0\ubcf4\uc218",
 "pod.rolling.maintenance": "POD.\ub864\ub9c1.\uc720\uc9c0\ubcf4\uc218",

ui/src/views/infra/AddPrimaryStorage.vue

@@ -544,7 +544,16 @@ export default {
         primeraPassword: [{ required: true, message: this.$t('label.password') }],
         flashArrayURL: [{ required: true, message: this.$t('label.url') }],
         flashArrayUsername: [{ required: true, message: this.$t('label.username') }],
-        flashArrayPassword: [{ required: true, message: this.$t('label.password') }]
+        kradosmonitor: [{ required: true, message: this.$t('label.required') }],
+        kradospool: [{ required: true, message: this.$t('label.required') }],
+        kradosuser: [{ required: true, message: this.$t('label.required') }],
+        kradossecret: [{ required: true, message: this.$t('label.required') }],
+        kradospath: [{ required: true, message: this.$t('label.required') }],
+        gluefsserver: [{ required: true, message: this.$t('label.required') }],
+        gluefsuser: [{ required: true, message: this.$t('label.required') }],
+        gluefsname: [{ required: true, message: this.$t('label.required') }],
+        gluefssecret: [{ required: true, message: this.$t('label.required') }],
+        gluefstargetpath: [{ required: true, message: this.$t('label.required') }]
       })
     },
     fetchData () {

ui/src/views/infra/zone/StaticInputsForm.vue

@@ -172,6 +172,14 @@ export default {
     'prefillContent.provider' (val) {
       if (['SolidFire', 'PowerFlex'].includes(val)) {
         this.form.primaryStorageProtocol = 'custom'
+      } else if (['ABLESTACK'].includes(val)) {
+        this.form.primaryStorageProtocol = 'Glue Block'
+      }
+    },
+    'prefillContent.primaryStorageProtocol' (val) {
+      console.log('protocol :>>>>> ', val)
+      if (['Glue Block', 'Glue FileSystem'].includes(val)) {
+        this.form.provider = 'ABLESTACK'
       }
     }
   },

ui/src/views/infra/zone/ZoneWizardAddResources.vue

@@ -1069,7 +1069,7 @@ export default {
       this.primaryStorageScopes = scope
     },
     fetchProtocol () {
-      const hypervisor = this.prefillContent?.hypervisor || null
+      const hypervisor = this.prefillContent?.hypervisor || 'KVM'
       const protocols = []
       if (hypervisor === 'KVM') {
         protocols.push({