when destroy the vms, delete the tags from virtual router (squash commits)

Author: matheusdaluz

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -39,6 +39,8 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.server.ResourceTag;
+import com.cloud.server.TaggedResourceService;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -472,6 +474,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     private TemplateApiService _tmplService;
     @Inject
     private ConfigurationDao _configDao;
+    @Inject
+    private TaggedResourceService _taggedResourceService;
 
     private ScheduledExecutorService _executor = null;
     private ScheduledExecutorService _vmIpFetchExecutor = null;
@@ -2818,6 +2822,16 @@ public UserVm destroyVm(DestroyVMCmd cmd) throws ResourceUnavailableException, C
         return destroyedVm;
     }
 
+    protected void removeTagsFromVm(long vmId) {
+        UserVmVO vm = _vmDao.findById(vmId);
+        Long resourceId = _taggedResourceService.getResourceId(vm.getUuid(), ResourceTag.ResourceObjectType.UserVm);
+        List<? extends ResourceTag> resourceTags = _taggedResourceService.listByResourceTypeAndId(ResourceTag.ResourceObjectType.UserVm, resourceId);
+        if (resourceTags.size() > 0) {
+            List<String> resourceIds = Arrays.asList(vm.getUuid());
+            _taggedResourceService.deleteTags(resourceIds, ResourceTag.ResourceObjectType.UserVm, null);
+        }
+    }
+
     private List<VolumeVO> getVolumesFromIds(DestroyVMCmd cmd) {
         List<VolumeVO> volumes = new ArrayList<>();
         if (cmd.getVolumeIds() != null) {
@@ -4606,6 +4620,7 @@ public UserVm destroyVm(long vmId, boolean expunge) throws ResourceUnavailableEx
         try {
             VirtualMachineEntity vmEntity = _orchSrvc.getVirtualMachine(vm.getUuid());
             status = vmEntity.destroy(Long.toString(userId), expunge);
+            removeTagsFromVm(vmId);
         } catch (CloudException e) {
             CloudRuntimeException ex = new CloudRuntimeException("Unable to destroy with specified vmId", e);
             ex.addProxyObject(vm.getUuid(), "vmId");

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

@@ -33,6 +33,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.cloud.server.ResourceTag;
+import com.cloud.tags.TaggedResourceManagerImpl;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
@@ -68,6 +70,8 @@ public class AccountManagerImplVolumeDeleteEventTest extends AccountManagetImplT
     UserVmManagerImpl _vmMgr;
     Map<String, Object> oldFields = new HashMap<>();
     UserVmVO vm = mock(UserVmVO.class);
+    TaggedResourceManagerImpl taggedResourceManager = mock(TaggedResourceManagerImpl.class);
+
 
     // Configures the static fields of the UsageEventUtils class, Storing the
     // previous values to be restored during the cleanup phase, to avoid
@@ -138,6 +142,9 @@ protected void defineMocksBehavior() throws AgentUnavailableException, Concurren
         when(_serviceOfferingDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn(offering);
 
         when(_domainMgr.getDomain(anyLong())).thenReturn(domain);
+        Mockito.when(vm.getUuid()).thenReturn("1l");
+        Mockito.when(taggedResourceManager.getResourceId("123", ResourceTag.ResourceObjectType.UserVm)).thenReturn(Long.valueOf(123));
+
 
         Mockito.doReturn(true).when(_vmMgr).expunge(any(UserVmVO.class), anyLong(), any(Account.class));
 

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

@@ -198,6 +198,7 @@ public class AccountManagetImplTestBase {
     @Mock
     UsageEventDao _usageEventDao;
 
+
     @Before
     public void setup() {
         accountManagerImpl.setUserAuthenticators(Arrays.asList(userAuthenticator));

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

@@ -17,15 +17,22 @@
 package com.cloud.vm;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 
+import com.cloud.server.ResourceTag;
+import com.cloud.tags.ResourceTagVO;
+import com.cloud.tags.TaggedResourceManagerImpl;
+import com.cloud.tags.dao.ResourceTagDao;
 import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
 import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.mockito.BDDMockito;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -76,6 +83,13 @@ public class UserVmManagerImplTest {
     @Mock
     private NetworkModel networkModel;
 
+    @Mock
+    private TaggedResourceManagerImpl taggedResourceManagerMock;
+
+    @Mock
+    private ResourceTagDao resourceTagDaoMock;
+
+
     private long vmId = 1l;
 
     @Before
@@ -276,4 +290,43 @@ private void configureValidateOrReplaceMacAddressTest(int times, String macAddre
         Mockito.verify(networkModel, Mockito.times(times)).getNextAvailableMacAddressInNetwork(Mockito.anyLong());
         Assert.assertEquals(expectedMacAddress, returnedMacAddress);
     }
+
+    @Test
+    public void validateRemoveTagsWhenExists() {
+
+        List<ResourceTag> resourceTags = Arrays.asList(new ResourceTagVO("test", "test", 1l, 2l,
+                Long.valueOf(123), ResourceTag.ResourceObjectType.UserVm, "", "test"));
+
+        List<String> resourceIds = Arrays.asList("123");
+
+        Mockito.when(taggedResourceManagerMock.getUuid("123", ResourceTag.ResourceObjectType.UserVm)).thenReturn("123");
+        Mockito.when(taggedResourceManagerMock.getResourceId("123", ResourceTag.ResourceObjectType.UserVm)).thenReturn(Long.valueOf(123));
+
+        Mockito.<List<? extends ResourceTag>>when(taggedResourceManagerMock.listByResourceTypeAndId(ResourceTag.ResourceObjectType.UserVm, Long.valueOf(123))).thenReturn(resourceTags);
+        Mockito.when(taggedResourceManagerMock.deleteTags(resourceIds, ResourceTag.ResourceObjectType.UserVm, null)).thenReturn(true);
+
+        Mockito.when(userVmDao.findById(123l)).thenReturn(userVmVoMock);
+        Mockito.when(userVmVoMock.getUuid()).thenReturn("123");
+
+
+        userVmManagerImpl.removeTagsFromVm(Long.valueOf(123));
+        Assert.assertTrue(taggedResourceManagerMock.deleteTags(resourceIds, ResourceTag.ResourceObjectType.UserVm, null));
+    }
+
+
+    @Test
+    public void validateWhenRemoveTagsNoExists() {
+
+        List<ResourceTag> resourceTags = Arrays.asList();
+
+        Mockito.when(taggedResourceManagerMock.getResourceId("1l", ResourceTag.ResourceObjectType.UserVm)).thenReturn(1l);
+        Mockito.<List<? extends ResourceTag>>when(taggedResourceManagerMock.listByResourceTypeAndId(ResourceTag.ResourceObjectType.UserVm, 1l)).thenReturn(resourceTags);
+
+        Mockito.when(userVmVoMock.getUuid()).thenReturn("1l");
+
+        Mockito.when(userVmDao.findById(Mockito.eq(vmId))).thenReturn(userVmVoMock);
+
+        userVmManagerImpl.removeTagsFromVm(1l);
+        Assert.assertEquals(0, taggedResourceManagerMock.listByResourceTypeAndId(ResourceTag.ResourceObjectType.UserVm, 1l).size());
+    }
 }