You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/04/02 20:22:52 UTC
[11/39] git commit: updated refs/heads/master to 3e28747
Refactoring the whole XsHost thing
Refactor the ReadyCommand
Fixing the old test
Adding basic tests for ReadyCommandWrapper
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30e72e4a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30e72e4a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30e72e4a
Branch: refs/heads/master
Commit: 30e72e4a156a224f109f67b277e1e439bdcc9158
Parents: c3ae8c7
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Fri Mar 20 13:51:46 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Tue Mar 31 10:38:25 2015 +0200
----------------------------------------------------------------------
.../xenserver/resource/CitrixHelper.java | 28 +-
.../xenserver/resource/CitrixResourceBase.java | 472 +++++-----
.../xenserver/resource/XcpOssResource.java | 103 ++-
.../xenserver/resource/XenServer56Resource.java | 8 +-
.../resource/XenServer610Resource.java | 226 +++--
.../resource/XenServer620Resource.java | 33 +-
.../resource/XenServer620SP1Resource.java | 82 +-
.../resource/XenServerStorageProcessor.java | 864 +++++++++----------
.../resource/Xenserver625Resource.java | 57 +-
.../resource/Xenserver625StorageProcessor.java | 576 +++++++------
.../hypervisor/xenserver/resource/XsHost.java | 212 +++++
.../wrapper/CitrixReadyCommandWrapper.java | 75 ++
.../resource/wrapper/CitrixRequestWrapper.java | 2 +
.../xenserver/XenServerResourceNewBase.java | 75 +-
.../resource/CitrixResourceBaseTest.java | 38 +-
.../wrapper/CitrixRequestWrapperTest.java | 13 +
16 files changed, 1558 insertions(+), 1306 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e72e4a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java
index 5bc8036..265573d 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java
@@ -16,11 +16,8 @@
// under the License.
package com.cloud.hypervisor.xenserver.resource;
-import java.util.ArrayList;
import java.util.HashMap;
-import org.apache.log4j.Logger;
-
import com.xensource.xenapi.Host;
/**
@@ -28,18 +25,13 @@ import com.xensource.xenapi.Host;
*
*/
public class CitrixHelper {
- private static final Logger s_logger = Logger.getLogger(CitrixHelper.class);
-
-
private static final HashMap<String, MemoryValues> XenServerGuestOsMemoryMap = new HashMap<String, MemoryValues>(70);
- private static final ArrayList<String> GuestOsList = new ArrayList<String>(70);
-
public static class MemoryValues {
long max;
long min;
- public MemoryValues(long min, long max) {
+ public MemoryValues(final long min, final long max) {
this.min = min * 1024 * 1024;
this.max = max * 1024 * 1024;
}
@@ -53,8 +45,6 @@ public class CitrixHelper {
}
}
-
-
static {
XenServerGuestOsMemoryMap.put("CentOS 4.5 (32-bit)", new MemoryValues(256l, 16 * 1024l));
XenServerGuestOsMemoryMap.put("CentOS 4.6 (32-bit)", new MemoryValues(256l, 16 * 1024l));
@@ -207,37 +197,37 @@ public class CitrixHelper {
XenServerGuestOsMemoryMap.put("Windows XP SP3 (32-bit)", new MemoryValues(256l, 4 * 1024l));
XenServerGuestOsMemoryMap.put("Ubuntu 10.04 (32-bit)", new MemoryValues(128l, 512l));
XenServerGuestOsMemoryMap.put("Ubuntu 10.04 (64-bit)", new MemoryValues(128l, 32 * 1024l));
- XenServerGuestOsMemoryMap.put("Ubuntu 10.10 (32-bit)", new MemoryValues(512l, 16*1024l));
- XenServerGuestOsMemoryMap.put("Ubuntu 10.10 (64-bit)", new MemoryValues(512l, 16*1024l));
+ XenServerGuestOsMemoryMap.put("Ubuntu 10.10 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServerGuestOsMemoryMap.put("Ubuntu 10.10 (64-bit)", new MemoryValues(512l, 16 * 1024l));
XenServerGuestOsMemoryMap.put("Ubuntu 12.04 (32-bit)", new MemoryValues(512l, 32 * 1024l));
XenServerGuestOsMemoryMap.put("Ubuntu 12.04 (64-bit)", new MemoryValues(512l, 128 * 1024l));
XenServerGuestOsMemoryMap.put("Ubuntu 14.04 (32-bit)", new MemoryValues(512l, 32 * 1024l));
XenServerGuestOsMemoryMap.put("Ubuntu 14.04 (64-bit)", new MemoryValues(512l, 128 * 1024l));
}
- public static long getXenServerStaticMax(String stdType, boolean bootFromCD) {
- MemoryValues recommendedMaxMinMemory = XenServerGuestOsMemoryMap.get(stdType);
+ public static long getXenServerStaticMax(final String stdType, final boolean bootFromCD) {
+ final MemoryValues recommendedMaxMinMemory = XenServerGuestOsMemoryMap.get(stdType);
if (recommendedMaxMinMemory == null) {
return 0l;
}
return recommendedMaxMinMemory.getMax();
}
- public static long getXenServerStaticMin(String stdType, boolean bootFromCD) {
- MemoryValues recommendedMaxMinMemory = XenServerGuestOsMemoryMap.get(stdType);
+ public static long getXenServerStaticMin(final String stdType, final boolean bootFromCD) {
+ final MemoryValues recommendedMaxMinMemory = XenServerGuestOsMemoryMap.get(stdType);
if (recommendedMaxMinMemory == null) {
return 0l;
}
return recommendedMaxMinMemory.getMin();
}
- public static String getProductVersion(Host.Record record) {
+ public static String getProductVersion(final Host.Record record) {
String prodVersion = record.softwareVersion.get("product_version");
if (prodVersion == null) {
prodVersion = record.softwareVersion.get("platform_version").trim();
} else {
prodVersion = prodVersion.trim();
- String[] items = prodVersion.split("\\.");
+ final String[] items = prodVersion.split("\\.");
if (Integer.parseInt(items[0]) > 6) {
prodVersion = "6.5.0";
} else if (Integer.parseInt(items[0]) == 6 && Integer.parseInt(items[1]) >= 4) {