apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1262 from rafaelweingartner/lrg-cs-hackday-015

Browse Source 
Removed unnecessary code from getGuestOsType in CitrixResourceBaseConsidering that all mapping of Guest OS Names to their respective hypervisor compatible types is made thorugh accessing a database, we've decided to remove a bit of code in the XcpOssResource class which was doing that same thing for 2 different OS's (both of which ARE in the database). That has led us to a bunch of unused parameters in the getGuestOsType method from its superclass, which we've also decided to remove. Test cases were added for four different possibilities for the platformEmulator String: one for a null String, one for a blank String, one for an empy String and one for a random case with a valid String.

* pr/1262:
  Remove test cases duplicated code.
  Removed unnecessary code from getGuestOsType in CitrixResourceBase

Signed-off-by: Will Stevens <williamstevens@gmail.com>
This commit is contained in:
Will Stevens 2016-04-18 14:41:35 -04:00
commit a3371d282f
11 changed files with 133 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
View File

@ -44,7 +44,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeoutException;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@ -164,7 +163,6 @@ import com.xensource.xenapi.XenAPIObject;
* before you do any changes in this code here.
*
*/
@Local(value = ServerResource.class)
public abstract class CitrixResourceBase implements ServerResource, HypervisorResource, VirtualRouterDeployer {
public enum SRType {
@ -1232,7 +1230,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmSpec, final Host host) throws XenAPIException, XmlRpcException {
final String guestOsTypeName = getGuestOsType(vmSpec.getOs(), vmSpec.getPlatformEmulator(), vmSpec.getBootloader() == BootloaderType.CD);
final String guestOsTypeName = getGuestOsType(vmSpec.getPlatformEmulator());
final Set<VM> templates = VM.getByNameLabel(conn, guestOsTypeName);
if (templates == null || templates.isEmpty()) {
throw new CloudRuntimeException("Cannot find template " + guestOsTypeName + " on XenServer host");
@ -1337,7 +1335,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
final TemplateObjectTO iso = (TemplateObjectTO) disk.getData();
final String osType = iso.getGuestOsType();
if (osType != null) {
final String isoGuestOsName = getGuestOsType(osType, vmSpec.getPlatformEmulator(), vmSpec.getBootloader() == BootloaderType.CD);
final String isoGuestOsName = getGuestOsType(vmSpec.getPlatformEmulator());
if (!isoGuestOsName.equals(guestOsTypeName)) {
vmSpec.setBootloader(BootloaderType.PyGrub);
}
@ -2019,8 +2017,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
return null;
}
protected String getGuestOsType(final String stdType, String platformEmulator, final boolean bootFromCD) {
if (platformEmulator == null) {
protected String getGuestOsType(String platformEmulator) {
if (org.apache.commons.lang.StringUtils.isBlank(platformEmulator)) {
s_logger.debug("no guest OS type, start it as HVM guest");
platformEmulator = "Other install media";
}

16
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java
View File

@ -17,16 +17,12 @@
package com.cloud.hypervisor.xenserver.resource;
import javax.ejb.Local;
import org.apache.xmlrpc.XmlRpcException;
import com.cloud.resource.ServerResource;
import com.xensource.xenapi.Connection;
import com.xensource.xenapi.Types.XenAPIException;
import com.xensource.xenapi.VM;
@Local(value = ServerResource.class)
public class XcpOssResource extends CitrixResourceBase {
private static final long mem_32m = 33554432L;
@ -36,18 +32,6 @@ public class XcpOssResource extends CitrixResourceBase {
return "scripts/vm/hypervisor/xenserver/xcposs/patch";
}
@Override
protected String getGuestOsType(final String stdType,
final String platformEmulator, final boolean bootFromCD) {
if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
return "Debian Squeeze 6.0 (64-bit)";
} else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) {
return "CentOS 5 (64-bit)";
} else {
return super.getGuestOsType(stdType, platformEmulator, bootFromCD);
}
}
@Override
protected void setMemory(final Connection conn, final VM vm, long minMemsize, final long maxMemsize) throws XmlRpcException, XenAPIException {
vm.setMemoryLimits(conn, mem_32m, maxMemsize, minMemsize, maxMemsize);

49
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java
View File

@ -19,14 +19,22 @@ import java.io.File;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import com.cloud.utils.script.Script;
public abstract class CitrixResourceBaseTest {
public class CitrixResourceBaseTest {
public void testGetPathFilesExeption(CitrixResourceBase citrixResourceBase) {
protected CitrixResourceBase citrixResourceBase = new CitrixResourceBase() {
@Override
protected String getPatchFilePath() {
return null;
}
};
public void testGetPathFilesExeption() {
String patch = citrixResourceBase.getPatchFilePath();
PowerMockito.mockStatic(Script.class);
@ -36,7 +44,7 @@ public abstract class CitrixResourceBaseTest {
}
public void testGetPathFilesListReturned(CitrixResourceBase citrixResourceBase) {
public void testGetPathFilesListReturned() {
String patch = citrixResourceBase.getPatchFilePath();
PowerMockito.mockStatic(Script.class);
@ -49,4 +57,39 @@ public abstract class CitrixResourceBaseTest {
String receivedPath = files.get(0).getAbsolutePath();
Assert.assertEquals(receivedPath, pathExpected);
}
@Test
public void testGetGuestOsTypeNull() {
String platformEmulator = null;
String expected = "Other install media";
String guestOsType = citrixResourceBase.getGuestOsType(platformEmulator);
Assert.assertEquals(expected, guestOsType);
}
@Test
public void testGetGuestOsTypeEmpty() {
String platformEmulator = "";
String expected = "Other install media";
String guestOsType = citrixResourceBase.getGuestOsType(platformEmulator);
Assert.assertEquals(expected, guestOsType);
}
@Test
public void testGetGuestOsTypeBlank() {
String platformEmulator = " ";
String expected = "Other install media";
String guestOsType = citrixResourceBase.getGuestOsType(platformEmulator);
Assert.assertEquals(expected, guestOsType);
}
@Test
public void testGetGuestOsTypeOther() {
String platformEmulator = "My Own Linux Distribution Y.M (64-bit)";
String guestOsType = citrixResourceBase.getGuestOsType(platformEmulator);
Assert.assertEquals(platformEmulator, guestOsType);
}
}

12
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java
View File

@ -16,6 +16,7 @@
package com.cloud.hypervisor.xenserver.resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -26,11 +27,14 @@ import com.cloud.utils.script.Script;
@RunWith(PowerMockRunner.class)
public class XcpOssResourceTest extends CitrixResourceBaseTest{
private XcpOssResource xcpOssResource = new XcpOssResource();
@Before
public void beforeTest() {
super.citrixResourceBase = new XcpOssResource();
}
@Test
public void testPatchFilePath() {
String patchFilePath = xcpOssResource.getPatchFilePath();
String patchFilePath = citrixResourceBase.getPatchFilePath();
String patch = "scripts/vm/hypervisor/xenserver/xcposs/patch";
Assert.assertEquals(patch, patchFilePath);
@ -39,12 +43,12 @@ public class XcpOssResourceTest extends CitrixResourceBaseTest{
@Test(expected = CloudRuntimeException.class)
@PrepareForTest(Script.class )
public void testGetFiles(){
testGetPathFilesExeption(xcpOssResource);
testGetPathFilesExeption();
}
@Test
@PrepareForTest(Script.class )
public void testGetFilesListReturned(){
testGetPathFilesListReturned(xcpOssResource);
testGetPathFilesListReturned();
}
}

12
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java
View File

@ -16,6 +16,7 @@
package com.cloud.hypervisor.xenserver.resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -27,11 +28,14 @@ import com.cloud.utils.script.Script;
@RunWith(PowerMockRunner.class)
public class XcpServerResourceTest extends CitrixResourceBaseTest{
private XcpServerResource xcpServerResource = new XcpServerResource();
@Before
public void beforeTest() {
super.citrixResourceBase = new XcpServerResource();
}
@Test
public void testPatchFilePath() {
String patchFilePath = xcpServerResource.getPatchFilePath();
String patchFilePath = citrixResourceBase.getPatchFilePath();
String patch = "scripts/vm/hypervisor/xenserver/xcpserver/patch";
Assert.assertEquals(patch, patchFilePath);
@ -40,12 +44,12 @@ public class XcpServerResourceTest extends CitrixResourceBaseTest{
@Test(expected = CloudRuntimeException.class)
@PrepareForTest(Script.class )
public void testGetFilesExeption(){
testGetPathFilesExeption(xcpServerResource);
testGetPathFilesExeption();
}
@Test
@PrepareForTest(Script.class )
public void testGetFilesListReturned(){
testGetPathFilesListReturned(xcpServerResource);
testGetPathFilesListReturned();
}
}

15
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java
View File

@ -16,6 +16,7 @@
package com.cloud.hypervisor.xenserver.resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -23,26 +24,32 @@ import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@RunWith(PowerMockRunner.class)
public class XenServer56FP1ResourceTest extends CitrixResourceBaseTest{
private XenServer56FP1Resource xenServer56FP1Resource = new XenServer56FP1Resource();
@Before
public void beforeTest() {
super.citrixResourceBase = new XenServer56FP1Resource();
}
@Test
public void testPatchFilePath() {
String patchFilePath = xenServer56FP1Resource.getPatchFilePath();
String patchFilePath = citrixResourceBase.getPatchFilePath();
String patch = "scripts/vm/hypervisor/xenserver/xenserver56fp1/patch";
Assert.assertEquals(patch, patchFilePath);
}
@Test(expected = CloudRuntimeException.class)
@PrepareForTest(Script.class )
public void testGetFiles(){
testGetPathFilesExeption(xenServer56FP1Resource);
testGetPathFilesExeption();
}
@Test
@PrepareForTest(Script.class )
public void testGetFilesListReturned(){
testGetPathFilesListReturned(xenServer56FP1Resource);
testGetPathFilesListReturned();
}
}

13
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java
View File

@ -16,6 +16,7 @@
package com.cloud.hypervisor.xenserver.resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -26,11 +27,14 @@ import com.cloud.utils.script.Script;
@RunWith(PowerMockRunner.class)
public class XenServer56ResourceTest extends CitrixResourceBaseTest {
private XenServer56Resource xenServer56Resource = new XenServer56Resource();
@Before
public void beforeTest() {
super.citrixResourceBase = new XenServer56Resource();
}
@Test
public void testPatchFilePath() {
String patchFilePath = xenServer56Resource.getPatchFilePath();
String patchFilePath = citrixResourceBase.getPatchFilePath();
String patch = "scripts/vm/hypervisor/xenserver/xenserver56/patch";
Assert.assertEquals(patch, patchFilePath);
@ -39,11 +43,12 @@ public class XenServer56ResourceTest extends CitrixResourceBaseTest {
@Test(expected = CloudRuntimeException.class)
@PrepareForTest(Script.class )
public void testGetFiles(){
testGetPathFilesExeption(xenServer56Resource);
testGetPathFilesExeption();
}
@Test
@PrepareForTest(Script.class )
public void testGetFilesListReturned(){
testGetPathFilesListReturned(xenServer56Resource);
testGetPathFilesListReturned();
}
}

14
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer56SP2ResourceTest.java
View File

@ -16,6 +16,7 @@
package com.cloud.hypervisor.xenserver.resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -26,23 +27,28 @@ import com.cloud.utils.script.Script;
@RunWith(PowerMockRunner.class)
public class XenServer56SP2ResourceTest extends CitrixResourceBaseTest{
private XenServer56SP2Resource xenServer56SP2Resource = new XenServer56SP2Resource();
@Before
public void beforeTest() {
super.citrixResourceBase = new XenServer56SP2Resource();
}
@Test
public void testPatchFilePath() {
String patchFilePath = xenServer56SP2Resource.getPatchFilePath();
String patchFilePath = citrixResourceBase.getPatchFilePath();
String patch = "scripts/vm/hypervisor/xenserver/xenserver56fp1/patch";
Assert.assertEquals(patch, patchFilePath);
}
@Test(expected = CloudRuntimeException.class)
@PrepareForTest(Script.class )
public void testGetFiles(){
testGetPathFilesExeption(xenServer56SP2Resource);
testGetPathFilesExeption();
}
@Test
@PrepareForTest(Script.class )
public void testGetFilesListReturned(){
testGetPathFilesListReturned(xenServer56SP2Resource);
testGetPathFilesListReturned();
}
}

15
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer600ResourceTest.java
View File

@ -16,6 +16,7 @@
package com.cloud.hypervisor.xenserver.resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -26,23 +27,29 @@ import com.cloud.utils.script.Script;
@RunWith(PowerMockRunner.class)
public class XenServer600ResourceTest extends CitrixResourceBaseTest{
private XenServer600Resource xenServer600Resource = new XenServer600Resource();
@Before
public void beforeTest() {
super.citrixResourceBase = new XenServer600Resource();
}
@Test
public void testPatchFilePath() {
String patchFilePath = xenServer600Resource.getPatchFilePath();
String patchFilePath = citrixResourceBase.getPatchFilePath();
String patch = "scripts/vm/hypervisor/xenserver/xenserver60/patch";
Assert.assertEquals(patch, patchFilePath);
}
@Test(expected = CloudRuntimeException.class)
@PrepareForTest(Script.class )
public void testGetFiles(){
testGetPathFilesExeption(xenServer600Resource);
testGetPathFilesExeption();
}
@Test
@PrepareForTest(Script.class )
public void testGetFilesListReturned(){
testGetPathFilesListReturned(xenServer600Resource);
testGetPathFilesListReturned();
}
}

27
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer625ResourceTest.java
View File

@ -16,6 +16,7 @@
package com.cloud.hypervisor.xenserver.resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -23,26 +24,32 @@ import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@RunWith(PowerMockRunner.class)
public class XenServer625ResourceTest extends CitrixResourceBaseTest{
private Xenserver625Resource xenServer625Resource = new Xenserver625Resource();
@RunWith(PowerMockRunner.class)
public class XenServer625ResourceTest extends CitrixResourceBaseTest {
@Before
public void beforeTest() {
super.citrixResourceBase = new Xenserver625Resource();
}
@Test
public void testPatchFilePath() {
String patchFilePath = xenServer625Resource.getPatchFilePath();
String patchFilePath = citrixResourceBase.getPatchFilePath();
String patch = "scripts/vm/hypervisor/xenserver/xenserver62/patch";
Assert.assertEquals(patch, patchFilePath);
}
@Test(expected = CloudRuntimeException.class)
@PrepareForTest(Script.class )
public void testGetFiles(){
testGetPathFilesExeption(xenServer625Resource);
@PrepareForTest(Script.class)
public void testGetFiles() {
testGetPathFilesExeption();
}
@Test
@PrepareForTest(Script.class )
public void testGetFilesListReturned(){
testGetPathFilesListReturned(xenServer625Resource);
@PrepareForTest(Script.class)
public void testGetFilesListReturned() {
testGetPathFilesListReturned();
}
}

13
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServer650ResourceTest.java
View File

@ -16,6 +16,7 @@
package com.cloud.hypervisor.xenserver.resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -26,11 +27,14 @@ import com.cloud.utils.script.Script;
@RunWith(PowerMockRunner.class)
public class XenServer650ResourceTest extends CitrixResourceBaseTest{
private XenServer650Resource xenServer650Resource = new XenServer650Resource();
@Before
public void beforeTest() {
super.citrixResourceBase = new XenServer650Resource();
}
@Test
public void testPatchFilePath() {
String patchFilePath = xenServer650Resource.getPatchFilePath();
String patchFilePath = citrixResourceBase.getPatchFilePath();
String patch = "scripts/vm/hypervisor/xenserver/xenserver65/patch";
Assert.assertEquals(patch, patchFilePath);
@ -39,11 +43,12 @@ public class XenServer650ResourceTest extends CitrixResourceBaseTest{
@Test(expected = CloudRuntimeException.class)
@PrepareForTest(Script.class )
public void testGetFiles(){
testGetPathFilesExeption(xenServer650Resource);
testGetPathFilesExeption();
}
@Test
@PrepareForTest(Script.class )
public void testGetFilesListReturned(){
testGetPathFilesListReturned(xenServer650Resource);
testGetPathFilesListReturned();
}
}