diff --git a/api/src/com/cloud/gpu/GPU.java b/api/src/com/cloud/gpu/GPU.java index 9177edbf9c1..8aa54c0c0f8 100644 --- a/api/src/com/cloud/gpu/GPU.java +++ b/api/src/com/cloud/gpu/GPU.java @@ -24,7 +24,7 @@ public class GPU { vgpuType } - public enum vGPUType { + public enum GPUType { GRID_K100("GRID K100"), GRID_K120Q("GRID K120Q"), GRID_K140Q("GRID K140Q"), @@ -36,7 +36,7 @@ public class GPU { private String type; - vGPUType(String type) { + GPUType(String type) { this.type = type; } diff --git a/api/src/com/cloud/vm/NicIpAlias.java b/api/src/com/cloud/vm/NicIpAlias.java index d7431ba31e0..964a90fff54 100644 --- a/api/src/com/cloud/vm/NicIpAlias.java +++ b/api/src/com/cloud/vm/NicIpAlias.java @@ -27,7 +27,7 @@ public interface NicIpAlias extends ControlledEntity, Identity, InternalIdentity /** * @return id in the CloudStack database */ - enum state { + enum State { active, revoked, } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index f2c6fc33d44..35006dfdd3f 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -1756,9 +1756,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra Network network = _networksDao.findById(nic.getNetworkId()); DhcpServiceProvider dhcpServiceProvider = getDhcpServiceProvider(network); try { - final NicIpAliasVO ipAlias = _nicIpAliasDao.findByGatewayAndNetworkIdAndState(nic.getIPv4Gateway(), network.getId(), NicIpAlias.state.active); + final NicIpAliasVO ipAlias = _nicIpAliasDao.findByGatewayAndNetworkIdAndState(nic.getIPv4Gateway(), network.getId(), NicIpAlias.State.active); if (ipAlias != null) { - ipAlias.setState(NicIpAlias.state.revoked); + ipAlias.setState(NicIpAlias.State.revoked); Transaction.execute(new TransactionCallbackNoReturn() { @Override public void doInTransactionWithoutResult(TransactionStatus status) { diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java index b1cd02b5e76..b79c101b828 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java @@ -54,8 +54,8 @@ public interface NicIpAliasDao extends GenericDao { public NicIpAliasVO findByIp4AddressAndVmId(String ip4Address, long vmId); - NicIpAliasVO findByGatewayAndNetworkIdAndState(String gateway, long networkId, NicIpAlias.state state); + NicIpAliasVO findByGatewayAndNetworkIdAndState(String gateway, long networkId, NicIpAlias.State state); - List listByNetworkIdAndState(long networkId, NicIpAlias.state state); + List listByNetworkIdAndState(long networkId, NicIpAlias.State state); } \ No newline at end of file diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java index a267218008a..0c98a6c63e9 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java @@ -84,7 +84,7 @@ public class NicIpAliasDaoImpl extends GenericDaoBase implem } @Override - public List listByNetworkIdAndState(long networkId, NicIpAlias.state state) { + public List listByNetworkIdAndState(long networkId, NicIpAlias.State state) { SearchCriteria sc = AllFieldsSearch.create(); sc.setParameters("network", networkId); sc.setParameters("state", state); @@ -103,7 +103,7 @@ public class NicIpAliasDaoImpl extends GenericDaoBase implem public List getAliasIpForVm(long vmId) { SearchCriteria sc = AllFieldsSearch.create(); sc.setParameters("instanceId", vmId); - sc.setParameters("state", NicIpAlias.state.active); + sc.setParameters("state", NicIpAlias.State.active); return listBy(sc); } @@ -124,7 +124,7 @@ public class NicIpAliasDaoImpl extends GenericDaoBase implem SearchCriteria sc = AllFieldsSearch.create(); sc.setParameters("network", networkId); sc.setParameters("instanceId", instanceId); - sc.setParameters("state", NicIpAlias.state.active); + sc.setParameters("state", NicIpAlias.State.active); return findOneBy(sc); } @@ -134,7 +134,7 @@ public class NicIpAliasDaoImpl extends GenericDaoBase implem } @Override - public NicIpAliasVO findByGatewayAndNetworkIdAndState(String gateway, long networkId, NicIpAlias.state state) { + public NicIpAliasVO findByGatewayAndNetworkIdAndState(String gateway, long networkId, NicIpAlias.State state) { SearchCriteria sc = AllFieldsSearch.create(); sc.setParameters("gateway", gateway); sc.setParameters("network", networkId); diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java index 2f000fde8a4..7e81495faeb 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java @@ -45,7 +45,7 @@ public class NicIpAliasVO implements NicIpAlias { this.networkId = networkId; this.netmask = netmask; this.gateway = gateway; - state = NicIpAlias.state.active; + state = NicIpAlias.State.active; String cidr = NetUtils.getCidrFromGatewayAndNetmask(gateway, netmask); String[] cidrPair = cidr.split("\\/"); String cidrAddress = cidrPair[0]; @@ -99,7 +99,7 @@ public class NicIpAliasVO implements NicIpAlias { @Column(name = "state") @Enumerated(value = EnumType.STRING) - NicIpAlias.state state; + NicIpAlias.State state; @Column(name = "start_ip_of_subnet") String startIpOfSubnet; @@ -220,11 +220,11 @@ public class NicIpAliasVO implements NicIpAlias { this.gateway = gateway; } - public NicIpAlias.state getState() { + public NicIpAlias.State getState() { return state; } - public void setState(NicIpAlias.state state) { + public void setState(NicIpAlias.State state) { this.state = state; } diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 00f1a277c4a..0fa5e5074dc 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1576,7 +1576,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (vgpuVMs.containsKey(capacity.getGroupName().concat(capacity.getModelName()))) { capacityUsed += (float)vgpuVMs.get(capacity.getGroupName().concat(capacity.getModelName())) / capacity.getMaxVpuPerGpu(); } - if (capacity.getModelName().equals(GPU.vGPUType.passthrough.toString())) { + if (capacity.getModelName().equals(GPU.GPUType.passthrough.toString())) { capacityMax += capacity.getMaxCapacity(); } } diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 69e70e6cd9e..d890023e9fc 100644 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -3265,7 +3265,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } } else { // !isAccountSpecific - final NicIpAliasVO ipAlias = _nicIpAliasDao.findByGatewayAndNetworkIdAndState(vlanRange.getVlanGateway(), vlanRange.getNetworkId(), NicIpAlias.state.active); + final NicIpAliasVO ipAlias = _nicIpAliasDao.findByGatewayAndNetworkIdAndState(vlanRange.getVlanGateway(), vlanRange.getNetworkId(), NicIpAlias.State.active); //check if the ipalias belongs to the vlan range being deleted. if (ipAlias != null && vlanDbId == _publicIpAddressDao.findByIpAndSourceNetworkId(vlanRange.getNetworkId(), ipAlias.getIp4Address()).getVlanId()) { throw new InvalidParameterValueException("Cannot delete vlan range " + vlanDbId + " as " + ipAlias.getIp4Address() diff --git a/server/src/com/cloud/network/router/CommandSetupHelper.java b/server/src/com/cloud/network/router/CommandSetupHelper.java index 67c52e355d2..925961d3fb7 100644 --- a/server/src/com/cloud/network/router/CommandSetupHelper.java +++ b/server/src/com/cloud/network/router/CommandSetupHelper.java @@ -263,7 +263,7 @@ public class CommandSetupHelper { public void configDnsMasq(final VirtualRouter router, final Network network, final Commands cmds) { final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId()); - final List ipAliasVOList = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.state.active); + final List ipAliasVOList = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.State.active); final List ipList = new ArrayList(); final NicVO router_guest_nic = _nicDao.findByNtwkIdAndInstanceId(network.getId(), router.getId()); diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index d291936e95a..32469dba1ad 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1951,11 +1951,11 @@ Configurable, StateListener revokedIpAliasVOs = _nicIpAliasDao.listByNetworkIdAndState(guestNetworkId, NicIpAlias.state.revoked); + final List revokedIpAliasVOs = _nicIpAliasDao.listByNetworkIdAndState(guestNetworkId, NicIpAlias.State.revoked); s_logger.debug("Found" + revokedIpAliasVOs.size() + "ip Aliases to revoke on the router as a part of dhcp configuration"); removeRevokedIpAliasFromDb(revokedIpAliasVOs); - final List aliasVOs = _nicIpAliasDao.listByNetworkIdAndState(guestNetworkId, NicIpAlias.state.active); + final List aliasVOs = _nicIpAliasDao.listByNetworkIdAndState(guestNetworkId, NicIpAlias.State.active); s_logger.debug("Found" + aliasVOs.size() + "ip Aliases to apply on the router as a part of dhcp configuration"); final List activeIpAliasTOs = new ArrayList(); for (final NicIpAliasVO aliasVO : aliasVOs) { @@ -2232,13 +2232,13 @@ Configurable, StateListener revokedIpAliasVOs = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.state.revoked); + final List revokedIpAliasVOs = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.State.revoked); s_logger.debug("Found" + revokedIpAliasVOs.size() + "ip Aliases to revoke on the router as a part of dhcp configuration"); final List revokedIpAliasTOs = new ArrayList(); for (final NicIpAliasVO revokedAliasVO : revokedIpAliasVOs) { revokedIpAliasTOs.add(new IpAliasTO(revokedAliasVO.getIp4Address(), revokedAliasVO.getNetmask(), revokedAliasVO.getAliasCount().toString())); } - final List aliasVOs = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.state.active); + final List aliasVOs = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.State.active); s_logger.debug("Found" + aliasVOs.size() + "ip Aliases to apply on the router as a part of dhcp configuration"); final List activeIpAliasTOs = new ArrayList(); for (final NicIpAliasVO aliasVO : aliasVOs) { diff --git a/server/src/com/cloud/network/rules/DhcpSubNetRules.java b/server/src/com/cloud/network/rules/DhcpSubNetRules.java index a70aa810887..ed5513795a3 100644 --- a/server/src/com/cloud/network/rules/DhcpSubNetRules.java +++ b/server/src/com/cloud/network/rules/DhcpSubNetRules.java @@ -94,7 +94,7 @@ public class DhcpSubNetRules extends RuleApplier { // networks. if (!NetUtils.sameSubnet(domrGuestNic.getIPv4Address(), _nic.getIPv4Address(), _nic.getIPv4Netmask())) { final NicIpAliasDao nicIpAliasDao = visitor.getVirtualNetworkApplianceFactory().getNicIpAliasDao(); - final List aliasIps = nicIpAliasDao.listByNetworkIdAndState(domrGuestNic.getNetworkId(), NicIpAlias.state.active); + final List aliasIps = nicIpAliasDao.listByNetworkIdAndState(domrGuestNic.getNetworkId(), NicIpAlias.State.active); boolean ipInVmsubnet = false; for (final NicIpAliasVO alias : aliasIps) { // check if any of the alias ips belongs to the Vm's subnet. diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index 9f3c8cb89ab..ca86cfd0804 100644 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@ -125,11 +125,11 @@ import com.cloud.vm.dao.VMInstanceDao; @Component public class StatsCollector extends ManagerBase implements ComponentMethodInterceptable { - public static enum externalStatsProtocol { + public static enum ExternalStatsProtocol { NONE("none"), GRAPHITE("graphite"); String _type; - externalStatsProtocol(String type) { + ExternalStatsProtocol(String type) { _type = type; } @@ -218,7 +218,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc String externalStatsHost = null; int externalStatsPort = -1; boolean externalStatsEnabled = false; - externalStatsProtocol externalStatsType = externalStatsProtocol.NONE; + ExternalStatsProtocol externalStatsType = ExternalStatsProtocol.NONE; private ScheduledExecutorService _diskStatsUpdateExecutor; private int _usageAggregationRange = 1440; @@ -266,7 +266,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc String scheme = uri.getScheme(); try { - externalStatsType = externalStatsProtocol.valueOf(scheme.toUpperCase()); + externalStatsType = ExternalStatsProtocol.valueOf(scheme.toUpperCase()); } catch (IllegalArgumentException e) { s_logger.info(scheme + " is not a valid protocol for external statistics. No statistics will be send."); } @@ -492,7 +492,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc * Currently only Graphite is supported */ if (!metrics.isEmpty()) { - if (externalStatsType != null && externalStatsType == externalStatsProtocol.GRAPHITE) { + if (externalStatsType != null && externalStatsType == ExternalStatsProtocol.GRAPHITE) { if (externalStatsPort == -1) { externalStatsPort = 2003;