From fac22936f645ee0ca2b8a7cdd0c7fa21e8c35666 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Wed, 6 Nov 2013 15:44:55 -0800
Subject: [PATCH] CLOUDSTACK-4979: if no hostName is passed to deployVm call,
 automatically generated hostName follows the pattern <instance.id global
 config>-<randomly generated uuid>. Example:
 VM-a6c6457e-e4d0-486f-a392-9239be9b36f5

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 80a40362d00..2c1343ae822 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2749,7 +2749,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             }
         } else {
             if (hostName == null) {
-                hostName = uuidName;
+                //Generate name using uuid and instance.name global config
+                hostName = _configDao.getValue(Config.InstanceName.key()) + "-" + uuidName;
             }
         }