utils: add UuidUtils.nameUUIDFromBytes

agent/src/main/java/com/cloud/agent/resource/DummyResource.java

@@ -20,7 +20,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import com.cloud.agent.IAgentControl;
 import com.cloud.agent.api.Answer;
@@ -40,6 +39,7 @@
 import com.cloud.storage.Storage;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.utils.StringUtils;
+import com.cloud.utils.UuidUtils;
 
 public class DummyResource implements ServerResource {
     String _name;
@@ -133,7 +133,7 @@ protected StoragePoolInfo initializeLocalStorage() {
         String hostIp = getConfiguredProperty("private.ip.address", "127.0.0.1");
         String localStoragePath = getConfiguredProperty("local.storage.path", "/mnt");
         String lh = hostIp + localStoragePath;
-        String uuid = UUID.nameUUIDFromBytes(lh.getBytes(StringUtils.getPreferredCharset())).toString();
+        String uuid = UuidUtils.nameUUIDFromBytes(lh.getBytes(StringUtils.getPreferredCharset())).toString();
 
         String capacity = getConfiguredProperty("local.storage.capacity", "1000000000");
         String available = getConfiguredProperty("local.storage.avail", "10000000");

core/src/main/java/com/cloud/agent/api/DeleteStoragePoolCommand.java

@@ -21,10 +21,10 @@
 
 import java.io.File;
 import java.util.Map;
-import java.util.UUID;
 
 import com.cloud.agent.api.to.StorageFilerTO;
 import com.cloud.storage.StoragePool;
+import com.cloud.utils.UuidUtils;
 
 public class DeleteStoragePoolCommand extends Command {
     public static final String DATASTORE_NAME = "datastoreName";
@@ -49,7 +49,7 @@ public DeleteStoragePoolCommand(StoragePool pool, String localPath) {
     }
 
     public DeleteStoragePoolCommand(StoragePool pool) {
-        this(pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
+        this(pool, LOCAL_PATH_PREFIX + File.separator + UuidUtils.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
     }
 
     public void setPool(StoragePool pool) {

core/src/main/java/com/cloud/agent/api/ModifyStoragePoolCommand.java

@@ -21,10 +21,10 @@
 
 import java.io.File;
 import java.util.Map;
-import java.util.UUID;
 
 import com.cloud.agent.api.to.StorageFilerTO;
 import com.cloud.storage.StoragePool;
+import com.cloud.utils.UuidUtils;
 
 public class ModifyStoragePoolCommand extends Command {
     public static final String LOCAL_PATH_PREFIX = "/mnt/";
@@ -47,11 +47,11 @@ public ModifyStoragePoolCommand(boolean add, StoragePool pool, String localPath,
     }
 
     public ModifyStoragePoolCommand(boolean add, StoragePool pool, Map<String, String> details) {
-        this(add, pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()), details);
+        this(add, pool, LOCAL_PATH_PREFIX + File.separator + UuidUtils.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()), details);
     }
 
     public ModifyStoragePoolCommand(boolean add, StoragePool pool) {
-        this(add, pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
+        this(add, pool, LOCAL_PATH_PREFIX + File.separator + UuidUtils.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
     }
 
     public boolean getAdd() {

engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java

@@ -34,6 +34,7 @@
 
 import com.cloud.cpu.CPU;
 import com.cloud.user.UserData;
+import com.cloud.utils.UuidUtils;
 import org.apache.cloudstack.util.CPUArchConverter;
 import org.apache.cloudstack.util.HypervisorTypeConverter;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
@@ -344,7 +345,7 @@ private static String generateUniqueName(long id, long userId, String displayNam
         name.append("-");
         name.append(userId);
         name.append("-");
-        name.append(UUID.nameUUIDFromBytes((displayName + System.currentTimeMillis()).getBytes()).toString());
+        name.append(UuidUtils.nameUUIDFromBytes((displayName + System.currentTimeMillis()).getBytes()).toString());
         return name.toString();
     }
 

engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java

@@ -100,6 +100,7 @@
 import com.cloud.storage.dao.SnapshotDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.component.ComponentContext;
 
 import junit.framework.Assert;
@@ -287,7 +288,7 @@ protected void injectMockito() {
 
     public DataStore createPrimaryDataStore() {
         try {
-            String uuid = UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString();
+            String uuid = UuidUtils.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString();
             List<StoragePoolVO> pools = primaryDataStoreDao.findPoolByName(this.primaryName);
             if (pools.size() > 0) {
                 return this.dataStoreMgr.getPrimaryDataStore(pools.get(0).getId());

engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java

@@ -82,6 +82,7 @@
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.component.ComponentContext;
 
 @ContextConfiguration(locations = {"classpath:/storageContext.xml"})
@@ -281,7 +282,7 @@ public void testCreatePrimaryStorage() {
         params.put("name", this.primaryName);
         params.put("port", "1");
         params.put("roles", DataStoreRole.Primary.toString());
-        params.put("uuid", UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
+        params.put("uuid", UuidUtils.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
         params.put("providerName", String.valueOf(provider.getName()));
 
         DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle();
@@ -324,7 +325,7 @@ public DataStore createPrimaryDataStore() {
             params.put("name", this.primaryName);
             params.put("port", "1");
             params.put("roles", DataStoreRole.Primary.toString());
-            params.put("uuid", UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
+            params.put("uuid", UuidUtils.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
             params.put("providerName", String.valueOf(provider.getName()));
 
             DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle();

engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java

@@ -86,6 +86,7 @@
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.component.ComponentContext;
 
 @ContextConfiguration(locations = {"classpath:/storageContext.xml"})
@@ -264,7 +265,7 @@ protected void injectMockito() {
 
     public DataStore createPrimaryDataStore() {
         try {
-            String uuid = UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString();
+            String uuid = UuidUtils.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString();
             List<StoragePoolVO> pools = primaryDataStoreDao.findPoolByName(this.primaryName);
             if (pools.size() > 0) {
                 return this.dataStoreMgr.getPrimaryDataStore(pools.get(0).getId());

plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java

@@ -32,6 +32,7 @@
 
 import javax.naming.ConfigurationException;
 
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.rabbitmq.client.BlockedListener;
 
@@ -254,7 +255,7 @@ public void unsubscribe(UUID subscriberId, EventSubscriber subscriber) throws Ev
         logger.debug("unsubscribing '{}'", subscriberId);
         try {
             String classname = subscriber.getClass().getName();
-            String queueName = UUID.nameUUIDFromBytes(classname.getBytes()).toString();
+            String queueName = UuidUtils.nameUUIDFromBytes(classname.getBytes()).toString();
             Ternary<String, Channel, EventSubscriber> queueDetails = s_subscribers.get(queueName);
             Channel channel = queueDetails.second();
             channel.basicCancel(queueName);

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BareMetalDiscoverer.java

@@ -51,6 +51,7 @@
 import com.cloud.resource.ResourceStateAdapter;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.UnableDeleteHostException;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.Script;
 import com.cloud.utils.script.Script2;
@@ -121,7 +122,7 @@ public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long p
             String hostname = url.getHost();
             InetAddress ia = InetAddress.getByName(hostname);
             String ipmiIp = ia.getHostAddress();
-            String guid = UUID.nameUUIDFromBytes(ipmiIp.getBytes()).toString();
+            String guid = UuidUtils.nameUUIDFromBytes(ipmiIp.getBytes()).toString();
 
             String injectScript = "scripts/util/ipmi.py";
             String scriptPath = Script.findScript("", injectScript);

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscoverer.java

@@ -54,6 +54,7 @@
 import com.cloud.resource.ResourceStateAdapter;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.UnableDeleteHostException;
+import com.cloud.utils.UuidUtils;
 
 public class ExternalServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter {
 
@@ -133,7 +134,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
     }
 
     protected String getResourceGuidFromName(String name) {
-        return "External:" + UUID.nameUUIDFromBytes(name.getBytes());
+        return "External:" + UuidUtils.nameUUIDFromBytes(name.getBytes());
     }
 
     protected void addExtensionDataToResourceParams(ExtensionVO extension, Map<String, Object> params) {

plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java

@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.UUID;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
@@ -64,6 +63,7 @@
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.UnableDeleteHostException;
 import com.cloud.storage.StorageLayer;
+import com.cloud.utils.UuidUtils;
 
 /**
  * Methods to discover and managem a Hyper-V agent. Prepares a
@@ -264,7 +264,7 @@ public final Map<? extends ServerResource, Map<String, String>> find(final long
             // pool in the database
             // This GUID may change.
             if (cluster.getGuid() == null) {
-                cluster.setGuid(UUID.nameUUIDFromBytes(String.valueOf(clusterId).getBytes(Charset.forName("UTF-8"))).toString());
+                cluster.setGuid(UuidUtils.nameUUIDFromBytes(String.valueOf(clusterId).getBytes(Charset.forName("UTF-8"))).toString());
                 _clusterDao.update(clusterId, cluster);
             }
 
@@ -322,15 +322,15 @@ public final Map<? extends ServerResource, Map<String, String>> find(final long
     /**
      * Encapsulate GUID calculation in public method to allow access to test
      * programs. Works by converting a string to a GUID using
-     * UUID.nameUUIDFromBytes
+     * UuidUtils.nameUUIDFromBytes
      *
      * @param uuidSeed
      *            string to use to generate GUID
      *
      * @return GUID in form of a string.
      */
     public static String calcServerResourceGuid(final String uuidSeed) {
-        String guid = UUID.nameUUIDFromBytes(uuidSeed.getBytes(Charset.forName("UTF-8"))).toString();
+        String guid = UuidUtils.nameUUIDFromBytes(uuidSeed.getBytes(Charset.forName("UTF-8"))).toString();
         return guid;
     }
 

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

@@ -6096,7 +6096,7 @@ public String getSnapshotTemporaryPath(String diskPath, String snapshotName) {
     }
 
     public static String generateSecretUUIDFromString(String seed) {
-        return UUID.nameUUIDFromBytes(seed.getBytes()).toString();
+        return UuidUtils.nameUUIDFromBytes(seed.getBytes()).toString();
     }
 
     /**

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java

@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
@@ -47,6 +46,7 @@
 import com.cloud.storage.Volume;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine;
 
@@ -331,7 +331,7 @@ public KVMStoragePool getStoragePoolByURI(String uri) {
         sourcePath = storageUri.getPath();
         sourcePath = sourcePath.replace("//", "/");
         sourceHost = storageUri.getHost();
-        uuid = UUID.nameUUIDFromBytes(new String(sourceHost + sourcePath).getBytes()).toString();
+        uuid = UuidUtils.nameUUIDFromBytes(new String(sourceHost + sourcePath).getBytes()).toString();
         protocol = scheme.equals("filesystem") ? StoragePoolType.Filesystem: StoragePoolType.NetworkFilesystem;
 
         // storage registers itself through here

plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmDiscoverer.java

@@ -46,6 +46,7 @@
 import com.cloud.resource.ResourceStateAdapter;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.UnableDeleteHostException;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -131,7 +132,7 @@ private boolean checkIfExisted(String guid) {
             String hostname = url.getHost();
             InetAddress ia = InetAddress.getByName(hostname);
             String hostIp = ia.getHostAddress();
-            String guid = UUID.nameUUIDFromBytes(hostIp.getBytes()).toString();
+            String guid = UuidUtils.nameUUIDFromBytes(hostIp.getBytes()).toString();
 
             if (checkIfExisted(guid)) {
                 throw new CloudRuntimeException("The host " + hostIp + " has been added before");

plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmResourceBase.java

@@ -24,7 +24,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.naming.ConfigurationException;
@@ -127,6 +126,7 @@
 import com.cloud.template.VirtualMachineTemplate.BootloaderType;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.Script;
 import com.cloud.utils.ssh.SSHCmdHelper;
@@ -507,7 +507,7 @@ protected void applySpecToVm(OvmVm.Details vm, VirtualMachineTO spec) {
         vm.name = spec.getName();
         vm.memory = spec.getMinRam();
         vm.cpuNum = spec.getCpus();
-        vm.uuid = UUID.nameUUIDFromBytes(spec.getName().getBytes()).toString();
+        vm.uuid = UuidUtils.nameUUIDFromBytes(spec.getName().getBytes()).toString();
         if (spec.getBootloader() == BootloaderType.CD) {
             vm.bootDev = OvmVm.CD;
             vm.type = OvmVm.HVM;

plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java

@@ -35,6 +35,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import com.cloud.utils.UuidUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.xmlrpc.XmlRpcException;
@@ -71,7 +72,7 @@ public String newUuid() {
 
     /* generate a uuid */
     public String newUuid(String str) {
-        return UUID.nameUUIDFromBytes(str.getBytes(Charset.defaultCharset())).toString();
+        return UuidUtils.nameUUIDFromBytes(str.getBytes(Charset.defaultCharset())).toString();
     }
 
     /* capture most of the calls here */

plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java

@@ -58,6 +58,7 @@
 import com.cloud.resource.ResourceStateAdapter;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.UnableDeleteHostException;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -186,7 +187,7 @@ public Map<? extends ServerResource, Map<String, String>> find(long dcId,
 
             InetAddress ia = InetAddress.getByName(hostname);
             String hostIp = ia.getHostAddress();
-            String guid = UUID.nameUUIDFromBytes(hostIp.getBytes("UTF8"))
+            String guid = UuidUtils.nameUUIDFromBytes(hostIp.getBytes("UTF8"))
                     .toString();
 
             if (checkIfExisted(guid)) {

plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorResource.java

@@ -19,7 +19,6 @@
 
 import java.nio.charset.Charset;
 import java.util.Map;
-import java.util.UUID;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
@@ -95,6 +94,7 @@
 import com.cloud.storage.resource.StorageSubsystemCommandHandler;
 import com.cloud.storage.resource.StorageSubsystemCommandHandlerBase;
 import com.cloud.template.VirtualMachineTemplate.BootloaderType;
+import com.cloud.utils.UuidUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
@@ -369,7 +369,7 @@ public synchronized StartAnswer execute(StartCommand cmd) {
             vm.setVmCpus(vmSpec.getCpus());
             /* in mb not in bytes */
             vm.setVmMemory(vmSpec.getMinRam() / 1024 / 1024);
-            vm.setVmUuid(UUID.nameUUIDFromBytes(vmSpec.getName().getBytes(Charset.defaultCharset())).toString());
+            vm.setVmUuid(UuidUtils.nameUUIDFromBytes(vmSpec.getName().getBytes(Charset.defaultCharset())).toString());
             vm.setVmName(vmName);
 
             String domType = guesttypes.getOvm3GuestType(vmSpec.getOs());

plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java

@@ -17,8 +17,7 @@
 
 package com.cloud.hypervisor.ovm3.objects;
 
-import java.util.UUID;
-
+import com.cloud.utils.UuidUtils;
 import org.junit.Test;
 
 public class XenTest {
@@ -697,7 +696,7 @@ public void testCreateVm() throws Ovm3ResourceException {
         domU.setVmCpus(1);
         domU.setVmMemory(512);
         domU.setVmDomainType("default");
-        domU.setVmUuid(UUID.nameUUIDFromBytes(VMNAME.getBytes()).toString());
+        domU.setVmUuid(UuidUtils.nameUUIDFromBytes(VMNAME.getBytes()).toString());
         domU.setVmName(VMNAME);
         domU.addRootDisk(VMROOTDISK);
         domU.setPrimaryPoolUuid(REPOID);