Updated Branches: refs/heads/4.1 1e154ce5f -> 9b9f3e2e0
Summary: KVM - Fix physical net parsing when traffic label points to tagged dev Detail: If your traffic label points to a bridge that is on a tagged interface rather than a real physical interface, cloudstack may not parse the physical interface correctly, bringing up tagged interfaces on the tagged interface. Signed-off-by: Marcus Sorensen <[email protected]> 1360798665 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9b9f3e2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9b9f3e2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9b9f3e2e Branch: refs/heads/4.1 Commit: 9b9f3e2e03134f00982f6f0c19622f7dcf828d3d Parents: 1e154ce Author: Marcus Sorensen <[email protected]> Authored: Wed Feb 13 16:37:45 2013 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Wed Feb 13 16:37:45 2013 -0700 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9b9f3e2e/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index be30766..55de11b 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -861,7 +861,7 @@ ServerResource { private String getPif(String bridge) { String pif = matchPifFileInDirectory(bridge); - File vlanfile = new File("/proc/net/vlan" + pif); + File vlanfile = new File("/proc/net/vlan/" + pif); if (vlanfile.isFile()) { pif = Script.runSimpleBashScript("grep ^Device\\: /proc/net/vlan/"
