pre-populate editvm.vue with extraconfig

Author: abh1sar

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -6277,7 +6277,7 @@ public UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityE
     protected void persistExtraConfigVmware(String decodedUrl, UserVm vm) {
         boolean isValidConfig = isValidKeyValuePair(decodedUrl);
         if (isValidConfig) {
-            String[] extraConfigs = decodedUrl.split("\\r?\\n");
+            String[] extraConfigs = decodedUrl.split("\\r?\\n+");
             for (String cfg : extraConfigs) {
                 // Validate cfg against unsupported operations set by admin here
                 String[] allowedKeyList = VmwareAdditionalConfigAllowList.value().split(",");
@@ -6305,7 +6305,7 @@ protected void persistExtraConfigVmware(String decodedUrl, UserVm vm) {
     protected void persistExtraConfigXenServer(String decodedUrl, UserVm vm) {
         boolean isValidConfig = isValidKeyValuePair(decodedUrl);
         if (isValidConfig) {
-            String[] extraConfigs = decodedUrl.split("\\r?\\n");
+            String[] extraConfigs = decodedUrl.split("\\r?\\n+");
             int i = 1;
             String extraConfigKey = ApiConstants.EXTRA_CONFIG + "-";
             for (String cfg : extraConfigs) {

ui/src/views/compute/DeployVM.vue

@@ -724,7 +724,7 @@
                         </div>
                       </a-card>
                     </a-form-item>
-                    <a-form-item v-if="extraConfigEnabledValue" name="extraconfig" ref="extraconfig">
+                    <a-form-item v-if="extraConfigEnabled" name="extraconfig" ref="extraconfig">
                       <template #label>
                         <tooltip-label :title="$t('label.extraconfig')" :tooltip="$t('label.extraconfig.tooltip')"/>
                       </template>
@@ -1424,7 +1424,7 @@ export default {
     dynamicScalingVmConfigValue () {
       return this.$store.getters.features.dynamicscalingenabled
     },
-    extraConfigEnabledValue () {
+    extraConfigEnabled () {
       return this.$store.getters.features.additionalconfigenabled
     },
     isCustomizedDiskIOPS () {

ui/src/views/compute/EditVM.vue

@@ -170,8 +170,20 @@ export default {
       groups: {
         loading: false,
         opts: []
-      },
-      extraConfigEnabled: this.$store.getters.features.additionalconfigenabled
+      }
+    }
+  },
+  computed: {
+    extraConfigEnabled () {
+      return this.$store.getters.features.additionalconfigenabled
+    },
+    combinedExtraConfig () {
+      if (!this.extraConfigEnabled || !this.resource.details) return ''
+      const configs = Object.keys(this.resource.details)
+        .filter(key => key.startsWith('extraconfig-'))
+        .map(key => this.resource.details[key] || '')
+        .filter(val => val.trim())
+      return configs.join('\n\n')
     }
   },
   beforeCreate () {
@@ -192,7 +204,8 @@ export default {
         deleteprotection: this.resource.deleteprotection,
         group: this.resource.group,
         userdata: '',
-        haenable: this.resource.haenable
+        haenable: this.resource.haenable,
+        extraconfig: this.combinedExtraConfig
       })
       this.rules = reactive({})
     },