From 69ea932897124e7ea146b8dbb597be4d1f09806e Mon Sep 17 00:00:00 2001 From: Jayapal Date: Tue, 26 May 2015 14:42:41 +0530 Subject: [PATCH] CLOUDSTACK-8324: Config drive changes for xenserver --- api/src/com/cloud/vm/VirtualMachineProfile.java | 2 ++ .../src/com/cloud/vm/VirtualMachineProfileImpl.java | 3 ++- server/src/com/cloud/hypervisor/HypervisorGuruBase.java | 6 +++++- server/test/com/cloud/network/MockNetworkModelImpl.java | 5 +++++ server/test/com/cloud/vpc/MockNetworkModelImpl.java | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/api/src/com/cloud/vm/VirtualMachineProfile.java b/api/src/com/cloud/vm/VirtualMachineProfile.java index c092d843b6f..ed02dcb9c67 100644 --- a/api/src/com/cloud/vm/VirtualMachineProfile.java +++ b/api/src/com/cloud/vm/VirtualMachineProfile.java @@ -38,6 +38,8 @@ public interface VirtualMachineProfile { void setVmData(List vmData); + String getConfigDriveLabel(); + void setConfigDriveLabel(String configDriveLabel); String getConfigDriveIsoRootFolder(); diff --git a/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java b/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java index 7a0a07cc6f8..0afca735a13 100644 --- a/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java +++ b/engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java @@ -54,7 +54,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { List vmData = null; String configDriveLabel = null; - String configDriveIsoBaseLocation = "/tmp/"; //TODO: Make this location configurable. + String configDriveIsoBaseLocation = "/tmp/"; String configDriveIsoRootFolder = null; String configDriveIsoFile = null; @@ -273,6 +273,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { this.vmData = vmData; } + @Override public String getConfigDriveLabel() { return configDriveLabel; } diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java index 0188778e764..72c24da16a4 100644 --- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java +++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java @@ -173,7 +173,11 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis to.setEnableDynamicallyScaleVm(isDynamicallyScalable); to.setUuid(vmInstance.getUuid()); - // + to.setVmData(vmProfile.getVmData()); + to.setConfigDriveLabel(vmProfile.getConfigDriveLabel()); + to.setConfigDriveIsoRootFolder(vmProfile.getConfigDriveIsoRootFolder()); + to.setConfigDriveIsoFile(vmProfile.getConfigDriveIsoFile()); + return to; } diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java index 7b5e7cf31e0..5c89a161bb7 100644 --- a/server/test/com/cloud/network/MockNetworkModelImpl.java +++ b/server/test/com/cloud/network/MockNetworkModelImpl.java @@ -893,4 +893,9 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override + public List generateVmData(String userData, String serviceOffering, String zoneName, String vmName, long vmId, String publicKey, String password, Boolean isWindows) { + return null; + } + } diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java b/server/test/com/cloud/vpc/MockNetworkModelImpl.java index 0c9955e5211..8ed3b7c3db5 100644 --- a/server/test/com/cloud/vpc/MockNetworkModelImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkModelImpl.java @@ -908,4 +908,9 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel { return false; //To change body of implemented methods use File | Settings | File Templates. } + @Override + public List generateVmData(String userData, String serviceOffering, String zoneName, String vmName, long vmId, String publicKey, String password, Boolean isWindows) { + return null; + } + }