cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/2] git commit: updated refs/heads/4.9 to 9bf4281
Date Thu, 23 Mar 2017 09:50:22 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.9 929c8231c -> 9bf428162


CLOUDSTACK-9811: fix duplicated nics on VR caused by nic name p<slot_number>p<port_number>


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

Branch: refs/heads/4.9
Commit: bf93b6313e537a56b27f61fdaaf7319fc04a8058
Parents: 929c823
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Thu Mar 16 11:48:35 2017 +0100
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Mon Mar 20 07:32:31 2017 +0100

----------------------------------------------------------------------
 .../hypervisor/kvm/resource/LibvirtComputingResource.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf93b631/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 7e2b1bf..c26c3e2 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1464,7 +1464,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
 
     private String getBroadcastUriFromBridge(final String brName) {
         final String pif = matchPifFileInDirectory(brName);
-        final Pattern pattern = Pattern.compile("(\\D+)(\\d+)(\\D*)(\\d*)");
+        final Pattern pattern = Pattern.compile("(\\D+)(\\d+)(\\D*)(\\d*)(\\D*)(\\d*)");
         final Matcher matcher = pattern.matcher(pif);
         s_logger.debug("getting broadcast uri for pif " + pif + " and bridge " + brName);
         if(matcher.find()) {
@@ -1472,7 +1472,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
                 return BroadcastDomainType.Vxlan.toUri(matcher.group(2)).toString();
             }
             else{
-                if (!matcher.group(4).isEmpty()) {
+                if (!matcher.group(6).isEmpty()) {
+                    return BroadcastDomainType.Vlan.toUri(matcher.group(6)).toString();
+                } else if (!matcher.group(4).isEmpty()) {
                     return BroadcastDomainType.Vlan.toUri(matcher.group(4)).toString();
                 } else {
                     //untagged or not matching (eth|bond|team)#.#


Mime
View raw message