This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 5f23171ff30f4b36aa5f5353adb912e307669f46 Merge: afce828 97f21c1 Author: Rohit Yadav <[email protected]> AuthorDate: Tue Jun 23 12:27:48 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../com/cloud/vm/VirtualMachineManagerImpl.java | 1 - .../xenserver/resource/CitrixResourceBase.java | 33 +++++------- .../xenbase/CitrixMigrateCommandWrapper.java | 3 +- .../wrapper/xenbase/CitrixStartCommandWrapper.java | 59 ++++++++++++---------- .../network/element/ConfigDriveNetworkElement.java | 12 ++--- 5 files changed, 53 insertions(+), 55 deletions(-) diff --cc plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index ea168d5,f9ec05a..87adcb3 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@@ -204,8 -200,13 +204,14 @@@ public abstract class CitrixResourceBas } private final static int BASE_TO_CONVERT_BYTES_INTO_KILOBYTES = 1024; + private final static String BASE_MOUNT_POINT_ON_REMOTE = "/var/cloud_mount/"; + private final static int USER_DEVICE_START_ID = 3; + + private final static String VM_NAME_ISO_SUFFIX = "-ISO"; + + private final static String VM_FILE_ISO_SUFFIX = ".iso"; + private static final XenServerConnectionPool ConnPool = XenServerConnectionPool.getInstance(); // static min values for guests on xenserver private static final long mem_128m = 134217728L;
