This is an automated email from the ASF dual-hosted git repository.
vishesh pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit fe5d7412364e2d15263707f60ab30313ebe06392
Merge: 0043540fa30 9d748f0837f
Author: Vishesh <vishes...@gmail.com>
AuthorDate: Tue Mar 19 13:58:44 2024 +0530
Merge branch '4.18' into '4.19'
.../java/com/cloud/network/router/VirtualNetworkApplianceManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc
server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java
index 387e50519e9,d569d3297b4..f77081aa96c
---
a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java
+++
b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java
@@@ -36,47 -36,46 +36,47 @@@ import com.cloud.vm.DomainRouterVO
*/
public interface VirtualNetworkApplianceManager extends Manager,
VirtualNetworkApplianceService {
- static final String RouterTemplateXenCK = "router.template.xenserver";
- static final String RouterTemplateKvmCK = "router.template.kvm";
- static final String RouterTemplateVmwareCK = "router.template.vmware";
- static final String RouterTemplateHyperVCK = "router.template.hyperv";
- static final String RouterTemplateLxcCK = "router.template.lxc";
- static final String RouterTemplateOvm3CK = "router.template.ovm3";
- static final String SetServiceMonitorCK =
"network.router.EnableServiceMonitoring";
- static final String RouterAlertsCheckIntervalCK =
"router.alerts.check.interval";
- static final String VirtualRouterServiceOfferingCK =
"router.service.offering";
-
- static final String RouterHealthChecksConfigRefreshIntervalCK =
"router.health.checks.config.refresh.interval";
- static final String RouterHealthChecksResultFetchIntervalCK =
"router.health.checks.results.fetch.interval";
- static final String RouterHealthChecksFailuresToRecreateVrCK =
"router.health.checks.failures.to.recreate.vr";
-
- static final ConfigKey<String> RouterTemplateXen = new
ConfigKey<String>(String.class, RouterTemplateXenCK, "Advanced", "SystemVM
Template (XenServer)",
+ String RouterTemplateXenCK = "router.template.xenserver";
+ String RouterTemplateKvmCK = "router.template.kvm";
+ String RouterTemplateVmwareCK = "router.template.vmware";
+ String RouterTemplateHyperVCK = "router.template.hyperv";
+ String RouterTemplateLxcCK = "router.template.lxc";
+ String RouterTemplateOvm3CK = "router.template.ovm3";
+ String SetServiceMonitorCK = "network.router.EnableServiceMonitoring";
+ String RouterAlertsCheckIntervalCK = "router.alerts.check.interval";
+ String VirtualRouterServiceOfferingCK = "router.service.offering";
+
+ String RouterHealthChecksConfigRefreshIntervalCK =
"router.health.checks.config.refresh.interval";
+ String RouterHealthChecksResultFetchIntervalCK =
"router.health.checks.results.fetch.interval";
+ String RouterHealthChecksFailuresToRecreateVrCK =
"router.health.checks.failures.to.recreate.vr";
+ String RemoveControlIpOnStopCK = "systemvm.release.control.ip.on.stop";
+
+ ConfigKey<String> RouterTemplateXen = new ConfigKey<>(String.class,
RouterTemplateXenCK, "Advanced", "SystemVM Template (XenServer)",
"Name of the default router template on Xenserver.", true,
ConfigKey.Scope.Zone, null);
- static final ConfigKey<String> RouterTemplateKvm = new
ConfigKey<String>(String.class, RouterTemplateKvmCK, "Advanced", "SystemVM
Template (KVM)",
+ ConfigKey<String> RouterTemplateKvm = new ConfigKey<>(String.class,
RouterTemplateKvmCK, "Advanced", "SystemVM Template (KVM)",
"Name of the default router template on KVM.", true,
ConfigKey.Scope.Zone, null);
- static final ConfigKey<String> RouterTemplateVmware = new
ConfigKey<String>(String.class, RouterTemplateVmwareCK, "Advanced", "SystemVM
Template (vSphere)",
+ ConfigKey<String> RouterTemplateVmware = new ConfigKey<>(String.class,
RouterTemplateVmwareCK, "Advanced", "SystemVM Template (vSphere)",
"Name of the default router template on Vmware.", true,
ConfigKey.Scope.Zone, null);
- static final ConfigKey<String> RouterTemplateHyperV = new
ConfigKey<String>(String.class, RouterTemplateHyperVCK, "Advanced", "SystemVM
Template (HyperV)",
+ ConfigKey<String> RouterTemplateHyperV = new ConfigKey<>(String.class,
RouterTemplateHyperVCK, "Advanced", "SystemVM Template (HyperV)",
"Name of the default router template on Hyperv.", true,
ConfigKey.Scope.Zone, null);
- static final ConfigKey<String> RouterTemplateLxc = new
ConfigKey<String>(String.class, RouterTemplateLxcCK, "Advanced", "SystemVM
Template (LXC)",
+ ConfigKey<String> RouterTemplateLxc = new ConfigKey<>(String.class,
RouterTemplateLxcCK, "Advanced", "SystemVM Template (LXC)",
"Name of the default router template on LXC.", true,
ConfigKey.Scope.Zone, null);
- static final ConfigKey<String> RouterTemplateOvm3 = new
ConfigKey<String>(String.class, RouterTemplateOvm3CK, "Advanced", "SystemVM
Template (Ovm3)",
+ ConfigKey<String> RouterTemplateOvm3 = new ConfigKey<>(String.class,
RouterTemplateOvm3CK, "Advanced", "SystemVM Template (Ovm3)",
"Name of the default router template on Ovm3.", true,
ConfigKey.Scope.Zone, null);
- static final ConfigKey<Boolean> SetServiceMonitor = new
ConfigKey<Boolean>(Boolean.class, SetServiceMonitorCK, "Advanced", "true",
+ ConfigKey<Boolean> SetServiceMonitor = new ConfigKey<>(Boolean.class,
SetServiceMonitorCK, "Advanced", "true",
"service monitoring in router enable/disable option, default
true", true, ConfigKey.Scope.Zone, null);
- static final ConfigKey<Integer> RouterAlertsCheckInterval = new
ConfigKey<Integer>(Integer.class, RouterAlertsCheckIntervalCK, "Advanced",
"1800",
+ ConfigKey<Integer> RouterAlertsCheckInterval = new
ConfigKey<>(Integer.class, RouterAlertsCheckIntervalCK, "Advanced", "1800",
"Interval (in seconds) to check for alerts in Virtual Router.",
false, ConfigKey.Scope.Global, null);
- static final ConfigKey<Boolean> RouterVersionCheckEnabled = new
ConfigKey<Boolean>("Advanced", Boolean.class, "router.version.check", "true",
+ ConfigKey<Boolean> RouterVersionCheckEnabled = new
ConfigKey<>("Advanced", Boolean.class, "router.version.check", "true",
"If true, router minimum required version is checked before
sending command", false);
- static final ConfigKey<Boolean> UseExternalDnsServers = new
ConfigKey<Boolean>(Boolean.class, "use.external.dns", "Advanced", "false",
+ ConfigKey<Boolean> UseExternalDnsServers = new ConfigKey<>(Boolean.class,
"use.external.dns", "Advanced", "false",
"Bypass internal dns, use external dns1 and dns2", true,
ConfigKey.Scope.Zone, null);
- ConfigKey<Boolean> ExposeDnsAndBootpServer = new
ConfigKey<>(Boolean.class, "expose.dns.externally", "Advanced", "true",
- static final ConfigKey<Boolean> ExposeDnsAndBootpServer = new
ConfigKey<Boolean>(Boolean.class, "expose.dns.externally", "Advanced", "false",
++ ConfigKey<Boolean> ExposeDnsAndBootpServer = new
ConfigKey<>(Boolean.class, "expose.dns.externally", "Advanced", "false",
"open dns, dhcp and bootp on the public interface", true,
ConfigKey.Scope.Zone, null);
- static final ConfigKey<String> VirtualRouterServiceOffering = new
ConfigKey<String>(String.class, VirtualRouterServiceOfferingCK, "Advanced", "",
+ ConfigKey<String> VirtualRouterServiceOffering = new
ConfigKey<>(String.class, VirtualRouterServiceOfferingCK, "Advanced", "",
"Uuid of the service offering used by virtual routers; if NULL -
system offering will be used", true, ConfigKey.Scope.Account, null);
// Health checks
