[KVM] Fix for Revert volume snapshot #6527
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.cloudstack.storage.snapshot; | ||
|
|
||
| import com.cloud.storage.DataStoreRole; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotResult; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; | ||
| import org.apache.cloudstack.framework.async.AsyncCallFuture; | ||
| import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; | ||
| import org.apache.cloudstack.storage.command.CommandResult; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.MockitoAnnotations; | ||
| import org.mockito.Spy; | ||
| import org.powermock.api.mockito.PowerMockito; | ||
| import org.powermock.core.classloader.annotations.PrepareForTest; | ||
| import org.powermock.modules.junit4.PowerMockRunner; | ||
| import org.springframework.test.context.ContextConfiguration; | ||
| import org.springframework.test.context.support.AnnotationConfigContextLoader; | ||
|
|
||
| @RunWith(PowerMockRunner.class) | ||
| @PrepareForTest({SnapshotServiceImpl.class}) | ||
| @ContextConfiguration(loader = AnnotationConfigContextLoader.class) | ||
| public class SnapshotServiceImplTest { | ||
|
|
||
| @Spy | ||
| @InjectMocks | ||
| private SnapshotServiceImpl snapshotService = new SnapshotServiceImpl(); | ||
|
|
||
| @Mock | ||
| VolumeDataFactory volFactory; | ||
|
|
||
| @Mock | ||
| SnapshotDataFactory _snapshotFactory; | ||
|
|
||
| @Mock | ||
| AsyncCallFuture<SnapshotResult> futureMock; | ||
|
|
||
| @Mock | ||
| AsyncCallbackDispatcher<SnapshotServiceImpl, CommandResult> caller; | ||
|
|
||
| @Before | ||
| public void testSetUp() throws Exception { | ||
| MockitoAnnotations.initMocks(this); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRevertSnapshotWithNoPrimaryStorageEntry() throws Exception { | ||
| SnapshotInfo snapshot = Mockito.mock(SnapshotInfo.class); | ||
| VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class); | ||
|
|
||
| Mockito.when(snapshot.getId()).thenReturn(1L); | ||
| Mockito.when(snapshot.getVolumeId()).thenReturn(1L); | ||
| Mockito.when(_snapshotFactory.getSnapshot(1L, DataStoreRole.Primary)).thenReturn(null); | ||
| Mockito.when(volFactory.getVolume(1L, DataStoreRole.Primary)).thenReturn(volumeInfo); | ||
|
|
||
| PrimaryDataStore store = Mockito.mock(PrimaryDataStore.class); | ||
| Mockito.when(volumeInfo.getDataStore()).thenReturn(store); | ||
|
|
||
| PrimaryDataStoreDriver driver = Mockito.mock(PrimaryDataStoreDriver.class); | ||
| Mockito.when(store.getDriver()).thenReturn(driver); | ||
| Mockito.doNothing().when(driver).revertSnapshot(snapshot, null, caller); | ||
|
|
||
| SnapshotResult result = Mockito.mock(SnapshotResult.class); | ||
| PowerMockito.whenNew(AsyncCallFuture.class).withNoArguments().thenReturn(futureMock); | ||
| Mockito.when(futureMock.get()).thenReturn(result); | ||
| Mockito.when(result.isFailed()).thenReturn(false); | ||
|
|
||
| Assert.assertEquals(true, snapshotService.revertSnapshot(snapshot)); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@harikrishna-patnala should we check for subsequent cases where it's not found again or this is null?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are not looking for snapshotOnPrimaryStore again. We are just trying to get the appropriate datastore driver to run the command. We are using volume's info here if snapshot on primary os not found. So need to check again.