Merge branch '4.19' into 4.20

Author: Daan Hoogland

python/lib/cloudutils/networkConfig.py

@@ -41,7 +41,7 @@ def listNetworks():
         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")

ui/src/views/compute/EditVM.vue

@@ -185,7 +185,6 @@ export default {
         isdynamicallyscalable: this.resource.isdynamicallyscalable,
         deleteprotection: this.resource.deleteprotection,
         group: this.resource.group,
-        securitygroupids: this.resource.securitygroup.map(x => x.id),
         userdata: '',
         haenable: this.resource.haenable
       })

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"/>

ui/src/views/image/RegisterOrUploadTemplate.vue

@@ -214,16 +214,16 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="12" v-if="(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"/>
               </template>
               <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"/>