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 2015/12/06 20:17:25 UTC
[3/4] git commit: updated refs/heads/master to 638f1cf
CLOUDSTACK-9046 rename enums to adhere to naming conventions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c669c93b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c669c93b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c669c93b
Branch: refs/heads/master
Commit: c669c93b05f4529843d811ca9b1df52f34b8deb2
Parents: 962d4b4
Author: Daan Hoogland <da...@onecht.net>
Authored: Mon Nov 9 12:12:29 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Nov 16 13:41:16 2015 +0000
----------------------------------------------------------------------
api/src/com/cloud/gpu/GPU.java | 4 ++--
api/src/com/cloud/vm/NicIpAlias.java | 2 +-
.../engine/orchestration/NetworkOrchestrator.java | 4 ++--
engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java | 4 ++--
engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java | 8 ++++----
engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java | 8 ++++----
server/src/com/cloud/api/ApiResponseHelper.java | 2 +-
.../com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
.../src/com/cloud/network/router/CommandSetupHelper.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 8 ++++----
server/src/com/cloud/network/rules/DhcpSubNetRules.java | 2 +-
server/src/com/cloud/server/StatsCollector.java | 10 +++++-----
12 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/api/src/com/cloud/gpu/GPU.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/gpu/GPU.java b/api/src/com/cloud/gpu/GPU.java
index 9177edb..8aa54c0 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/api/src/com/cloud/vm/NicIpAlias.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/NicIpAlias.java b/api/src/com/cloud/vm/NicIpAlias.java
index d7431ba..964a90f 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,
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
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 f2c6fc3..35006df 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) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java
index b1cd02b..b79c101 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<NicIpAliasVO, Long> {
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<NicIpAliasVO> listByNetworkIdAndState(long networkId, NicIpAlias.state state);
+ List<NicIpAliasVO> listByNetworkIdAndState(long networkId, NicIpAlias.State state);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java
index a267218..0c98a6c 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<NicIpAliasVO, Long> implem
}
@Override
- public List<NicIpAliasVO> listByNetworkIdAndState(long networkId, NicIpAlias.state state) {
+ public List<NicIpAliasVO> listByNetworkIdAndState(long networkId, NicIpAlias.State state) {
SearchCriteria<NicIpAliasVO> sc = AllFieldsSearch.create();
sc.setParameters("network", networkId);
sc.setParameters("state", state);
@@ -103,7 +103,7 @@ public class NicIpAliasDaoImpl extends GenericDaoBase<NicIpAliasVO, Long> implem
public List<NicIpAliasVO> getAliasIpForVm(long vmId) {
SearchCriteria<NicIpAliasVO> 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<NicIpAliasVO, Long> implem
SearchCriteria<NicIpAliasVO> 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<NicIpAliasVO, Long> implem
}
@Override
- public NicIpAliasVO findByGatewayAndNetworkIdAndState(String gateway, long networkId, NicIpAlias.state state) {
+ public NicIpAliasVO findByGatewayAndNetworkIdAndState(String gateway, long networkId, NicIpAlias.State state) {
SearchCriteria<NicIpAliasVO> sc = AllFieldsSearch.create();
sc.setParameters("gateway", gateway);
sc.setParameters("network", networkId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java
index 2f000fd..7e81495 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 00f1a27..0fa5e50 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();
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 69e70e6..d890023 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()
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/server/src/com/cloud/network/router/CommandSetupHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/CommandSetupHelper.java b/server/src/com/cloud/network/router/CommandSetupHelper.java
index 67c52e3..925961d 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<NicIpAliasVO> ipAliasVOList = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.state.active);
+ final List<NicIpAliasVO> ipAliasVOList = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.State.active);
final List<DhcpTO> ipList = new ArrayList<DhcpTO>();
final NicVO router_guest_nic = _nicDao.findByNtwkIdAndInstanceId(network.getId(), router.getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index d291936..32469db 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<VirtualMachine.State, VirtualMachine.Event, VirtualM
_networkOfferingDao.findById(_networkDao.findById(guestNetworkId).getNetworkOfferingId()), Service.Dhcp);
final String supportsMultipleSubnets = dhcpCapabilities.get(Network.Capability.DhcpAccrossMultipleSubnets);
if (supportsMultipleSubnets != null && Boolean.valueOf(supportsMultipleSubnets)) {
- final List<NicIpAliasVO> revokedIpAliasVOs = _nicIpAliasDao.listByNetworkIdAndState(guestNetworkId, NicIpAlias.state.revoked);
+ final List<NicIpAliasVO> 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<NicIpAliasVO> aliasVOs = _nicIpAliasDao.listByNetworkIdAndState(guestNetworkId, NicIpAlias.state.active);
+ final List<NicIpAliasVO> 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<IpAliasTO> activeIpAliasTOs = new ArrayList<IpAliasTO>();
for (final NicIpAliasVO aliasVO : aliasVOs) {
@@ -2232,13 +2232,13 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
}
final Commands cmds = new Commands(Command.OnError.Continue);
- final List<NicIpAliasVO> revokedIpAliasVOs = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.state.revoked);
+ final List<NicIpAliasVO> 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<IpAliasTO> revokedIpAliasTOs = new ArrayList<IpAliasTO>();
for (final NicIpAliasVO revokedAliasVO : revokedIpAliasVOs) {
revokedIpAliasTOs.add(new IpAliasTO(revokedAliasVO.getIp4Address(), revokedAliasVO.getNetmask(), revokedAliasVO.getAliasCount().toString()));
}
- final List<NicIpAliasVO> aliasVOs = _nicIpAliasDao.listByNetworkIdAndState(network.getId(), NicIpAlias.state.active);
+ final List<NicIpAliasVO> 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<IpAliasTO> activeIpAliasTOs = new ArrayList<IpAliasTO>();
for (final NicIpAliasVO aliasVO : aliasVOs) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/server/src/com/cloud/network/rules/DhcpSubNetRules.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/DhcpSubNetRules.java b/server/src/com/cloud/network/rules/DhcpSubNetRules.java
index a70aa81..ed55137 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<NicIpAliasVO> aliasIps = nicIpAliasDao.listByNetworkIdAndState(domrGuestNic.getNetworkId(), NicIpAlias.state.active);
+ final List<NicIpAliasVO> 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.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c669c93b/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index 9f3c8cb..ca86cfd 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;