diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index 1e900930492..ff75d61e0b5 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -836,6 +836,10 @@ public class LibvirtVMDef { return _macAddr; } + public nicModel getModel() { + return _model; + } + public void setVirtualPortType(String virtualPortType) { _virtualPortType = virtualPortType; } diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java index bbe2f23fe88..c24a8d3abdd 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java @@ -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 { "" + "
" + "" + - "" + + "" + "" + "" + "" + - "" + + "" + "" + "
" + "" + - "" + + "" + "" + "" + "" + - "" + + "" + "" + "
" + "" + - "" + + "" + "" + "" + "" + - "" + + "" + "" + "
" + "" + - "" + + "" + "" + "" + "" + - "" + + "" + "" + "
" + "" + @@ -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 ifs = parser.getInterfaces(); + for (int i = 0; i < ifs.size(); i++) { + assertEquals(ifModel, ifs.get(i).getModel()); + assertEquals(ifType, ifs.get(i).getNetType()); + } } } \ No newline at end of file