apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.9 to master

Browse Source 
* 4.9:
  CLOUDSTACK-9811: fix duplicated nics on VR caused by nic name p<slot_number>p<port_number>
This commit is contained in:
Rajani Karuturi 2017-03-23 15:19:31 +05:30
commit ec2d4dd422
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1516,7 +1516,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private String getBroadcastUriFromBridge(final String brName) { private String getBroadcastUriFromBridge(final String brName) {
final String pif = matchPifFileInDirectory(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); final Matcher matcher = pattern.matcher(pif);
s_logger.debug("getting broadcast uri for pif " + pif + " and bridge " + brName); s_logger.debug("getting broadcast uri for pif " + pif + " and bridge " + brName);
if(matcher.find()) { if(matcher.find()) {
@ -1524,7 +1524,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return BroadcastDomainType.Vxlan.toUri(matcher.group(2)).toString(); return BroadcastDomainType.Vxlan.toUri(matcher.group(2)).toString();
} }
else{ 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(); return BroadcastDomainType.Vlan.toUri(matcher.group(4)).toString();
} else { } else {
//untagged or not matching (eth|bond|team)#.# //untagged or not matching (eth|bond|team)#.#