SSL: remove ssl certificates when clean up account

Author: weizhouapache

engine/schema/src/main/java/com/cloud/network/dao/SslCertDao.java

@@ -22,4 +22,6 @@
 
 public interface SslCertDao extends GenericDao<SslCertVO, Long> {
     List<SslCertVO> listByAccountId(Long id);
+
+    int removeByAccountId(long accountId);
 }

engine/schema/src/main/java/com/cloud/network/dao/SslCertDaoImpl.java

@@ -40,4 +40,10 @@ public List<SslCertVO> listByAccountId(Long accountId) {
         return listBy(sc);
     }
 
+    @Override
+    public int removeByAccountId(long accountId) {
+        SearchCriteria<SslCertVO> sc = listByAccountId.create();
+        sc.setParameters("accountId", accountId);
+        return remove(sc);
+    }
 }

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -136,6 +136,7 @@
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.RemoteAccessVpnDao;
 import com.cloud.network.dao.RemoteAccessVpnVO;
+import com.cloud.network.dao.SslCertDao;
 import com.cloud.network.dao.VpnUserDao;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.security.SecurityGroupManager;
@@ -308,6 +309,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
     private UserDataDao userDataDao;
     @Inject
     private NetworkPermissionDao networkPermissionDao;
+    @Inject
+    private SslCertDao sslCertDao;
 
     private List<QuerySelector> _querySelectors;
 
@@ -1202,6 +1205,9 @@ public int compare(NetworkVO network1, NetworkVO network2) {
             // Delete registered UserData
             userDataDao.removeByAccountId(accountId);
 
+            // Delete SSL certificates
+            sslCertDao.removeByAccountId(accountId);
+
             // Delete Webhooks
             deleteWebhooksForAccount(accountId);
 

server/src/test/java/com/cloud/user/AccountManagerImplTest.java

@@ -201,6 +201,7 @@ public void deleteUserAccount() {
         Mockito.when(_sshKeyPairDao.listKeyPairs(Mockito.anyLong(), Mockito.anyLong())).thenReturn(sshkeyList);
         Mockito.when(_sshKeyPairDao.remove(Mockito.anyLong())).thenReturn(true);
         Mockito.when(userDataDao.removeByAccountId(Mockito.anyLong())).thenReturn(222);
+        Mockito.when(sslCertDao.removeByAccountId(Mockito.anyLong())).thenReturn(333);
         Mockito.doNothing().when(accountManagerImpl).deleteWebhooksForAccount(Mockito.anyLong());
         Mockito.doNothing().when(accountManagerImpl).verifyCallerPrivilegeForUserOrAccountOperations((Account) any());
 

server/src/test/java/com/cloud/user/AccountManagetImplTestBase.java

@@ -29,6 +29,7 @@
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.SslCertDao;
 import com.cloud.network.dao.VpnUserDao;
 import com.cloud.network.security.SecurityGroupManager;
 import com.cloud.network.security.dao.SecurityGroupDao;
@@ -198,6 +199,8 @@ public class AccountManagetImplTestBase {
     @Mock
     UserDataDao userDataDao;
     @Mock
+    SslCertDao sslCertDao;
+    @Mock
     NetworkPermissionDao networkPermissionDaoMock;
 
     @Spy