From 7f16a207e0a9410c6e7a5f79f8750a86df7b01fb Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Thu, 1 May 2025 07:57:59 +0200
Subject: [PATCH 1/3] cloudutils: use ip command instead of route in
 networkConfig.py (#10726)

---
 python/lib/cloudutils/networkConfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/lib/cloudutils/networkConfig.py b/python/lib/cloudutils/networkConfig.py
index 2d1f9936d39..ac51f92aa58 100644
--- a/python/lib/cloudutils/networkConfig.py
+++ b/python/lib/cloudutils/networkConfig.py
@@ -41,7 +41,7 @@ class networkConfig:
         return devs
     @staticmethod
     def getDefaultNetwork():
-        cmd = bash("route -n|awk \'/^0.0.0.0/ {print $2,$8}\'")
+        cmd = bash("ip route show default | awk \'{print $3,$5}\'")
         if not cmd.isSuccess():
             logging.debug("Failed to get default route")
             raise CloudRuntimeException("Failed to get default route")

From 0c4ed1e5b72e0c43f7f3e6aa07f53af61afe6b06 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Thu, 1 May 2025 12:32:30 +0530
Subject: [PATCH 2/3] UI: Allow editing VM name of a Running VM in an Advanced
 zone with security groups (#10714)

---
 ui/src/views/compute/EditVM.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/src/views/compute/EditVM.vue b/ui/src/views/compute/EditVM.vue
index 876bc7819b4..a0c22be8cdf 100644
--- a/ui/src/views/compute/EditVM.vue
+++ b/ui/src/views/compute/EditVM.vue
@@ -177,7 +177,6 @@ export default {
         ostypeid: this.resource.ostypeid,
         isdynamicallyscalable: this.resource.isdynamicallyscalable,
         group: this.resource.group,
-        securitygroupids: this.resource.securitygroup.map(x => x.id),
         userdata: '',
         haenable: this.resource.haenable
       })

From 4c072b5bf97d5f92f9f35f91f63e7290afccb1f7 Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Thu, 1 May 2025 09:17:37 +0200
Subject: [PATCH 3/3] UI: show checksum field when register or upload
 template/isos (#10725)

---
 ui/src/views/image/RegisterOrUploadIso.vue      | 9 +++++++++
 ui/src/views/image/RegisterOrUploadTemplate.vue | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ui/src/views/image/RegisterOrUploadIso.vue b/ui/src/views/image/RegisterOrUploadIso.vue
index f27676b8e7f..3f0f2df4688 100644
--- a/ui/src/views/image/RegisterOrUploadIso.vue
+++ b/ui/src/views/image/RegisterOrUploadIso.vue
@@ -88,6 +88,15 @@
           <a-switch v-model:checked="form.directdownload"/>
         </a-form-item>
 
+        <a-form-item ref="checksum" name="checksum">
+          <template #label>
+            <tooltip-label :title="$t('label.checksum')" :tooltip="apiParams.checksum.description"/>
+          </template>
+          <a-input
+            v-model:value="form.checksum"
+            :placeholder="apiParams.checksum.description" />
+        </a-form-item>
+
         <a-form-item ref="zoneid" name="zoneid">
           <template #label>
             <tooltip-label :title="$t('label.zoneid')" :tooltip="apiParams.zoneid.description"/>
diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue b/ui/src/views/image/RegisterOrUploadTemplate.vue
index 999a1b8d120..d61c9911eaa 100644
--- a/ui/src/views/image/RegisterOrUploadTemplate.vue
+++ b/ui/src/views/image/RegisterOrUploadTemplate.vue
@@ -214,8 +214,8 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="12" v-if="allowed && (hyperKVMShow || hyperCustomShow) && currentForm === 'Create'">
-          <a-col :md="24" :lg="12">
+        <a-row :gutter="12">
+          <a-col :md="24" :lg="12" v-if="(hyperKVMShow || hyperCustomShow) && currentForm === 'Create'">
             <a-form-item ref="directdownload" name="directdownload">
               <template #label>
                 <tooltip-label :title="$t('label.directdownload')" :tooltip="apiParams.directdownload.description"/>
@@ -223,7 +223,7 @@
               <a-switch v-model:checked="form.directdownload" @change="handleChangeDirect" />
             </a-form-item>
           </a-col>
-          <a-col :md="24" :lg="12" v-if="allowDirectDownload">
+          <a-col :md="24" :lg="12">
             <a-form-item ref="checksum" name="checksum">
               <template #label>
                 <tooltip-label :title="$t('label.checksum')" :tooltip="apiParams.checksum.description"/>