From 140cd7c227866dbdb48449c8f06be2e5ba84ef23 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Thu, 2 Jul 2015 09:56:58 +0530 Subject: [PATCH] CLOUDSTACK-8324: Fixed config key in multiple places --- 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(-) diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index 2935815a103..c0f2de99245 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 VmConfigDriveLabel = new ConfigKey("Hidden", String.class, "vm.configdrive.label", "config", - "The default lable name for the config drive", false); /** * Destroys one virtual machine diff --git a/engine/api/src/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/com/cloud/vm/VirtualMachineManager.java index b1e5258af79..8b226564229 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 VmConfigDriveLabel = new ConfigKey("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"; } diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index c61f13fc1da..30184890051 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 VmConfigDriveLabel = new ConfigKey("Hidden", String.class, "vm.configdrive.label", "config", - "The default lable name for the config drive", false); - ScheduledExecutorService _executor = null; protected long _nodeId; diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 894749cf0b3..b9c5350f236 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