From 848cff63184121dd2ab1bb6d3aae0300f1c5086c Mon Sep 17 00:00:00 2001 From: alena Date: Wed, 2 Feb 2011 15:51:36 -0800 Subject: [PATCH] Use static inner class instead of enum for Param parameter (used in VirtualMachineProfile) --- .../com/cloud/vm/VirtualMachineProfile.java | 24 +++++++++++++++---- .../SecondaryStorageManagerImpl.java | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/api/src/com/cloud/vm/VirtualMachineProfile.java b/api/src/com/cloud/vm/VirtualMachineProfile.java index 9804cf38b26..dd3dda54d7d 100644 --- a/api/src/com/cloud/vm/VirtualMachineProfile.java +++ b/api/src/com/cloud/vm/VirtualMachineProfile.java @@ -40,12 +40,26 @@ import com.cloud.user.Account; * @param a VirtualMachine */ public interface VirtualMachineProfile { + - enum Param { - VmPassword, - ControlNic, - RestartNetwork, - } + public static class Param { + + public static final Param VmPassword = new Param("VmPassword"); + public static final Param ControlNic = new Param("ControlNic"); + public static final Param RestartNetwork = new Param("RestartNetwork"); + + private String name; + + public Param(String name) { + synchronized(Param.class) { + this.name = name; + } + } + + public String getName() { + return name; + } + } String getHostName(); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 6053ba39924..447055c0e96 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -1148,6 +1148,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V _secStorageVmDao.update(secVm.getId(), secVm); return true; } + @Override public boolean finalizeStart(VirtualMachineProfile profile, long hostId, Commands cmds, ReservationContext context) {