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:26 UTC
[4/4] git commit: updated refs/heads/master to 638f1cf
Merge pull request #1049 from DaanHoogland/CLOUDSTACK-9047
CLOUDSTACK-9047 rename enumsmake enums adhere to best practice naming conventions
* pr/1049:
CLOUDSTACK-9046 rename enums to adhere to naming conventions
CLOUDSTACK-9046 renamed enums in kvm plugin
CLOUDSTACK-9047 use 'State's only with context there are more types called 'State' (or to be called so but now 'state') So remove imports and prepend their enclosing class/context to them.
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/638f1cf0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/638f1cf0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/638f1cf0
Branch: refs/heads/master
Commit: 638f1cf091056f518006af46b49bbb9dd7653b92
Parents: afe1130 c669c93
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 6 20:17:03 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 6 20:17:04 2015 +0100
----------------------------------------------------------------------
api/src/com/cloud/gpu/GPU.java | 4 +-
api/src/com/cloud/vm/NicIpAlias.java | 2 +-
.../orchestration/NetworkOrchestrator.java | 7 ++-
.../src/com/cloud/vm/dao/NicIpAliasDao.java | 4 +-
.../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java | 8 +--
.../src/com/cloud/vm/dao/NicIpAliasVO.java | 8 +--
.../kvm/resource/LibvirtNetworkDef.java | 14 +++---
.../kvm/resource/LibvirtSecretDef.java | 14 +++---
.../kvm/resource/LibvirtStoragePoolDef.java | 32 ++++++------
.../resource/LibvirtStoragePoolXMLParser.java | 10 ++--
.../kvm/resource/LibvirtStorageVolumeDef.java | 16 +++---
.../resource/LibvirtStorageVolumeXMLParser.java | 2 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 42 ++++++++--------
.../kvm/storage/ManagedNfsStorageAdaptor.java | 8 +--
.../kvm/resource/LibvirtSecretDefTest.java | 6 +--
.../kvm/resource/LibvirtStoragePoolDefTest.java | 12 ++---
server/src/com/cloud/api/ApiResponseHelper.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../network/router/CommandSetupHelper.java | 7 ++-
.../VirtualNetworkApplianceManagerImpl.java | 53 ++++++++++----------
.../cloud/network/rules/DhcpSubNetRules.java | 2 +-
server/src/com/cloud/server/StatsCollector.java | 10 ++--
22 files changed, 131 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/638f1cf0/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/638f1cf0/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/638f1cf0/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/638f1cf0/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/638f1cf0/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 419537f,32469db..41cc558
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@@ -248,8 -248,9 +247,8 @@@ import com.cloud.vm.dao.VMInstanceDao
* VirtualNetworkApplianceManagerImpl manages the different types of virtual
* network appliances available in the Cloud Stack.
*/
-@Local(value = { VirtualNetworkApplianceManager.class, VirtualNetworkApplianceService.class })
public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService, VirtualMachineGuru, Listener,
- Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
+ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualMachine> {
private static final Logger s_logger = Logger.getLogger(VirtualNetworkApplianceManagerImpl.class);
@Inject