etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: Expand LibvirtDomainXMLParserTest with Interface test

This commit is contained in:
Wido den Hollander 2014-02-06 14:40:40 +01:00
parent 41c7e22eee
commit 1baebebda6
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
View File

@ -836,6 +836,10 @@ public class LibvirtVMDef {
return _macAddr;
}
public nicModel getModel() {
return _model;
}
public void setVirtualPortType(String virtualPortType) {
_virtualPortType = virtualPortType;
}

26
plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java
View File

@ -22,6 +22,7 @@ package com.cloud.hypervisor.kvm.resource;
import junit.framework.TestCase;
import java.util.List;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef;
public class LibvirtDomainXMLParserTest extends TestCase {
@ -34,6 +35,9 @@ public class LibvirtDomainXMLParserTest extends TestCase {
DiskDef.diskFmtType diskFormat = DiskDef.diskFmtType.QCOW2;
DiskDef.diskCacheMode diskCache = DiskDef.diskCacheMode.NONE;
InterfaceDef.nicModel ifModel = InterfaceDef.nicModel.VIRTIO;
InterfaceDef.guestNetType ifType = InterfaceDef.guestNetType.BRIDGE;
String diskLabel ="vda";
String diskPath = "/var/lib/libvirt/images/my-test-image.qcow2";
@ -96,35 +100,35 @@ public class LibvirtDomainXMLParserTest extends TestCase {
"<alias name='virtio-serial0'/>" +
"<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>" +
"</controller>" +
"<interface type='bridge'>" +
"<interface type='" + ifType.toString() + "'>" +
"<mac address='0e:00:a9:fe:02:00'/>" +
"<source bridge='cloud0'/>" +
"<target dev='vnet0'/>" +
"<model type='virtio'/>" +
"<model type='" + ifModel.toString() + "'/>" +
"<alias name='net0'/>" +
"<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>" +
"</interface>" +
"<interface type='bridge'>" +
"<interface type='" + ifType.toString() + "'>" +
"<mac address='06:c5:94:00:05:65'/>" +
"<source bridge='cloudbr1'/>" +
"<target dev='vnet1'/>" +
"<model type='virtio'/>" +
"<model type='" + ifModel.toString() + "'/>" +
"<alias name='net1'/>" +
"<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>" +
"</interface>" +
"<interface type='bridge'>" +
"<interface type='" + ifType.toString() + "'>" +
"<mac address='06:c9:f4:00:04:40'/>" +
"<source bridge='cloudbr0'/>" +
"<target dev='vnet2'/>" +
"<model type='virtio'/>" +
"<model type='" + ifModel.toString() + "'/>" +
"<alias name='net2'/>" +
"<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>" +
"</interface>" +
"<interface type='bridge'>" +
"<interface type='" + ifType.toString() + "'>" +
"<mac address='06:7e:c6:00:05:68'/>" +
"<source bridge='cloudbr1'/>" +
"<target dev='vnet3'/>" +
"<model type='virtio'/>" +
"<model type='" + ifModel.toString() + "'/>" +
"<alias name='net3'/>" +
"<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>" +
"</interface>" +
@ -180,5 +184,11 @@ public class LibvirtDomainXMLParserTest extends TestCase {
assertEquals(diskType, disks.get(diskId).getDiskType());
assertEquals(deviceType, disks.get(diskId).getDeviceType());
assertEquals(diskFormat, disks.get(diskId).getDiskFormatType());
List<InterfaceDef> ifs = parser.getInterfaces();
for (int i = 0; i < ifs.size(); i++) {
assertEquals(ifModel, ifs.get(i).getModel());
assertEquals(ifType, ifs.get(i).getNetType());
}
}
}