Skip to content

Added events for snapshots, vmsnapshots, internalLB operations #11230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harikrishna-patnala merged 7 commits into from
Sep 2, 2025
Merged

Added events for snapshots, vmsnapshots, internalLB operations #11230

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b578ae
Added events for snapshots, vmsnapshots, internalLB operations
harikrishna-patnala Jul 17, 2025
33db636
Fix tests
harikrishna-patnala Jul 18, 2025
876fba4
Fix import
harikrishna-patnala Jul 18, 2025
a16790d
Update server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
harikrishna-patnala Jul 22, 2025
c620018
small fix
harikrishna-patnala Jul 24, 2025
134f7e7
Unit test - ArgumentMatchers change
harikrishna-patnala Jul 25, 2025
230fd25
Unit test - ArgumentMatchers change
harikrishna-patnala Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,9 @@ public Long getSyncObjId() {
}
return null;
}

@Override
public Long getApiResourceId() {
return getEntityId();
}
}
4 changes: 4 additions & 0 deletions ...cer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;

import com.cloud.event.ActionEvent;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
Expand Down Expand Up @@ -540,6 +542,7 @@ public boolean destroyInternalLbVm(final long vmId, final Account caller, final
}

@Override
@ActionEvent(eventType = EventTypes.EVENT_INTERNAL_LB_VM_STOP, eventDescription = "stopping internal LB VM", async = true)
public VirtualRouter stopInternalLbVm(final long vmId, final boolean forced, final Account caller, final long callerUserId) throws ConcurrentOperationException, ResourceUnavailableException {
final DomainRouterVO internalLbVm = _internalLbVmDao.findById(vmId);
if (internalLbVm == null || internalLbVm.getRole() != Role.INTERNAL_LB_VM) {
Expand Down Expand Up @@ -928,6 +931,7 @@ protected boolean sendCommandsToInternalLbVm(final VirtualRouter internalLbVm, f
}

@Override
@ActionEvent(eventType = EventTypes.EVENT_INTERNAL_LB_VM_START, eventDescription = "starting internal LB VM", async = true)
public VirtualRouter startInternalLbVm(final long internalLbVmId, final Account caller, final long callerUserId) throws StorageUnavailableException, InsufficientCapacityException,
ConcurrentOperationException, ResourceUnavailableException {

Expand Down
13 changes: 13 additions & 0 deletions ...balancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
// under the License.
package org.apache.cloudstack.internallbvmmgr;

import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;

import java.lang.reflect.Field;
Expand All @@ -24,13 +27,16 @@

import javax.inject.Inject;

import com.cloud.event.ActionEventUtils;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.BDDMockito;
import org.mockito.Matchers;
Copy link

Copilot AI Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The import 'org.mockito.Matchers' is deprecated. Use 'org.mockito.ArgumentMatchers' instead, which is already imported.

Suggested change
import org.mockito.Matchers;

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@harikrishna-patnala , does this make sense?
it requires line 116 to have a simple adjustment as well.

Copy link
Copy Markdown
Member Author

@harikrishna-patnala harikrishna-patnala Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done @DaanHoogland

import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
Expand Down Expand Up @@ -82,6 +88,8 @@ public class InternalLBVMServiceTest extends TestCase {
@Inject
AccountDao _accountDao;

private MockedStatic<ActionEventUtils> actionEventUtilsMocked;

long validVmId = 1L;
long nonExistingVmId = 2L;
long nonInternalLbVmId = 3L;
Expand Down Expand Up @@ -120,11 +128,16 @@ public void setUp() {
Mockito.when(_domainRouterDao.findById(validVmId)).thenReturn(validVm);
Mockito.when(_domainRouterDao.findById(nonExistingVmId)).thenReturn(null);
Mockito.when(_domainRouterDao.findById(nonInternalLbVmId)).thenReturn(nonInternalLbVm);

actionEventUtilsMocked = Mockito.mockStatic(ActionEventUtils.class);
BDDMockito.given(ActionEventUtils.onStartedActionEvent(anyLong(), anyLong(), anyString(), anyString(), anyLong(), anyString(), anyBoolean(), anyLong()))
.willReturn(1L);
}

@Override
@After
public void tearDown() {
actionEventUtilsMocked.close();
CallContext.unregister();
}

Expand Down
7 changes: 6 additions & 1 deletion server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,6 +1251,8 @@ public Cluster updateCluster(UpdateClusterCmd cmd) {
}

@Override
@DB
@ActionEvent(eventType = EventTypes.EVENT_MAINTENANCE_CANCEL, eventDescription = "cancel maintenance for host", async = true)
public Host cancelMaintenance(final CancelMaintenanceCmd cmd) {
final Long hostId = cmd.getId();

Expand All @@ -1274,6 +1276,8 @@ public Host cancelMaintenance(final CancelMaintenanceCmd cmd) {
}

@Override
@DB
@ActionEvent(eventType = EventTypes.EVENT_HOST_RECONNECT, eventDescription = "reconnecting host", async = true)
public Host reconnectHost(ReconnectHostCmd cmd) throws AgentUnavailableException {
Long hostId = cmd.getId();

Expand Down Expand Up @@ -1344,7 +1348,6 @@ private boolean doMaintain(final long hostId) {
throw new CloudRuntimeException(err + e.getMessage());
}

ActionEventUtils.onStartedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(), EventTypes.EVENT_MAINTENANCE_PREPARE, "starting maintenance for host " + hostId, hostId, null, true, 0);
_agentMgr.pullAgentToMaintenance(hostId);

/* TODO: move below to listener */
Expand Down Expand Up @@ -1472,6 +1475,8 @@ public boolean maintain(final long hostId) throws AgentUnavailableException {
}

@Override
@DB
@ActionEvent(eventType = EventTypes.EVENT_MAINTENANCE_PREPARE, eventDescription = "maintenance for host", async = true)
Comment thread
harikrishna-patnala marked this conversation as resolved.
Outdated
public Host maintain(final PrepareForMaintenanceCmd cmd) {
final Long hostId = cmd.getId();
final HostVO host = _hostDao.findById(hostId);
Expand Down
2 changes: 2 additions & 0 deletions server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,8 @@ public Snapshot archiveSnapshot(Long snapshotId) {
}

@Override
@DB
@ActionEvent(eventType = EventTypes.EVENT_SNAPSHOT_CREATE, eventDescription = "creating snapshot from VM snapshot", async = true)
public Snapshot backupSnapshotFromVmSnapshot(Long snapshotId, Long vmId, Long volumeId, Long vmSnapshotId) {
VMInstanceVO vm = _vmDao.findById(vmId);
if (vm == null) {
Expand Down
Loading