Fixed config key in multiple places
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50efd1da Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50efd1da Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50efd1da Branch: refs/heads/dhcpnew Commit: 50efd1da84cf7589a9c8584dbcb3087bd609f404 Parents: 56f2b9c Author: Jayapal <jaya...@apache.org> Authored: Thu Jul 2 09:56:58 2015 +0530 Committer: Jayapal <jaya...@apache.org> Committed: Wed Jul 8 15:13:13 2015 +0530 ---------------------------------------------------------------------- api/src/com/cloud/vm/UserVmService.java | 3 --- engine/api/src/com/cloud/vm/VirtualMachineManager.java | 3 +++ .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 3 --- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50efd1da/api/src/com/cloud/vm/UserVmService.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index 2935815..c0f2de9 100644 --- a/api/src/com/cloud/vm/UserVmService.java +++ b/api/src/com/cloud/vm/UserVmService.java @@ -55,12 +55,9 @@ import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.utils.exception.ExecutionException; -import org.apache.cloudstack.framework.config.ConfigKey; public interface UserVmService { - static final ConfigKey<String> VmConfigDriveLabel = new ConfigKey<String>("Hidden", String.class, "vm.configdrive.label", "config", - "The default lable name for the config drive", false); /** * Destroys one virtual machine http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50efd1da/engine/api/src/com/cloud/vm/VirtualMachineManager.java ---------------------------------------------------------------------- diff --git a/engine/api/src/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/com/cloud/vm/VirtualMachineManager.java index b1e5258..8b22656 100644 --- a/engine/api/src/com/cloud/vm/VirtualMachineManager.java +++ b/engine/api/src/com/cloud/vm/VirtualMachineManager.java @@ -52,6 +52,9 @@ public interface VirtualMachineManager extends Manager { "If set to true, StartCommand, StopCommand, CopyCommand, MigrateCommand will be synchronized on the agent side." + " If set to false, these commands become asynchronous. Default value is false.", false); + static final ConfigKey<String> VmConfigDriveLabel = new ConfigKey<String>("Hidden", String.class, "vm.configdrive.label", "config", + "The default lable name for the config drive", false); + public interface Topics { public static final String VM_POWER_STATE = "vm.powerstate"; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50efd1da/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index c61f13f..3018489 100644 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -361,9 +361,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac Integer.class, "vm.job.report.interval", "60", "Interval to send application level pings to make sure the connection is still working", false); - static final ConfigKey<String> VmConfigDriveLabel = new ConfigKey<String>("Hidden", String.class, "vm.configdrive.label", "config", - "The default lable name for the config drive", false); - ScheduledExecutorService _executor = null; protected long _nodeId; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50efd1da/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 894749c..b9c5350 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3517,7 +3517,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir String configDriveIsoRootFolder = "/tmp"; String isoFile = configDriveIsoRootFolder + "/" + vmName + "/configDrive/" + vmName + ".iso"; profile.setVmData(vmData); - profile.setConfigDriveLabel(VmConfigDriveLabel.value()); + profile.setConfigDriveLabel(VirtualMachineManager.VmConfigDriveLabel.value()); profile.setConfigDriveIsoRootFolder(configDriveIsoRootFolder); profile.setConfigDriveIsoFile(isoFile); } @@ -5292,7 +5292,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir @Override public ConfigKey<?>[] getConfigKeys() { - return new ConfigKey<?>[] {EnableDynamicallyScaleVm, VmIpFetchWaitInterval, VmIpFetchTrialMax, VmIpFetchThreadPoolMax, VmConfigDriveLabel}; + return new ConfigKey<?>[] {EnableDynamicallyScaleVm, VmIpFetchWaitInterval, VmIpFetchTrialMax, VmIpFetchThreadPoolMax}; } @Override
