etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run moodifyvxlan script if broadcast domain type is Netris (#18)

This commit is contained in:
Pearl Dsilva 2024-11-26 14:20:25 -05:00 committed by GitHub
parent 8163d3278c
commit 4c07565bf0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View File

@ -51,6 +51,10 @@ public class BridgeVifDriver extends VifDriverBase {
private String _controlCidr = NetUtils.getLinkLocalCIDR();
private Long libvirtVersion;
private static boolean isVxlanOrNetris(String protocol) {
return protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme()) || protocol.equals(Networks.BroadcastDomainType.Netris.scheme());
}
@Override
public void configure(Map<String, Object> params) throws ConfigurationException {
@ -177,7 +181,7 @@ public class BridgeVifDriver extends VifDriverBase {
protected boolean isBroadcastTypeVlanOrVxlan(final NicTO nic) {
return nic != null && (nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan
|| nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan);
|| nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan || nic.getBroadcastType() == Networks.BroadcastDomainType.Netris);
}
protected boolean isValidProtocolAndVnetId(final String vNetId, final String protocol) {
@ -284,7 +288,7 @@ public class BridgeVifDriver extends VifDriverBase {
private String createVnetBr(String vNetId, String pifKey, String protocol) throws InternalErrorException {
String nic = _pifs.get(pifKey);
if (nic == null || protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme())) {
if (nic == null || isVxlanOrNetris(protocol)) {
// if not found in bridge map, maybe traffic label refers to pif already?
File pif = new File("/sys/class/net/" + pifKey);
if (pif.isDirectory()) {
@ -292,7 +296,7 @@ public class BridgeVifDriver extends VifDriverBase {
}
}
String brName = "";
if (protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme())) {
if (isVxlanOrNetris(protocol)) {
brName = generateVxnetBrName(nic, vNetId);
} else {
brName = generateVnetBrName(nic, vNetId);
@ -304,7 +308,7 @@ public class BridgeVifDriver extends VifDriverBase {
private void createVnet(String vnetId, String pif, String brName, String protocol) throws InternalErrorException {
synchronized (_vnetBridgeMonitor) {
String script = _modifyVlanPath;
if (protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme())) {
if (isVxlanOrNetris(protocol)) {
script = _modifyVxlanPath;
}
final Script command = new Script(script, _timeout, logger);
@ -358,6 +362,7 @@ public class BridgeVifDriver extends VifDriverBase {
}
String scriptPath = null;
// TODO: check for netris as well
if (cmdout != null && cmdout.contains("vxlan")) {
scriptPath = _modifyVxlanPath;
} else {