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 2378110CAF for ; Tue, 26 Nov 2013 22:35:52 +0000 (UTC) Received: (qmail 12291 invoked by uid 500); 26 Nov 2013 22:35:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 12271 invoked by uid 500); 26 Nov 2013 22:35:52 -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 12264 invoked by uid 99); 26 Nov 2013 22:35:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Nov 2013 22:35:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A5C09919180; Tue, 26 Nov 2013 22:35:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: weizhou@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to 9684247 Date: Tue, 26 Nov 2013 22:35:51 +0000 (UTC) Updated Branches: refs/heads/4.3 1fe8efc85 -> 96842475d CLOUDSTACK-5280: fix issue in getBroadcastUriFromBridge Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96842475 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96842475 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96842475 Branch: refs/heads/4.3 Commit: 96842475d95532cb39f0838b77b02f68c1d26dcf Parents: 1fe8efc Author: Wei Zhou Authored: Tue Nov 26 23:35:38 2013 +0100 Committer: Wei Zhou Committed: Tue Nov 26 23:35:38 2013 +0100 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96842475/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 50f43c0..7b4b8b6 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 @@ -1682,14 +1682,14 @@ ServerResource { private String getBroadcastUriFromBridge(String brName) { String pif= matchPifFileInDirectory(brName); - Pattern pattern = Pattern.compile("(\\D+)(\\d+)"); + Pattern pattern = Pattern.compile("(\\D+)(\\d+)(\\D*)(\\d*)"); Matcher matcher = pattern.matcher(pif); if(matcher.find()) { if (brName.startsWith("brvx")){ return BroadcastDomainType.Vxlan.toUri(matcher.group(2)).toString(); } else{ - return BroadcastDomainType.Vlan.toUri(matcher.group(2)).toString(); + return BroadcastDomainType.Vlan.toUri(matcher.group(4)).toString(); } } else { s_logger.debug("failed to get vNet id from bridge " + brName