From 96842475d95532cb39f0838b77b02f68c1d26dcf Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 26 Nov 2013 23:35:38 +0100 Subject: [PATCH] CLOUDSTACK-5280: fix issue in getBroadcastUriFromBridge --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 50f43c0f670..7b4b8b66d0c 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