config default value

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java

@@ -88,7 +88,7 @@ public interface VirtualMachineManager extends Manager {
             "If provided, a custom cloud-name in cloud-init metadata", true, ConfigKey.Scope.Zone);
 
     ConfigKey<String> VmMetadataManufacturer = new ConfigKey<>("Advanced", String.class,
-            "vm.metadata.manufacturer", "",
+            "vm.metadata.manufacturer", "Apache Software Foundation",
             "If provided, a custom manufacturer will be used in the instance metadata. When an empty" +
                     "value is set then default manufacturer will be 'Apache Software Foundation'. " +
                     "A custom manufacturer may break cloud-init functionality with CloudStack datasource. Please " +

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1262,8 +1262,16 @@ public void orchestrateStart(final String vmUuid, final Map<VirtualMachineProfil
                     vmGuru.finalizeVirtualMachineProfile(vmProfile, dest, ctx);
 
                     final VirtualMachineTO vmTO = hvGuru.implement(vmProfile);
-                    vmTO.setMetadataManufacturer(VmMetadataManufacturer.valueIn(vm.getDataCenterId()));
-                    vmTO.setMetadataProductName(VmMetadataProductName.valueIn(vm.getDataCenterId()));
+                    String metadataManufacturer = VmMetadataManufacturer.valueIn(vm.getDataCenterId());
+                    if (StringUtils.isBlank(metadataManufacturer)) {
+                        metadataManufacturer = VmMetadataManufacturer.defaultValue();
+                    }
+                    vmTO.setMetadataManufacturer(metadataManufacturer);
+                    String metadataProduct = VmMetadataProductName.valueIn(vm.getDataCenterId());
+                    if (StringUtils.isBlank(metadataManufacturer)) {
+                        metadataProduct = String.format("CloudStack %s Hypervisor", vm.getHypervisorType().toString());
+                    }
+                    vmTO.setMetadataProductName(metadataProduct);
 
                     checkAndSetEnterSetupMode(vmTO, params);
 

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

@@ -127,9 +127,6 @@ public GuestType getGuestType() {
         }
 
         public String getManufacturer() {
-            if (StringUtils.isEmpty(manufacturer)) {
-                return "Apache Software Foundation";
-            }
             return manufacturer;
         }
 
@@ -138,9 +135,6 @@ public void setManufacturer(String manufacturer) {
         }
 
         public String getProduct() {
-            if (StringUtils.isEmpty(product)) {
-                return String.format("CloudStack %s Hypervisor", _type.toString());
-            }
             return product;
         }