You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2026/10/22 09:39:37 UTC
(cloudstack) 01/01: use ConfigKeys for remote access VPN and VPC settings
This is an automated email from the ASF dual-hosted git repository.
DaanHoogland pushed a commit to branch ghi10752-config-vpn-vpc
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 2658380c3c3ca46d7355556ef65828fa84a25f8c
Author: Daan Hoogland <da...@apache.org>
AuthorDate: Thu Oct 22 11:35:31 2026 +0200
use ConfigKeys for remote access VPN and VPC settings
Part of the split of #13884 (phase out the Config enum, #10752).
Co-Authored-By: Claude Opus 5.5 <no...@anthropic.com>
---
.../src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java | 3 +--
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java | 7 +++----
.../main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 7 ++-----
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 0c16307a983..c3e008698b8 100644
--- a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -47,7 +47,6 @@ import com.cloud.agent.api.OvsSetupBridgeCommand;
import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
import com.cloud.agent.api.OvsVpcRoutingPolicyConfigCommand;
import com.cloud.agent.manager.Commands;
-import com.cloud.configuration.Config;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.host.Host;
@@ -236,7 +235,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
throws AgentUnavailableException, OperationTimedoutException {
String endpointIp = null;
// Fetch fefault name for network label from configuration
- String physNetLabel = _configDao.getValue(Config.OvsTunnelNetworkDefaultLabel.key());
+ String physNetLabel = OvsTunnelNetworkDefaultLabel.value();
Long physNetId = nw.getPhysicalNetworkId();
PhysicalNetworkTrafficType physNetTT =
_physNetTTDao.findBy(physNetId, TrafficType.Guest);
diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
index 22f147353b4..8b7ae443f1c 100644
--- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -89,7 +89,6 @@ import com.cloud.alert.AlertManager;
import com.cloud.api.query.dao.VpcOfferingJoinDao;
import com.cloud.api.query.vo.VpcOfferingJoinVO;
import com.cloud.bgp.BGPService;
-import com.cloud.configuration.Config;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.configuration.ConfigurationManagerImpl;
import com.cloud.configuration.Resource.ResourceType;
@@ -515,10 +514,10 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
});
final Map<String, String> configs = _configDao.getConfiguration(params);
- final String value = configs.get(Config.VpcCleanupInterval.key());
+ final String value = configs.get(VpcCleanupInterval.key());
_cleanupInterval = NumbersUtil.parseInt(value, 60 * 60); // 1 hour
- final String maxNtwks = configs.get(Config.VpcMaxNetworks.key());
+ final String maxNtwks = configs.get(VpcMaxNetworks.key());
_maxNetworks = NumbersUtil.parseInt(maxNtwks, 3); // max=3 is default
IpAddressSearch = _ipAddressDao.createSearchBuilder();
@@ -2583,7 +2582,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
try {
// check number of active networks in vpc
if (_ntwkDao.countVpcNetworks(vpc.getId()) >= _maxNetworks) {
- logger.warn(String.format("Failed to create a new VPC Guest Network because the number of networks per VPC has reached its maximum capacity of [%s]. Increase it by modifying global config [%s].", _maxNetworks, Config.VpcMaxNetworks));
+ logger.warn(String.format("Failed to create a new VPC Guest Network because the number of networks per VPC has reached its maximum capacity of [%s]. Increase it by modifying global config [%s].", _maxNetworks, VpcMaxNetworks.key()));
throw new CloudRuntimeException(String.format("Number of networks per VPC cannot surpass [%s].", _maxNetworks));
}
diff --git a/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 5d3211d9fb6..f8e6b3e7e5b 100644
--- a/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -55,7 +55,6 @@ import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.alert.AlertManager;
-import com.cloud.configuration.Config;
import com.cloud.event.ActionEvent;
import com.cloud.event.ActionEventUtils;
import com.cloud.event.EventTypes;
@@ -88,7 +87,6 @@ import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.User;
import com.cloud.user.dao.AccountDao;
-import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.StringUtils;
import com.cloud.utils.Ternary;
@@ -187,9 +185,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- Map<String, String> configs = _configDao.getConfiguration(params);
- _connLimit = NumbersUtil.parseInt(configs.get(Config.Site2SiteVpnConnectionPerVpnGatewayLimit.key()), 4);
- _subnetsLimit = NumbersUtil.parseInt(configs.get(Config.Site2SiteVpnSubnetsPerCustomerGatewayLimit.key()), 10);
+ _connLimit = Site2SiteVpnConnectionPerVpnGatewayLimit.value();
+ _subnetsLimit = Site2SiteVpnSubnetsPerCustomerGatewayLimit.value();
assert (_s2sProviders.iterator().hasNext()) : "Did not get injected with a list of S2S providers!";
_vpnCheckExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpnCustomerGateway-ExcludedAndObsoleteCheck"));
return true;