Fix test failures

Author: vishesh92

engine/schema/src/main/java/org/apache/cloudstack/kms/dao/KMSKeyDao.java

@@ -30,4 +30,6 @@ public interface KMSKeyDao extends GenericDao<KMSKeyVO, Long> {
     List<KMSKeyVO> listByZone(Long zoneId, KeyPurpose purpose, Boolean enabled);
 
     long countByHsmProfileId(Long hsmProfileId);
+
+    KMSKeyVO findByNameAndAccountId(String name, long accountId);
 }

engine/schema/src/main/java/org/apache/cloudstack/kms/dao/KMSKeyDaoImpl.java

@@ -33,6 +33,7 @@ public class KMSKeyDaoImpl extends GenericDaoBase<KMSKeyVO, Long> implements KMS
 
     public KMSKeyDaoImpl() {
         allFieldSearch = createSearchBuilder();
+        allFieldSearch.and("name", allFieldSearch.entity().getName(), SearchCriteria.Op.EQ);
         allFieldSearch.and("kekLabel", allFieldSearch.entity().getKekLabel(), SearchCriteria.Op.EQ);
         allFieldSearch.and("domainId", allFieldSearch.entity().getDomainId(), SearchCriteria.Op.EQ);
         allFieldSearch.and("accountId", allFieldSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
@@ -71,4 +72,12 @@ public long countByHsmProfileId(Long hsmProfileId) {
         Integer count = getCount(sc);
         return count != null ? count : 0;
     }
+
+    @Override
+    public KMSKeyVO findByNameAndAccountId(String name, long accountId) {
+        SearchCriteria<KMSKeyVO> sc = allFieldSearch.create();
+        sc.setParameters("name", name);
+        sc.setParameters("accountId", accountId);
+        return findOneBy(sc);
+    }
 }

server/src/main/java/org/apache/cloudstack/kms/KMSManagerImpl.java

@@ -392,6 +392,9 @@ KMSKey createUserKMSKey(Long accountId, Long domainId, Long zoneId,
         if (profile == null) {
             throw KMSException.invalidParameter("HSM Profile not found");
         }
+        if (kmsKeyDao.findByNameAndAccountId(name, accountId) != null) {
+            throw new InvalidParameterValueException("A KMS key with name " + name + " already exists in this account");
+        }
 
         KMSKeyVO kmsKey = new KMSKeyVO(name, description, "", purpose,
                 accountId, domainId, zoneId, "AES/GCM/NoPadding", keyBits);