Skip to content

kvm agent: get the right controll cidr #7580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 7 commits into from
Jul 7, 2023
Merged

kvm agent: get the right controll cidr #7580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e30cee7
get the right controll cidr
DaanHoogland Jun 1, 2023
d992ffa
restore old property
DaanHoogland Jun 1, 2023
25863f2
parameter naming convention
DaanHoogland Jun 1, 2023
44752f1
rat
DaanHoogland Jun 1, 2023
d4da6fa
single-l
DaanHoogland Jun 26, 2023
41b27a1
default should come from property
DaanHoogland Jul 4, 2023
8bc4f4f
params removed
DaanHoogland Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,13 @@ public Property<Integer> getWorkers() {
*/
public static final Property<Integer> IOTHREADS = new Property<>("iothreads", 1);

/**
* BGP controll CIDR
* Data type: String.<br>
* Default value: <code>169.254.0.0/16</code>
*/
public static final Property<String> CONTROL_CIDR = new Property<>("control.cidr", "169.254.0.0/16");

public static class Property <T>{
private String name;
private T defaultValue;
Expand Down
5 changes: 1 addition & 4 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ public void configure(Map<String, Object> params) throws ConfigurationException

String networkScriptsDir = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.NETWORK_SCRIPTS_DIR);

String controlCidr = (String)params.get("control.cidr");
if (StringUtils.isNotBlank(controlCidr)) {
_controlCidr = controlCidr;
}
_controlCidr = getControlCidr(_controlCidr);

String value = (String)params.get("scripts.timeout");
_timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000;
Expand Down
6 changes: 1 addition & 5 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import javax.naming.ConfigurationException;

import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.libvirt.LibvirtException;

Expand Down Expand Up @@ -71,10 +70,7 @@ public void configure(Map<String, Object> params) throws ConfigurationException
}
_ivsIfUpPath = Script.findScript(utilScriptsDir, "qemu-ivs-ifup");

String controlCidr = (String)params.get("control.cidr");
if (StringUtils.isNotBlank(controlCidr)) {
_controlCidr = controlCidr;
}
_controlCidr = getControlCidr(_controlCidr);
}

@Override
Expand Down
5 changes: 1 addition & 4 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@ public void configure(Map<String, Object> params) throws ConfigurationException
dpdkDriver = new DpdkDriverImpl();
}

String controlCidr = (String)params.get("control.cidr");
if (StringUtils.isNotBlank(controlCidr)) {
_controlCidr = controlCidr;
}
_controlCidr = getControlCidr(_controlCidr);

String value = (String)params.get("scripts.timeout");
_timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000;
Expand Down
7 changes: 7 additions & 0 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

import javax.naming.ConfigurationException;

import com.cloud.agent.properties.AgentProperties;
import com.cloud.agent.properties.AgentPropertiesFileHandler;
import org.libvirt.LibvirtException;

import com.cloud.agent.api.to.NicTO;
Expand All @@ -41,6 +43,11 @@ public void configure(Map<String, Object> params) throws ConfigurationException
_pifs = (Map<String, String>)params.get("libvirt.host.pifs");
}

protected String getControlCidr(String defaultValue) {
String controlCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROL_CIDR);
return controlCidr;
}

@Override
public abstract LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicAdapter, Map<String, String> extraConfig) throws InternalErrorException, LibvirtException;

Expand Down