Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 70B1110B2F for ; Fri, 7 Feb 2014 21:47:27 +0000 (UTC) Received: (qmail 58511 invoked by uid 500); 7 Feb 2014 21:46:45 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 57891 invoked by uid 500); 7 Feb 2014 21:46:27 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 57006 invoked by uid 99); 7 Feb 2014 21:46:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Feb 2014 21:46:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 937FC91FA97; Fri, 7 Feb 2014 21:46:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Date: Fri, 07 Feb 2014 21:46:45 -0000 Message-Id: <609dd82823c2492fb861ae6fced07fc4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] git commit: updated refs/heads/rbac to 3b58a45 test: Expand LibvirtDomainXMLParserTest with Interface test Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1baebebd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1baebebd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1baebebd Branch: refs/heads/rbac Commit: 1baebebda643fd0f4a21abb5c40eea3d5ec6c034 Parents: 41c7e22 Author: Wido den Hollander Authored: Thu Feb 6 14:40:40 2014 +0100 Committer: Wido den Hollander Committed: Thu Feb 6 14:40:40 2014 +0100 ---------------------------------------------------------------------- .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +++ .../resource/LibvirtDomainXMLParserTest.java | 26 ++++++++++++++------ 2 files changed, 22 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1baebebd/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java ---------------------------------------------------------------------- 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 1e90093..ff75d61 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; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1baebebd/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java ---------------------------------------------------------------------- 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 bbe2f23..c24a8d3 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