Skip to content

Commit 2c9149a

Browse files
author
Daan Hoogland
committed
sonar alerts and other suggestions
1 parent 96d9312 commit 2c9149a

12 files changed

Lines changed: 16 additions & 18 deletions

File tree

engine/components-api/src/main/java/com/cloud/storage/StorageManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ public interface StorageManager extends StorageService {
179179
ConfigKey<Integer> VmDiskThrottlingIopsWriteRate = new ConfigKey<>("Advanced", Integer.class, "vm.disk.throttling.iops_write_rate", "0",
180180
"Default disk I/O writerate in requests per second allowed in User vm's disk.", true);
181181

182-
ConfigKey<Integer> VmDiskThrottlingBytesReadRate = new ConfigKey<>("Advanced", Integer.class, "vm.disk.throttling.bytes_read_rate", "0",
182+
ConfigKey<Long> VmDiskThrottlingBytesReadRate = new ConfigKey<>("Advanced", Long.class, "vm.disk.throttling.bytes_read_rate", "0",
183183
"Default disk I/O read rate in bytes per second allowed in User vm's disk.", true);
184184

185-
ConfigKey<Integer> VmDiskThrottlingBytesWriteRate = new ConfigKey<>("Advanced", Integer.class, "vm.disk.throttling.bytes_write_rate", "0",
185+
ConfigKey<Long> VmDiskThrottlingBytesWriteRate = new ConfigKey<>("Advanced", Long.class, "vm.disk.throttling.bytes_write_rate", "0",
186186
"Default disk I/O writerate in bytes per second allowed in User vm's disk.", true);
187187

188188
ConfigKey<Integer> ExpungeWorkers = new ConfigKey<>("Advanced", Integer.class, "expunge.workers", "1",

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/manager/BaremetalManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public interface BaremetalManager extends Manager, PluggableService {
4141
"After starting provision process, periodcially echo security agent installed in the template. Treat provisioning as success only if echo successfully", true);
4242

4343
ConfigKey<String> BaremetalIpmiLanInterface = new ConfigKey<>("Advanced", String.class, "baremetal.ipmi.lan.interface", "default",
44-
"option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default value 'default' means using default option of ipmitool", true);
44+
"option specified in -I option of ipmitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default value 'default' means using default option of ipmitool", true);
4545

46-
ConfigKey<String> BaremetalIpmiRetryTimes = new ConfigKey<>("Advanced", String.class, "baremetal.ipmi.fail.retry", "5",
46+
ConfigKey<Integer> BaremetalIpmiRetryTimes = new ConfigKey<>("Advanced", Integer.class, "baremetal.ipmi.fail.retry", "5",
4747
"ipmi interface will be temporary out of order after power operations(e.g. cycle, on), it leads following commands fail immediately. The value specifies retry times before accounting it as real failure", true);
4848

4949
void notifyProvisionDone(BaremetalProvisionDoneNotificationCmd cmd);

plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
178178
}
179179

180180
try {
181-
ipmiRetryTimes = Integer.parseInt(BaremetalManager.BaremetalIpmiRetryTimes.value());
181+
ipmiRetryTimes = BaremetalManager.BaremetalIpmiRetryTimes.value();
182182
} catch (Exception e) {
183183
logger.debug(e.getMessage(), e);
184184
}

plugins/network-elements/netscaler/src/main/java/com/cloud/network/element/NetscalerElement.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,8 +946,7 @@ public NetscalerLoadBalancerResponse createNetscalerLoadBalancerResponse(Externa
946946
response.setPrivateInterface(lbDetails.get("privateInterface"));
947947
response.setDeviceName(lbDeviceVO.getDeviceName());
948948
if (lbDeviceVO.getCapacity() == 0) {
949-
long defaultLbCapacity = NumbersUtil
950-
.parseLong(DefaultExternalLoadBalancerCapacity.value(), 50);
949+
long defaultLbCapacity = DefaultExternalLoadBalancerCapacity.value();
951950
response.setDeviceCapacity(defaultLbCapacity);
952951
} else {
953952
response.setDeviceCapacity(lbDeviceVO.getCapacity());

plugins/network-elements/palo-alto/src/main/java/com/cloud/network/element/PaloAltoExternalFirewallElement.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
import com.cloud.network.rules.StaticNat;
7474
import com.cloud.offering.NetworkOffering;
7575
import com.cloud.offerings.dao.NetworkOfferingDao;
76-
import com.cloud.utils.NumbersUtil;
7776
import com.cloud.utils.db.EntityManager;
7877
import com.cloud.utils.exception.CloudRuntimeException;
7978
import com.cloud.vm.NicProfile;
@@ -405,7 +404,7 @@ public PaloAltoFirewallResponse createPaloAltoFirewallResponse(ExternalFirewallD
405404
}
406405
response.setDeviceName(fwDeviceVO.getDeviceName());
407406
if (fwDeviceVO.getCapacity() == 0) {
408-
long defaultFwCapacity = NumbersUtil.parseLong(DefaultExternalFirewallCapacity.value(), 50);
407+
long defaultFwCapacity = DefaultExternalFirewallCapacity.value();
409408
response.setDeviceCapacity(defaultFwCapacity);
410409
} else {
411410
response.setDeviceCapacity(fwDeviceVO.getCapacity());

server/src/main/java/com/cloud/network/ExternalFirewallDeviceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
public interface ExternalFirewallDeviceManager extends Manager {
3838

39-
ConfigKey<String> DefaultExternalFirewallCapacity = new ConfigKey<>("Advanced", String.class, "external.firewall.default.capacity", "50",
39+
ConfigKey<Integer> DefaultExternalFirewallCapacity = new ConfigKey<>("Advanced", Integer.class, "external.firewall.default.capacity", "50",
4040
"default number of networks permitted per external load firewall device", true);
4141

4242
/**

server/src/main/java/com/cloud/network/ExternalFirewallDeviceManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl
180180
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
181181
super.configure(name, params);
182182
_resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
183-
_defaultFwCapacity = NumbersUtil.parseLong(DefaultExternalFirewallCapacity.value(), 50);
183+
_defaultFwCapacity = DefaultExternalFirewallCapacity.value();
184184
return true;
185185
}
186186

server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public interface ExternalLoadBalancerDeviceManager extends Manager {
3838

3939
public static final int DEFAULT_LOAD_BALANCER_CAPACITY = 50;
4040

41-
ConfigKey<String> DefaultExternalLoadBalancerCapacity = new ConfigKey<>("Advanced", String.class, "external.lb.default.capacity", "50",
41+
ConfigKey<Integer> DefaultExternalLoadBalancerCapacity = new ConfigKey<>("Advanced", Integer.class, "external.lb.default.capacity", "50",
4242
"default number of networks permitted per external load balancer device", true);
4343

4444
/**

server/src/main/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ public boolean manageGuestNetworkWithExternalLoadBalancer(boolean add, Network g
11421142
@Override
11431143
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
11441144
super.configure(name, params);
1145-
_defaultLbCapacity = NumbersUtil.parseLong(DefaultExternalLoadBalancerCapacity.value(), 50);
1145+
_defaultLbCapacity = DefaultExternalLoadBalancerCapacity.value();
11461146
_resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
11471147
return true;
11481148
}

server/src/main/java/com/cloud/server/ManagementServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ public interface ManagementServer extends ManagementService, PluggableService {
129129
ConfigKey<Integer> AlertPurgeDelay = new ConfigKey<>("Advanced", Integer.class, "alert.purge.delay", "0",
130130
"Alerts older than specified number days will be purged. Set this value to 0 to never delete alerts", true);
131131

132-
ConfigKey<String> ControlCidr = new ConfigKey<>("Advanced", String.class, "control.cidr", "169.254.0.0/16",
132+
ConfigKey<String> ControlCidr = new ConfigKey<>("Advanced", String.class, "control.cidr", "169.254.0.0/16", //NOSONAR: RFC 3927 link-local block, not a real/routable address
133133
"Changes the cidr for the control network traffic. Defaults to using link local. Must be unique within pods", true);
134134

135-
ConfigKey<String> ControlGateway = new ConfigKey<>("Advanced", String.class, "control.gateway", "169.254.0.1",
135+
ConfigKey<String> ControlGateway = new ConfigKey<>("Advanced", String.class, "control.gateway", "169.254.0.1", //NOSONAR: RFC 3927 link-local block, not a real/routable address
136136
"gateway for the control network traffic", true);
137137

138138
ConfigKey<Integer> DetailBatchQuerySize = new ConfigKey<>("Advanced", Integer.class, "detail.batch.query.size", "2000",

0 commit comments

Comments
 (0)