You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/11/26 23:35:51 UTC
git commit: updated refs/heads/4.3 to 9684247
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 <w....@leaseweb.com>
Authored: Tue Nov 26 23:35:38 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
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