-
Notifications
You must be signed in to change notification settings - Fork 1.3k
CLOUDSTACK-8808: Successfully registered VHD template is downloaded again due to missing virtualsize property in template.properties #901
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
138 changes: 138 additions & 0 deletions
138
core/test/com/cloud/storage/template/OVAProcessorTest.java
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,138 @@ | ||
| /* | ||
| * 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 com.cloud.storage.template; | ||
|
|
||
| import com.cloud.exception.InternalErrorException; | ||
| import com.cloud.storage.Storage; | ||
| import com.cloud.storage.StorageLayer; | ||
| import com.cloud.utils.script.Script; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.powermock.api.mockito.PowerMockito; | ||
| import org.powermock.core.classloader.annotations.PrepareForTest; | ||
| import org.powermock.modules.junit4.PowerMockRunner; | ||
|
|
||
| import java.io.File; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| @RunWith(PowerMockRunner.class) | ||
| @PrepareForTest(OVAProcessor.class) | ||
| public class OVAProcessorTest { | ||
| OVAProcessor processor; | ||
|
|
||
| @Mock | ||
| StorageLayer mockStorageLayer; | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| processor = PowerMockito.spy(new OVAProcessor()); | ||
| Map<String, Object> params = new HashMap<String, Object>(); | ||
| params.put(StorageLayer.InstanceConfigKey, mockStorageLayer); | ||
| processor.configure("OVA Processor", params); | ||
| } | ||
|
|
||
| @Test(expected = InternalErrorException.class) | ||
| public void testProcessWhenUntarFails() throws Exception { | ||
| String templatePath = "/tmp"; | ||
| String templateName = "template"; | ||
|
|
||
| Mockito.when(mockStorageLayer.exists(Mockito.anyString())).thenReturn(true); | ||
|
|
||
| Script mockScript = Mockito.mock(Script.class); | ||
| PowerMockito.whenNew(Script.class).withAnyArguments().thenReturn(mockScript); | ||
| PowerMockito.when(mockScript.execute()).thenReturn("error while untaring the file"); | ||
|
|
||
| processor.process(templatePath, null, templateName); | ||
| } | ||
|
|
||
| @Test(expected = InternalErrorException.class) | ||
| public void testProcessWhenVirtualSizeThrowsException() throws Exception { | ||
| String templatePath = "/tmp"; | ||
| String templateName = "template"; | ||
|
|
||
| Mockito.when(mockStorageLayer.exists(Mockito.anyString())).thenReturn(true); | ||
| Mockito.when(mockStorageLayer.getSize(Mockito.anyString())).thenReturn(1000l); | ||
| Mockito.doThrow(new InternalErrorException("virtual size calculation failed")).when(processor).getTemplateVirtualSize(Mockito.anyString(), Mockito.anyString()); | ||
|
|
||
| Script mockScript = Mockito.mock(Script.class); | ||
| PowerMockito.whenNew(Script.class).withAnyArguments().thenReturn(mockScript); | ||
| PowerMockito.when(mockScript.execute()).thenReturn(null); | ||
|
|
||
| processor.process(templatePath, null, templateName); | ||
| } | ||
|
|
||
| @Test | ||
| public void testProcess() throws Exception { | ||
| String templatePath = "/tmp"; | ||
| String templateName = "template"; | ||
| long virtualSize = 2000; | ||
| long actualSize = 1000; | ||
|
|
||
| Mockito.when(mockStorageLayer.exists(Mockito.anyString())).thenReturn(true); | ||
| Mockito.when(mockStorageLayer.getSize(Mockito.anyString())).thenReturn(actualSize); | ||
| Mockito.doReturn(virtualSize).when(processor).getTemplateVirtualSize(Mockito.anyString(), Mockito.anyString()); | ||
|
|
||
| Script mockScript = Mockito.mock(Script.class); | ||
| PowerMockito.whenNew(Script.class).withAnyArguments().thenReturn(mockScript); | ||
| PowerMockito.when(mockScript.execute()).thenReturn(null); | ||
|
|
||
| Processor.FormatInfo info = processor.process(templatePath, null, templateName); | ||
| Assert.assertEquals(Storage.ImageFormat.OVA, info.format); | ||
| Assert.assertEquals("actual size:", actualSize, info.size); | ||
| Assert.assertEquals("virtual size:", virtualSize, info.virtualSize); | ||
| Assert.assertEquals("template name:", templateName + ".ova", info.filename); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetVirtualSizeWhenVirtualSizeThrowsException() throws Exception { | ||
| long virtualSize = 2000; | ||
| long actualSize = 1000; | ||
| String templatePath = "/tmp"; | ||
| String templateName = "template"; | ||
| File mockFile = Mockito.mock(File.class); | ||
| Mockito.when(mockFile.length()).thenReturn(actualSize); | ||
| Mockito.when(mockFile.getParent()).thenReturn(templatePath); | ||
| Mockito.when(mockFile.getName()).thenReturn(templateName); | ||
| Mockito.doThrow(new InternalErrorException("virtual size calculation failed")).when(processor).getTemplateVirtualSize(templatePath, templateName); | ||
| Assert.assertEquals(actualSize, processor.getVirtualSize(mockFile)); | ||
| Mockito.verify(mockFile, Mockito.times(1)).length(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetVirtualSize() throws Exception { | ||
| long virtualSize = 2000; | ||
| long actualSize = 1000; | ||
| String templatePath = "/tmp"; | ||
| String templateName = "template"; | ||
| File mockFile = Mockito.mock(File.class); | ||
| Mockito.when(mockFile.length()).thenReturn(actualSize); | ||
| Mockito.when(mockFile.getParent()).thenReturn(templatePath); | ||
| Mockito.when(mockFile.getName()).thenReturn(templateName); | ||
| Mockito.doReturn(virtualSize).when(processor).getTemplateVirtualSize(templatePath, templateName); | ||
| Assert.assertEquals(virtualSize, processor.getVirtualSize(mockFile)); | ||
| Mockito.verify(mockFile, Mockito.times(0)).length(); | ||
| } | ||
|
|
||
| } |
109 changes: 109 additions & 0 deletions
109
core/test/com/cloud/storage/template/QCOW2ProcessorTest.java
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,109 @@ | ||
| /* | ||
| * 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 com.cloud.storage.template; | ||
|
|
||
| import com.cloud.exception.InternalErrorException; | ||
| import com.cloud.storage.Storage; | ||
| import com.cloud.storage.StorageLayer; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.runners.MockitoJUnitRunner; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class QCOW2ProcessorTest { | ||
| QCOW2Processor processor; | ||
|
|
||
| @Mock | ||
| StorageLayer mockStorageLayer; | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| processor = Mockito.spy(new QCOW2Processor()); | ||
| Map<String, Object> params = new HashMap<String, Object>(); | ||
| params.put(StorageLayer.InstanceConfigKey, mockStorageLayer); | ||
| processor.configure("VHD Processor", params); | ||
| } | ||
|
|
||
| @Test(expected = InternalErrorException.class) | ||
| public void testProcessWhenVirtualSizeThrowsException() throws Exception { | ||
| String templatePath = "/tmp"; | ||
| String templateName = "template"; | ||
|
|
||
| Mockito.when(mockStorageLayer.exists(Mockito.anyString())).thenReturn(true); | ||
| File mockFile = Mockito.mock(File.class); | ||
|
|
||
| Mockito.when(mockStorageLayer.getFile(Mockito.anyString())).thenReturn(mockFile); | ||
| Mockito.when(mockStorageLayer.getSize(Mockito.anyString())).thenReturn(1000L); | ||
| Mockito.doThrow(new IOException("virtual size calculation failed")).when(processor).getTemplateVirtualSize((File)Mockito.any()); | ||
|
|
||
| processor.process(templatePath, null, templateName); | ||
| } | ||
|
|
||
| @Test | ||
| public void testProcess() throws Exception { | ||
| String templatePath = "/tmp"; | ||
| String templateName = "template"; | ||
| long virtualSize = 2000; | ||
| long actualSize = 1000; | ||
|
|
||
| Mockito.when(mockStorageLayer.exists(Mockito.anyString())).thenReturn(true); | ||
| File mockFile = Mockito.mock(File.class); | ||
|
|
||
| Mockito.when(mockStorageLayer.getFile(Mockito.anyString())).thenReturn(mockFile); | ||
| Mockito.when(mockStorageLayer.getSize(Mockito.anyString())).thenReturn(actualSize); | ||
| Mockito.doReturn(virtualSize).when(processor).getTemplateVirtualSize((File)Mockito.any()); | ||
|
|
||
| Processor.FormatInfo info = processor.process(templatePath, null, templateName); | ||
| Assert.assertEquals(Storage.ImageFormat.QCOW2, info.format); | ||
| Assert.assertEquals(actualSize, info.size); | ||
| Assert.assertEquals(virtualSize, info.virtualSize); | ||
| Assert.assertEquals(templateName + ".qcow2", info.filename); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetVirtualSizeWhenVirtualSizeThrowsException() throws Exception { | ||
| long virtualSize = 2000; | ||
| long actualSize = 1000; | ||
| File mockFile = Mockito.mock(File.class); | ||
| Mockito.when(mockFile.length()).thenReturn(actualSize); | ||
| Mockito.doThrow(new IOException("virtual size calculation failed")).when(processor).getTemplateVirtualSize((File)Mockito.any()); | ||
| Assert.assertEquals(actualSize, processor.getVirtualSize(mockFile)); | ||
| Mockito.verify(mockFile, Mockito.times(1)).length(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetVirtualSize() throws Exception { | ||
| long virtualSize = 2000; | ||
| long actualSize = 1000; | ||
| File mockFile = Mockito.mock(File.class); | ||
| Mockito.when(mockFile.length()).thenReturn(actualSize); | ||
| Mockito.doReturn(virtualSize).when(processor).getTemplateVirtualSize((File)Mockito.any()); | ||
| Assert.assertEquals(virtualSize, processor.getVirtualSize(mockFile)); | ||
| Mockito.verify(mockFile, Mockito.times(0)).length(); | ||
| } | ||
| } |
Oops, something went wrong.
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.
@karuturi Could you please use the QCOW2Utils.getVirtualSize() from the com.cloud.utils.storage package instead of using the function defined in the QCOW2Processor? :)
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.
The utils one should be a recent implementation. I wonder why the author hasnt done cleanup and left two implementation of the same. I will take a look at the code later and see if it can be reused here.