git commit: updated refs/heads/master to 2145505

[weizhou]

Updated Branches:
  refs/heads/master 5d974a234 -> 2145505d3


CLOUDSTACK-5280: fix issue in getBroadcastUriFromBridge
(cherry picked from commit 96842475d95532cb39f0838b77b02f68c1d26dcf)

Conflicts:

        
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2145505d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2145505d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2145505d

Branch: refs/heads/master
Commit: 2145505d3092472d0365b7a53679d6eb44708c42
Parents: 5d974a2
Author: Wei Zhou <w.z...@leaseweb.com>
Authored: Tue Nov 26 23:37:39 2013 +0100
Committer: Wei Zhou <w.z...@leaseweb.com>
Committed: Tue Nov 26 23:37:39 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/2145505d/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 834e26e..c88a279 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
@@ -1609,13 +1609,13 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 
     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 + 
"attached to physical interface" + pif);