You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/22 13:01:42 UTC
[1/7] git commit: updated refs/heads/master to fe4f0b1
Repository: cloudstack
Updated Branches:
refs/heads/master 53e42fb45 -> fe4f0b1a5
Cleanup some lint checker warning in base classes
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1603f722
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1603f722
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1603f722
Branch: refs/heads/master
Commit: 1603f722c4be9fafd54a2f6dcee789ac56d0b053
Parents: 540b163
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 21 15:56:18 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 22 13:01:18 2015 +0200
----------------------------------------------------------------------
plugins/hypervisors/ovm3/pom.xml | 5 +++++
.../com/cloud/hypervisor/ovm3/objects/CloudstackPlugin.java | 7 ++++---
.../main/java/com/cloud/hypervisor/ovm3/objects/Linux.java | 1 +
.../main/java/com/cloud/hypervisor/ovm3/objects/Network.java | 5 +++--
.../java/com/cloud/hypervisor/ovm3/objects/OvmObject.java | 4 ----
.../src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java | 2 ++
.../java/com/cloud/hypervisor/ovm3/objects/Repository.java | 3 +++
.../java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java | 3 +++
.../src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java | 4 ++++
.../ovm3/resources/helpers/Ovm3ConfigurationTest.java | 2 +-
10 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index 24ef6a4..d7b1138 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -55,6 +55,11 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <debug>true</debug>
+ <debuglevel>lines,vars,source</debuglevel>
+ <verbose>true</verbose>
<useIncrementalCompilation>true</useIncrementalCompilation>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<compilerArgs>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/CloudstackPlugin.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/CloudstackPlugin.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/CloudstackPlugin.java
index 67d993a..3871787 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/CloudstackPlugin.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/CloudstackPlugin.java
@@ -56,6 +56,7 @@ public class CloudstackPlugin extends OvmObject {
put("err", null);
put("out", null);
}
+ private static final long serialVersionUID = 5L;
};
public ReturnCode() {
}
@@ -120,7 +121,7 @@ public class CloudstackPlugin extends OvmObject {
Integer sleep = interval;
try {
while (!x && retries > 0) {
- x = (Boolean) nullIsFalseCallWrapper("check_dom0_port", ip, port, interval);
+ x = nullIsFalseCallWrapper("check_dom0_port", ip, port, interval);
retries--;
Thread.sleep(sleep * 1000);
}
@@ -177,9 +178,9 @@ public class CloudstackPlugin extends OvmObject {
return (Boolean) callWrapper("check_dom0_storage_health", path, script, guid, timeout);
}
public boolean ovsMkdirs(String dir) throws Ovm3ResourceException{
- return (Boolean) nullIsTrueCallWrapper("ovs_mkdirs", dir);
+ return nullIsTrueCallWrapper("ovs_mkdirs", dir);
}
public boolean ovsMkdirs(String dir, Integer mode) throws Ovm3ResourceException{
- return (Boolean) nullIsTrueCallWrapper("ovs_mkdirs", dir, mode);
+ return nullIsTrueCallWrapper("ovs_mkdirs", dir, mode);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Linux.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Linux.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Linux.java
index 4ae933c..b037dd7 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Linux.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Linux.java
@@ -305,6 +305,7 @@ public class Linux extends OvmObject {
put(MOUNTPOINT, null);
put("Uuid", null);
}
+ private static final long serialVersionUID = 123L;
};
public Boolean setDetails(Map<String, Object> fs) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Network.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Network.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Network.java
index f6e0848..008eb43 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Network.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Network.java
@@ -57,6 +57,7 @@ public class Network extends OvmObject {
put("MAC", null);
put("Vlan", null);
}
+ private static final long serialVersionUID = 6L;
};
public Interface() {
@@ -294,7 +295,7 @@ public class Network extends OvmObject {
public Object ovsBrConfig(String action, String br, String net)
throws Ovm3ResourceException {
- return (Object) callWrapper("ovs_br_config", action, br, net);
+ return callWrapper("ovs_br_config", action, br, net);
}
/* 1 is untagged, goes till 4095 */
@@ -319,7 +320,7 @@ public class Network extends OvmObject {
private Object ovsVlanBridge(String action, String br, String net, int vlan)
throws Ovm3ResourceException {
- return (Object) callWrapper("ovs_vlan_bridge", action, br, net, vlan);
+ return callWrapper("ovs_vlan_bridge", action, br, net, vlan);
}
/*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
index cfe249e..d7ef8cd 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
@@ -93,7 +93,6 @@ public class OvmObject {
}
/* nice try but doesn't work like that .. */
- @SafeVarargs
public final <T> Object callWrapper(String call, T... args)
throws Ovm3ResourceException {
List<T> params = new ArrayList<T>();
@@ -109,7 +108,6 @@ public class OvmObject {
}
/* should check on nil ? */
- @SafeVarargs
public final <T> Boolean nullCallWrapper(String call, Boolean nullReturn, T... args) throws Ovm3ResourceException {
Object x = callWrapper(call, args);
if (x == null) {
@@ -120,11 +118,9 @@ public class OvmObject {
return false;
}
- @SafeVarargs
public final <T> Boolean nullIsFalseCallWrapper(String call, T... args) throws Ovm3ResourceException {
return nullCallWrapper(call, false, args);
}
- @SafeVarargs
public final <T> Boolean nullIsTrueCallWrapper(String call, T... args) throws Ovm3ResourceException {
return nullCallWrapper(call, true, args);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
index 066a08a..48778d9 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
@@ -38,6 +38,7 @@ public class Pool extends OvmObject {
add("xen");
add("utility");
}
+ private static final long serialVersionUID = 1L;
};
private List<String> poolHosts = new ArrayList<String>();
private final List<String> poolRoles = new ArrayList<String>();
@@ -155,6 +156,7 @@ public class Pool extends OvmObject {
put("manager_certificate", managerCert);
put("signed_server_certificate", signedCert);
}
+ private static final long serialVersionUID = 1L;
};
Boolean rc = nullIsTrueCallWrapper("take_ownership", mgrConfig);
/* because it restarts when it's done.... 2000? -sigh- */
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Repository.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Repository.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Repository.java
index 36b9ea8..7cbf0e7 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Repository.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Repository.java
@@ -63,6 +63,7 @@ public class Repository extends OvmObject {
}
public static class RepoDbDetails {
+ private static final long serialVersionUID = 2L;
private final Map<String, String> dbEntry = new HashMap<String, String>() {
{
put("Uuid", null);
@@ -74,6 +75,7 @@ public class Repository extends OvmObject {
put("Manager_uuid", null);
put("Status", null);
}
+ private static final long serialVersionUID = 1L;
};
public RepoDbDetails() {
@@ -127,6 +129,7 @@ public class Repository extends OvmObject {
private List<String> virtualDisks = new ArrayList<String>();
private List<String> isos = new ArrayList<String>();
private final Map<String, String> dbEntry = new HashMap<String, String>() {
+ private static final long serialVersionUID = 1L;
{
put("Repository_UUID", null);
put(VERSION, null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
index e581dea..5bfacd2 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
@@ -85,6 +85,7 @@ public class StoragePlugin extends OvmObject {
put(NAME, EMPTY_STRING);
put(MOUNTOPTIONS, new ArrayList<String>());
}
+ private static final long serialVersionUID = 3L;
};
public Map<String, Object> getDetails() {
return storageDetails;
@@ -180,6 +181,7 @@ public class StoragePlugin extends OvmObject {
put(USEDSIZE, 0);
put(NAME, EMPTY_STRING);
}
+ private static final long serialVersionUID = 4L;
};
public Map<String, Object> getDetails() {
return storageSource;
@@ -285,6 +287,7 @@ public class StoragePlugin extends OvmObject {
put(FILEPATH, EMPTY_STRING);
put(FILESIZE, EMPTY_STRING);
}
+ private static final long serialVersionUID = 1234L;
};
public Map<String, Object> getProperties() {
return fileProperties;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
index b03473d..6387566 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
@@ -48,6 +48,7 @@ public class Xen extends OvmObject {
*/
public class Vm {
/* 'vfb': [ 'type=vnc,vncunused=1,vnclisten=127.0.0.1,keymap=en-us'] */
+ private static final long serialVersionUID = 1L;
private final List<String> vmVncElement = new ArrayList<String>();
private Map<String, String> vmVnc = new HashMap<String, String>() {
{
@@ -56,6 +57,7 @@ public class Xen extends OvmObject {
put(VNCLISTEN, "127.0.0.1");
put("keymap", "en-us");
}
+ private static final long serialVersionUID = 1L;
};
/*
@@ -75,6 +77,7 @@ public class Xen extends OvmObject {
put("protocol", "x86_32-abi");
put("uname", "");
}
+ private static final long serialVersionUID = 1L;
};
/* 'vif': [ 'mac=00:21:f6:00:00:00,bridge=c0a80100'] */
@@ -141,6 +144,7 @@ public class Xen extends OvmObject {
put(DOMTYPE, vmDomainType);
put(EXTRA, vmExtra);
}
+ private static final long serialVersionUID = 1L;
};
public boolean isControlDomain() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1603f722/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java
index 5cbb2b7..80ee54f 100644
--- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java
+++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java
@@ -55,7 +55,7 @@ public class Ovm3ConfigurationTest {
params.put("max.template.iso.size", "50");
params.put("host", "ovm-1");
params.put("com.cloud.network.Networks.RouterPrivateIpStrategy",
- "DcGlobal");
+ "DcGlobal");
params.put("agentport", "8899");
params.put("Host.OS.Kernel.Version", "2.6.39-300.22.2.el5uek");
params.put("migratewait", "3600");
[6/7] git commit: updated refs/heads/master to fe4f0b1
Posted by da...@apache.org.
Specify all dependency versions in pom.xml
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #497
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe4f0b1a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe4f0b1a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe4f0b1a
Branch: refs/heads/master
Commit: fe4f0b1a583624ed90a580c10e066d6e4e7ad948
Parents: 83488e0
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Mon Jun 22 11:53:28 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 22 13:01:19 2015 +0200
----------------------------------------------------------------------
plugins/hypervisors/ovm3/pom.xml | 14 +++++++-------
pom.xml | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe4f0b1a/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index a8c4796..82b6e46 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -28,29 +28,29 @@
</parent>
<dependencies>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${cs.xml-apis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
- <version>3.1.3</version>
+ <version>${cs.xmlrpc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
- <version>3.1.3</version>
+ <version>${cs.xmlrpc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>${cs.lang3.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${cs.log4j.version}</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe4f0b1a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8ac4268..900f2e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
<cs.powermock.version>1.5.3</cs.powermock.version>
<cs.aws.sdk.version>1.9.8</cs.aws.sdk.version>
<cs.lang.version>2.6</cs.lang.version>
+ <cs.lang3.version>3.4</cs.lang3.version>
<cs.commons-io.version>2.4</cs.commons-io.version>
<cs.commons-validator.version>1.4.0</cs.commons-validator.version>
<cs.reflections.version>0.9.9</cs.reflections.version>
@@ -101,6 +102,7 @@
<cs.findbugs.version>3.0.1</cs.findbugs.version>
<cs.javadoc.version>2.10.1</cs.javadoc.version>
<cs.opensaml.version>2.6.1</cs.opensaml.version>
+ <cs.xml-apis.version>1.4.01</cs.xml-apis.version>
</properties>
<distributionManagement>
[5/7] git commit: updated refs/heads/master to fe4f0b1
Posted by da...@apache.org.
Reduce about 1k String objects from being instantiated
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/83488e01
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/83488e01
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/83488e01
Branch: refs/heads/master
Commit: 83488e01af5789dc3bd3324488c37c0eb4937703
Parents: 9d19191
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 21 22:08:46 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 22 13:01:19 2015 +0200
----------------------------------------------------------------------
plugins/hypervisors/ovm3/pom.xml | 20 -
.../hypervisor/ovm3/objects/OvmObject.java | 4 +
.../resources/helpers/Ovm3Configuration.java | 4 +-
.../cloud/hypervisor/ovm3/objects/XenTest.java | 944 +++----------------
4 files changed, 124 insertions(+), 848 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83488e01/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index 646ac16..a8c4796 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -52,16 +52,6 @@
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
@@ -79,16 +69,6 @@
<directory>${basedir}/src/test/resources</directory>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
</build>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83488e01/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
index d7ef8cd..cfe249e 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/OvmObject.java
@@ -93,6 +93,7 @@ public class OvmObject {
}
/* nice try but doesn't work like that .. */
+ @SafeVarargs
public final <T> Object callWrapper(String call, T... args)
throws Ovm3ResourceException {
List<T> params = new ArrayList<T>();
@@ -108,6 +109,7 @@ public class OvmObject {
}
/* should check on nil ? */
+ @SafeVarargs
public final <T> Boolean nullCallWrapper(String call, Boolean nullReturn, T... args) throws Ovm3ResourceException {
Object x = callWrapper(call, args);
if (x == null) {
@@ -118,9 +120,11 @@ public class OvmObject {
return false;
}
+ @SafeVarargs
public final <T> Boolean nullIsFalseCallWrapper(String call, T... args) throws Ovm3ResourceException {
return nullCallWrapper(call, false, args);
}
+ @SafeVarargs
public final <T> Boolean nullIsTrueCallWrapper(String call, T... args) throws Ovm3ResourceException {
return nullCallWrapper(call, true, args);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83488e01/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
index 91c0762..6775a146 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.naming.ConfigurationException;
-import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang.BooleanUtils;
import org.apache.log4j.Logger;
import com.cloud.hypervisor.ovm3.objects.Network;
@@ -34,7 +34,7 @@ import com.cloud.utils.net.NetUtils;
/* holds config data for the Ovm3 Hypervisor */
public class Ovm3Configuration {
private static final Logger LOGGER = Logger
- .getLogger(Ovm3Configuration.class);
+ .getLogger(Ovm3Configuration.class);
private String agentIp;
private Long agentZoneId;
private Long agentPodId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83488e01/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java
index 90e9e14..c76f2fe 100644
--- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java
+++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java
@@ -67,832 +67,124 @@ public class XenTest {
String VMISOPATH = REPOPATH + "/" + REPOID + "/ISOs/" + VMISO;
String MULTIPLEVMSLISTXML = results
.simpleResponseWrapWrapper(new StringBuilder("<array><data>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>on_xend_stop</name>\n")
- .append("<value><string>ignore</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>features</name>\n")
- .append("<value><string></string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>image</name>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>tsc_mode</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>kernel</name>\n")
- .append("<value><string></string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>superpages</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>nomigrate</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>expose_host_uuid</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("</struct></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>cpus</name>\n")
- .append("<value><array><data>\n")
- .append("<value><array><data>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>10</string></value>\n")
- .append("<value><string>11</string></value>\n")
- .append("<value><string>12</string></value>\n")
- .append("<value><string>13</string></value>\n")
- .append("<value><string>14</string></value>\n")
- .append("<value><string>15</string></value>\n")
- .append("<value><string>16</string></value>\n")
- .append("<value><string>17</string></value>\n")
- .append("<value><string>18</string></value>\n")
- .append("<value><string>19</string></value>\n")
- .append("<value><string>20</string></value>\n")
- .append("<value><string>21</string></value>\n")
- .append("<value><string>22</string></value>\n")
- .append("<value><string>23</string></value>\n")
- .append("<value><string>24</string></value>\n")
- .append("<value><string>25</string></value>\n")
- .append("<value><string>26</string></value>\n")
- .append("<value><string>27</string></value>\n")
- .append("<value><string>28</string></value>\n")
- .append("<value><string>29</string></value>\n")
- .append("<value><string>30</string></value>\n")
- .append("<value><string>31</string></value>\n")
- .append("<value><string>32</string></value>\n")
- .append("<value><string>33</string></value>\n")
- .append("<value><string>34</string></value>\n")
- .append("<value><string>35</string></value>\n")
- .append("<value><string>36</string></value>\n")
- .append("<value><string>37</string></value>\n")
- .append("<value><string>38</string></value>\n")
- .append("<value><string>39</string></value>\n")
- .append("<value><string>40</string></value>\n")
- .append("<value><string>41</string></value>\n")
- .append("<value><string>42</string></value>\n")
- .append("<value><string>43</string></value>\n")
- .append("<value><string>44</string></value>\n")
- .append("<value><string>45</string></value>\n")
- .append("<value><string>46</string></value>\n")
- .append("<value><string>47</string></value>\n")
- .append("<value><string>48</string></value>\n")
- .append("<value><string>49</string></value>\n")
- .append("<value><string>50</string></value>\n")
- .append("<value><string>51</string></value>\n")
- .append("<value><string>52</string></value>\n")
- .append("<value><string>53</string></value>\n")
- .append("<value><string>54</string></value>\n")
- .append("<value><string>55</string></value>\n")
- .append("<value><string>56</string></value>\n")
- .append("<value><string>57</string></value>\n")
- .append("<value><string>58</string></value>\n")
- .append("<value><string>59</string></value>\n")
- .append("<value><string>60</string></value>\n")
- .append("<value><string>61</string></value>\n")
- .append("<value><string>62</string></value>\n")
- .append("<value><string>63</string></value>\n")
- .append("<value><string>64</string></value>\n")
- .append("<value><string>65</string></value>\n")
- .append("<value><string>66</string></value>\n")
- .append("<value><string>67</string></value>\n")
- .append("<value><string>68</string></value>\n")
- .append("<value><string>69</string></value>\n")
- .append("<value><string>70</string></value>\n")
- .append("<value><string>71</string></value>\n")
- .append("<value><string>72</string></value>\n")
- .append("<value><string>73</string></value>\n")
- .append("<value><string>74</string></value>\n")
- .append("<value><string>75</string></value>\n")
- .append("<value><string>76</string></value>\n")
- .append("<value><string>77</string></value>\n")
- .append("<value><string>78</string></value>\n")
- .append("<value><string>79</string></value>\n")
- .append("<value><string>80</string></value>\n")
- .append("<value><string>81</string></value>\n")
- .append("<value><string>82</string></value>\n")
- .append("<value><string>83</string></value>\n")
- .append("<value><string>84</string></value>\n")
- .append("<value><string>85</string></value>\n")
- .append("<value><string>86</string></value>\n")
- .append("<value><string>87</string></value>\n")
- .append("<value><string>88</string></value>\n")
- .append("<value><string>89</string></value>\n")
- .append("<value><string>90</string></value>\n")
- .append("<value><string>91</string></value>\n")
- .append("<value><string>92</string></value>\n")
- .append("<value><string>93</string></value>\n")
- .append("<value><string>94</string></value>\n")
- .append("<value><string>95</string></value>\n")
- .append("<value><string>96</string></value>\n")
- .append("<value><string>97</string></value>\n")
- .append("<value><string>98</string></value>\n")
- .append("<value><string>99</string></value>\n")
- .append("<value><string>100</string></value>\n")
- .append("<value><string>101</string></value>\n")
- .append("<value><string>102</string></value>\n")
- .append("<value><string>103</string></value>\n")
- .append("<value><string>104</string></value>\n")
- .append("<value><string>105</string></value>\n")
- .append("<value><string>106</string></value>\n")
- .append("<value><string>107</string></value>\n")
- .append("<value><string>108</string></value>\n")
- .append("<value><string>109</string></value>\n")
- .append("<value><string>110</string></value>\n")
- .append("<value><string>111</string></value>\n")
- .append("<value><string>112</string></value>\n")
- .append("<value><string>113</string></value>\n")
- .append("<value><string>114</string></value>\n")
- .append("<value><string>115</string></value>\n")
- .append("<value><string>116</string></value>\n")
- .append("<value><string>117</string></value>\n")
- .append("<value><string>118</string></value>\n")
- .append("<value><string>119</string></value>\n")
- .append("<value><string>120</string></value>\n")
- .append("<value><string>121</string></value>\n")
- .append("<value><string>122</string></value>\n")
- .append("<value><string>123</string></value>\n")
- .append("<value><string>124</string></value>\n")
- .append("<value><string>125</string></value>\n")
- .append("<value><string>126</string></value>\n")
- .append("<value><string>127</string></value>\n")
- .append("<value><string>128</string></value>\n")
- .append("<value><string>129</string></value>\n")
- .append("<value><string>130</string></value>\n")
- .append("<value><string>131</string></value>\n")
- .append("<value><string>132</string></value>\n")
- .append("<value><string>133</string></value>\n")
- .append("<value><string>134</string></value>\n")
- .append("<value><string>135</string></value>\n")
- .append("<value><string>136</string></value>\n")
- .append("<value><string>137</string></value>\n")
- .append("<value><string>138</string></value>\n")
- .append("<value><string>139</string></value>\n")
- .append("<value><string>140</string></value>\n")
- .append("<value><string>141</string></value>\n")
- .append("<value><string>142</string></value>\n")
- .append("<value><string>143</string></value>\n")
- .append("<value><string>144</string></value>\n")
- .append("<value><string>145</string></value>\n")
- .append("<value><string>146</string></value>\n")
- .append("<value><string>147</string></value>\n")
- .append("<value><string>148</string></value>\n")
- .append("<value><string>149</string></value>\n")
- .append("<value><string>150</string></value>\n")
- .append("<value><string>151</string></value>\n")
- .append("<value><string>152</string></value>\n")
- .append("<value><string>153</string></value>\n")
- .append("<value><string>154</string></value>\n")
- .append("<value><string>155</string></value>\n")
- .append("<value><string>156</string></value>\n")
- .append("<value><string>157</string></value>\n")
- .append("<value><string>158</string></value>\n")
- .append("<value><string>159</string></value>\n")
- .append("</data></array></value>\n")
- .append("<value><array><data>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("<value><string>10</string></value>\n")
- .append("<value><string>11</string></value>\n")
- .append("<value><string>12</string></value>\n")
- .append("<value><string>13</string></value>\n")
- .append("<value><string>14</string></value>\n")
- .append("<value><string>15</string></value>\n")
- .append("<value><string>16</string></value>\n")
- .append("<value><string>17</string></value>\n")
- .append("<value><string>18</string></value>\n")
- .append("<value><string>19</string></value>\n")
- .append("<value><string>20</string></value>\n")
- .append("<value><string>21</string></value>\n")
- .append("<value><string>22</string></value>\n")
- .append("<value><string>23</string></value>\n")
- .append("<value><string>24</string></value>\n")
- .append("<value><string>25</string></value>\n")
- .append("<value><string>26</string></value>\n")
- .append("<value><string>27</string></value>\n")
- .append("<value><string>28</string></value>\n")
- .append("<value><string>29</string></value>\n")
- .append("<value><string>30</string></value>\n")
- .append("<value><string>31</string></value>\n")
- .append("<value><string>32</string></value>\n")
- .append("<value><string>33</string></value>\n")
- .append("<value><string>34</string></value>\n")
- .append("<value><string>35</string></value>\n")
- .append("<value><string>36</string></value>\n")
- .append("<value><string>37</string></value>\n")
- .append("<value><string>38</string></value>\n")
- .append("<value><string>39</string></value>\n")
- .append("<value><string>40</string></value>\n")
- .append("<value><string>41</string></value>\n")
- .append("<value><string>42</string></value>\n")
- .append("<value><string>43</string></value>\n")
- .append("<value><string>44</string></value>\n")
- .append("<value><string>45</string></value>\n")
- .append("<value><string>46</string></value>\n")
- .append("<value><string>47</string></value>\n")
- .append("<value><string>48</string></value>\n")
- .append("<value><string>49</string></value>\n")
- .append("<value><string>50</string></value>\n")
- .append("<value><string>51</string></value>\n")
- .append("<value><string>52</string></value>\n")
- .append("<value><string>53</string></value>\n")
- .append("<value><string>54</string></value>\n")
- .append("<value><string>55</string></value>\n")
- .append("<value><string>56</string></value>\n")
- .append("<value><string>57</string></value>\n")
- .append("<value><string>58</string></value>\n")
- .append("<value><string>59</string></value>\n")
- .append("<value><string>60</string></value>\n")
- .append("<value><string>61</string></value>\n")
- .append("<value><string>62</string></value>\n")
- .append("<value><string>63</string></value>\n")
- .append("<value><string>64</string></value>\n")
- .append("<value><string>65</string></value>\n")
- .append("<value><string>66</string></value>\n")
- .append("<value><string>67</string></value>\n")
- .append("<value><string>68</string></value>\n")
- .append("<value><string>69</string></value>\n")
- .append("<value><string>70</string></value>\n")
- .append("<value><string>71</string></value>\n")
- .append("<value><string>72</string></value>\n")
- .append("<value><string>73</string></value>\n")
- .append("<value><string>74</string></value>\n")
- .append("<value><string>75</string></value>\n")
- .append("<value><string>76</string></value>\n")
- .append("<value><string>77</string></value>\n")
- .append("<value><string>78</string></value>\n")
- .append("<value><string>79</string></value>\n")
- .append("<value><string>80</string></value>\n")
- .append("<value><string>81</string></value>\n")
- .append("<value><string>82</string></value>\n")
- .append("<value><string>83</string></value>\n")
- .append("<value><string>84</string></value>\n")
- .append("<value><string>85</string></value>\n")
- .append("<value><string>86</string></value>\n")
- .append("<value><string>87</string></value>\n")
- .append("<value><string>88</string></value>\n")
- .append("<value><string>89</string></value>\n")
- .append("<value><string>90</string></value>\n")
- .append("<value><string>91</string></value>\n")
- .append("<value><string>92</string></value>\n")
- .append("<value><string>93</string></value>\n")
- .append("<value><string>94</string></value>\n")
- .append("<value><string>95</string></value>\n")
- .append("<value><string>96</string></value>\n")
- .append("<value><string>97</string></value>\n")
- .append("<value><string>98</string></value>\n")
- .append("<value><string>99</string></value>\n")
- .append("<value><string>100</string></value>\n")
- .append("<value><string>101</string></value>\n")
- .append("<value><string>102</string></value>\n")
- .append("<value><string>103</string></value>\n")
- .append("<value><string>104</string></value>\n")
- .append("<value><string>105</string></value>\n")
- .append("<value><string>106</string></value>\n")
- .append("<value><string>107</string></value>\n")
- .append("<value><string>108</string></value>\n")
- .append("<value><string>109</string></value>\n")
- .append("<value><string>110</string></value>\n")
- .append("<value><string>111</string></value>\n")
- .append("<value><string>112</string></value>\n")
- .append("<value><string>113</string></value>\n")
- .append("<value><string>114</string></value>\n")
- .append("<value><string>115</string></value>\n")
- .append("<value><string>116</string></value>\n")
- .append("<value><string>117</string></value>\n")
- .append("<value><string>118</string></value>\n")
- .append("<value><string>119</string></value>\n")
- .append("<value><string>120</string></value>\n")
- .append("<value><string>121</string></value>\n")
- .append("<value><string>122</string></value>\n")
- .append("<value><string>123</string></value>\n")
- .append("<value><string>124</string></value>\n")
- .append("<value><string>125</string></value>\n")
- .append("<value><string>126</string></value>\n")
- .append("<value><string>127</string></value>\n")
- .append("<value><string>128</string></value>\n")
- .append("<value><string>129</string></value>\n")
- .append("<value><string>130</string></value>\n")
- .append("<value><string>131</string></value>\n")
- .append("<value><string>132</string></value>\n")
- .append("<value><string>133</string></value>\n")
- .append("<value><string>134</string></value>\n")
- .append("<value><string>135</string></value>\n")
- .append("<value><string>136</string></value>\n")
- .append("<value><string>137</string></value>\n")
- .append("<value><string>138</string></value>\n")
- .append("<value><string>139</string></value>\n")
- .append("<value><string>140</string></value>\n")
- .append("<value><string>141</string></value>\n")
- .append("<value><string>142</string></value>\n")
- .append("<value><string>143</string></value>\n")
- .append("<value><string>144</string></value>\n")
- .append("<value><string>145</string></value>\n")
- .append("<value><string>146</string></value>\n")
- .append("<value><string>147</string></value>\n")
- .append("<value><string>148</string></value>\n")
- .append("<value><string>149</string></value>\n")
- .append("<value><string>150</string></value>\n")
- .append("<value><string>151</string></value>\n")
- .append("<value><string>152</string></value>\n")
- .append("<value><string>153</string></value>\n")
- .append("<value><string>154</string></value>\n")
- .append("<value><string>155</string></value>\n")
- .append("<value><string>156</string></value>\n")
- .append("<value><string>157</string></value>\n")
- .append("<value><string>158</string></value>\n")
- .append("<value><string>159</string></value>\n")
- .append("</data></array></value>\n")
- .append("</data></array></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>uuid</name>\n")
- .append("<value><string>00000000-0000-0000-0000-000000000000</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>on_reboot</name>\n")
- .append("<value><string>restart</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>state</name>\n")
- .append("<value><string>r-----</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>cpu_weight</name>\n")
- .append("<value><string>65535</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>online_vcpus</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>memory</name>\n")
- .append("<value><string>672</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>cpu_cap</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>status</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>pool_name</name>\n")
- .append("<value><string>Pool-0</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>on_poweroff</name>\n")
- .append("<value><string>destroy</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>on_xend_start</name>\n")
- .append("<value><string>ignore</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>on_crash</name>\n")
- .append("<value><string>restart</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>device</name>\n")
- .append("<value><struct>\n")
- .append("</struct></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>bootloader</name>\n")
- .append("<value><string></string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>maxmem</name>\n")
- .append("<value><string>672</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>cpu_time</name>\n")
- .append("<value><string>6608.51291287</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>shadow_memory</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>name</name>\n")
- .append("<value><string>Domain-0</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>builder</name>\n")
- .append("<value><string>linux</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>bootloader_args</name>\n")
- .append("<value><string></string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>domid</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>vcpus</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("</struct></value>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>on_xend_stop</name>\n")
- .append("<value><string>ignore</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>console_mfn</name>\n")
- .append("<value><string>873706</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>features</name>\n")
- .append("<value><string></string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>image</name>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>tsc_mode</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>kernel</name>\n")
- .append("<value><string></string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>videoram</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>device_model</name>\n")
- .append("<value><string>/usr/lib/xen/bin/qemu-dm</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>notes</name>")
- .append("<value><array><data>")
- .append("<value><array><data>")
- .append("<value><string>HV_START_LOW</string></value>")
- .append("<value><string>4118806528</string></value>")
- .append("</data></array></value>")
- .append("<value><array><data>")
- .append("<value><string>FEATURES</string></value>")
- .append("<value><string>!writable_page_tables|pae_pgdir_above_4gb</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>VIRT_BASE</string></value>")
- .append("<value><string>3221225472</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>GUEST_VERSION</string></value>")
- .append("<value><string>2.6</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>PADDR_OFFSET</string></value>")
- .append("<value><string>") .append("</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>GUEST_OS</string></value>")
- .append("<value><string>linux</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>HYPERCALL_PAGE</string></value>")
- .append("<value><string>3238010880</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>LOADER</string></value>")
- .append("<value><string>generic</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>SUSPEND_CANCEL</string></value>")
- .append("<value><string>") .append("</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>PAE_MODE</string></value>")
- .append("<value><string>yes</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>ENTRY</string></value>")
- .append("<value><string>3242303488</string></value>")
- .append("</data></array></value>") .append("<value><array><data>")
- .append("<value><string>XEN_VERSION</string></value>")
- .append("<value><string>xen-3.0</string></value>")
- .append("</data></array></value>") .append("</data></array></value>")
- .append("</member>") .append("<member>")
- .append("<name>expose_host_uuid</name>") .append("<value><string>")
- .append("</string></value>") .append("</member>") .append("<member>")
- .append("<name>pci</name>") .append("<value><array><data>")
- .append("</data></array></value>") .append("</member>") .append("<member>")
- .append("<name>superpages</name>\n") .append("<value><string>\n")
- .append("</string></value>\n") .append("</member>\n") .append("<member>\n")
- .append("<name>nomigrate</name>\n") .append("<value><string>\n")
- .append("</string></value>\n") .append("</member>\n")
- .append("</struct></value>\n") .append("</member>\n") .append("<member>\n")
- .append("<name>cpus</name>\n") .append("<value><array><data>\n")
- .append("<value><array><data>\n") .append("</data></array></value>\n")
- .append("</data></array></value>\n") .append("</member>\n")
- .append("<member>\n") .append("<name>store_mfn</name>\n")
- .append("<value><string>873707</string></value>\n")
- .append("</member>\n") .append("<member>\n") .append("<name>uuid</name>\n")
- .append("<value><string>")
- .append(VMID)
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>on_reboot</name>\n")
- .append("<value><string>restart</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>state</name>\n")
- .append("<value><string>-b----</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>cpu_weight</name>\n")
- .append("<value><string>27500</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>online_vcpus</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>memory</name>\n")
- .append("<value><string>512</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>cpu_cap</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>status</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>pool_name</name>\n")
- .append("<value><string>Pool-0</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>description</name>\n")
- .append("<value><string></string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>start_time</name>\n")
- .append("<value><string>1408105444.17</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>on_poweroff</name>\n")
- .append("<value><string>destroy</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>on_xend_start</name>\n")
- .append("<value><string>ignore</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>on_crash</name>\n")
- .append("<value><string>restart</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>device</name>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>vif</name>\n")
- .append("<value><array><data>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>bridge</name>\n")
- .append("<value><string>").append(VMNICBR).append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>mac</name>\n")
- .append("<value><string>").append(VMNICMAC).append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>script</name>\n")
- .append("<value><string>/etc/xen/scripts/vif-bridge</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>uuid</name>\n")
- .append("<value><string>").append(VMNICUUID).append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>backend</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("</struct></value>\n")
- .append("</data></array></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>vkbd</name>\n")
- .append("<value><array><data>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>backend</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("</struct></value>\n")
- .append("</data></array></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>console</name>\n")
- .append("<value><array><data>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>protocol</name>\n")
- .append("<value><string>vt100</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>location</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>uuid</name>\n")
- .append("<value><string>9beb5016-dde7-8526-491f-e972f262a634</string></value>\n")
- .append("</member>\n")
- .append("</struct></value>\n")
- .append("</data></array></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>vfb</name>\n")
- .append("<value><array><data>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>vncunused</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>vnc</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>xauthority</name>\n")
- .append("<value><string>/root/.Xauthority</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>vnclisten</name>\n")
- .append("<value><string>0.0.0.0</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>vncpasswd</name>\n")
- .append("<value><string>7693f834ca67912e</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>keymap</name>\n")
- .append("<value><string>en-us</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>location</name>\n")
- .append("<value><string>0.0.0.0:5900</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>uuid</name>\n")
- .append("<value><string>78edf954-e375-b142-9c76-791ce805b6ef</string></value>\n")
- .append("</member>\n")
- .append("</struct></value>\n")
- .append("</data></array></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>vbd</name>\n")
- .append("<value><array><data>\n")
- .append("<value><struct>\n")
- .append("<member>\n")
- .append("<name>protocol</name>\n")
- .append("<value><string>x86_32-abi</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>uuid</name>\n")
- .append("<value><string>bda35954-2596-025e-168c-b82e1cf92369</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>bootable</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>dev</name>\n")
- .append("<value><string>xvda:disk</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>uname</name>\n")
- .append("<value><string>file:/OVS/Repositories/")
- .append(REPOID)
- .append("/VirtualDisks/")
- .append(VMROOTDISK)
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>mode</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>VDI</name>\n")
- .append("<value><string></string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>backend</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("</struct></value>\n")
- .append("</data></array></value>\n")
- .append("</member>\n")
- .append("</struct></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>bootloader</name>\n")
- .append("<value><string>/usr/bin/pygrub</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>maxmem</name>\n")
- .append("<value><string>512</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>cpu_time</name>\n")
- .append("<value><string>0.152510481</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>shadow_memory</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>name</name>\n")
- .append("<value><string>")
- .append(VMNAME)
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>builder</name>\n")
- .append("<value><string>linux</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>bootloader_args</name>\n")
- .append("<value><string>-q</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>domid</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n")
- .append("<member>\n")
- .append("<name>vcpus</name>\n")
- .append("<value><string>\n")
- .append("</string></value>\n")
- .append("</member>\n") .append("</struct></value>\n") .append("</data></array>").toString());
+ .append("<value><struct>\n<member>\n<name>on_xend_stop</name>\n<value><string>ignore</string></value>\n</member>\n<member>\n<name>features</name>\n<value><string></string></value>\n</member>\n<member>\n<name>image</name>\n")
+ .append("<value><struct>\n<member>\n<name>tsc_mode</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>kernel</name>\n<value><string></string></value>\n</member>\n<member>\n<name>superpages</name>\n")
+ .append("<value><string>\n</string></value>\n</member>\n<member>\n<name>nomigrate</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>expose_host_uuid</name>\n<value><string>\n</string></value>\n</member>\n")
+ .append("</struct></value>\n</member>\n<member>\n<name>cpus</name>\n<value><array><data>\n<value><array><data>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n")
+ .append("<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n")
+ .append("</string></value>\n<value><string>\n</string></value>\n<value><string>10</string></value>\n<value><string>11</string></value>\n<value><string>12</string></value>\n<value><string>13</string></value>\n")
+ .append("<value><string>14</string></value>\n<value><string>15</string></value>\n<value><string>16</string></value>\n<value><string>17</string></value>\n<value><string>18</string></value>\n")
+ .append("<value><string>19</string></value>\n<value><string>20</string></value>\n<value><string>21</string></value>\n<value><string>22</string></value>\n<value><string>23</string></value>\n")
+ .append("<value><string>24</string></value>\n<value><string>25</string></value>\n<value><string>26</string></value>\n<value><string>27</string></value>\n<value><string>28</string></value>\n")
+ .append("<value><string>29</string></value>\n<value><string>30</string></value>\n<value><string>31</string></value>\n<value><string>32</string></value>\n<value><string>33</string></value>\n")
+ .append("<value><string>34</string></value>\n<value><string>35</string></value>\n<value><string>36</string></value>\n<value><string>37</string></value>\n<value><string>38</string></value>\n")
+ .append("<value><string>39</string></value>\n<value><string>40</string></value>\n<value><string>41</string></value>\n<value><string>42</string></value>\n<value><string>43</string></value>\n")
+ .append("<value><string>44</string></value>\n<value><string>45</string></value>\n<value><string>46</string></value>\n<value><string>47</string></value>\n<value><string>48</string></value>\n")
+ .append("<value><string>49</string></value>\n<value><string>50</string></value>\n<value><string>51</string></value>\n<value><string>52</string></value>\n<value><string>53</string></value>\n")
+ .append("<value><string>54</string></value>\n<value><string>55</string></value>\n<value><string>56</string></value>\n<value><string>57</string></value>\n<value><string>58</string></value>\n")
+ .append("<value><string>59</string></value>\n<value><string>60</string></value>\n<value><string>61</string></value>\n<value><string>62</string></value>\n<value><string>63</string></value>\n")
+ .append("<value><string>64</string></value>\n<value><string>65</string></value>\n<value><string>66</string></value>\n<value><string>67</string></value>\n<value><string>68</string></value>\n")
+ .append("<value><string>69</string></value>\n<value><string>70</string></value>\n<value><string>71</string></value>\n<value><string>72</string></value>\n<value><string>73</string></value>\n")
+ .append("<value><string>74</string></value>\n<value><string>75</string></value>\n<value><string>76</string></value>\n<value><string>77</string></value>\n<value><string>78</string></value>\n")
+ .append("<value><string>79</string></value>\n<value><string>80</string></value>\n<value><string>81</string></value>\n<value><string>82</string></value>\n<value><string>83</string></value>\n")
+ .append("<value><string>84</string></value>\n<value><string>85</string></value>\n<value><string>86</string></value>\n<value><string>87</string></value>\n<value><string>88</string></value>\n")
+ .append("<value><string>89</string></value>\n<value><string>90</string></value>\n<value><string>91</string></value>\n<value><string>92</string></value>\n<value><string>93</string></value>\n")
+ .append("<value><string>94</string></value>\n<value><string>95</string></value>\n<value><string>96</string></value>\n<value><string>97</string></value>\n<value><string>98</string></value>\n")
+ .append("<value><string>99</string></value>\n<value><string>100</string></value>\n<value><string>101</string></value>\n<value><string>102</string></value>\n<value><string>103</string></value>\n")
+ .append("<value><string>104</string></value>\n<value><string>105</string></value>\n<value><string>106</string></value>\n<value><string>107</string></value>\n<value><string>108</string></value>\n")
+ .append("<value><string>109</string></value>\n<value><string>110</string></value>\n<value><string>111</string></value>\n<value><string>112</string></value>\n<value><string>113</string></value>\n")
+ .append("<value><string>114</string></value>\n<value><string>115</string></value>\n<value><string>116</string></value>\n<value><string>117</string></value>\n<value><string>118</string></value>\n")
+ .append("<value><string>119</string></value>\n<value><string>120</string></value>\n<value><string>121</string></value>\n<value><string>122</string></value>\n<value><string>123</string></value>\n")
+ .append("<value><string>124</string></value>\n<value><string>125</string></value>\n<value><string>126</string></value>\n<value><string>127</string></value>\n<value><string>128</string></value>\n")
+ .append("<value><string>129</string></value>\n<value><string>130</string></value>\n<value><string>131</string></value>\n<value><string>132</string></value>\n<value><string>133</string></value>\n")
+ .append("<value><string>134</string></value>\n<value><string>135</string></value>\n<value><string>136</string></value>\n<value><string>137</string></value>\n<value><string>138</string></value>\n")
+ .append("<value><string>139</string></value>\n<value><string>140</string></value>\n<value><string>141</string></value>\n<value><string>142</string></value>\n<value><string>143</string></value>\n")
+ .append("<value><string>144</string></value>\n<value><string>145</string></value>\n<value><string>146</string></value>\n<value><string>147</string></value>\n<value><string>148</string></value>\n")
+ .append("<value><string>149</string></value>\n<value><string>150</string></value>\n<value><string>151</string></value>\n<value><string>152</string></value>\n<value><string>153</string></value>\n")
+ .append("<value><string>154</string></value>\n<value><string>155</string></value>\n<value><string>156</string></value>\n<value><string>157</string></value>\n<value><string>158</string></value>\n")
+ .append("<value><string>159</string></value>\n</data></array></value>\n<value><array><data>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n")
+ .append("<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>\n</string></value>\n")
+ .append("<value><string>\n</string></value>\n<value><string>\n</string></value>\n<value><string>10</string></value>\n<value><string>11</string></value>\n<value><string>12</string></value>\n")
+ .append("<value><string>13</string></value>\n<value><string>14</string></value>\n<value><string>15</string></value>\n<value><string>16</string></value>\n<value><string>17</string></value>\n")
+ .append("<value><string>18</string></value>\n<value><string>19</string></value>\n<value><string>20</string></value>\n<value><string>21</string></value>\n<value><string>22</string></value>\n")
+ .append("<value><string>23</string></value>\n<value><string>24</string></value>\n<value><string>25</string></value>\n<value><string>26</string></value>\n<value><string>27</string></value>\n")
+ .append("<value><string>28</string></value>\n<value><string>29</string></value>\n<value><string>30</string></value>\n<value><string>31</string></value>\n<value><string>32</string></value>\n")
+ .append("<value><string>33</string></value>\n<value><string>34</string></value>\n<value><string>35</string></value>\n<value><string>36</string></value>\n<value><string>37</string></value>\n")
+ .append("<value><string>38</string></value>\n<value><string>39</string></value>\n<value><string>40</string></value>\n<value><string>41</string></value>\n<value><string>42</string></value>\n")
+ .append("<value><string>43</string></value>\n<value><string>44</string></value>\n<value><string>45</string></value>\n<value><string>46</string></value>\n<value><string>47</string></value>\n")
+ .append("<value><string>48</string></value>\n<value><string>49</string></value>\n<value><string>50</string></value>\n<value><string>51</string></value>\n<value><string>52</string></value>\n")
+ .append("<value><string>53</string></value>\n<value><string>54</string></value>\n<value><string>55</string></value>\n<value><string>56</string></value>\n<value><string>57</string></value>\n")
+ .append("<value><string>58</string></value>\n<value><string>59</string></value>\n<value><string>60</string></value>\n<value><string>61</string></value>\n<value><string>62</string></value>\n")
+ .append("<value><string>63</string></value>\n<value><string>64</string></value>\n<value><string>65</string></value>\n<value><string>66</string></value>\n<value><string>67</string></value>\n")
+ .append("<value><string>68</string></value>\n<value><string>69</string></value>\n<value><string>70</string></value>\n<value><string>71</string></value>\n<value><string>72</string></value>\n")
+ .append("<value><string>73</string></value>\n<value><string>74</string></value>\n<value><string>75</string></value>\n<value><string>76</string></value>\n<value><string>77</string></value>\n")
+ .append("<value><string>78</string></value>\n<value><string>79</string></value>\n<value><string>80</string></value>\n<value><string>81</string></value>\n<value><string>82</string></value>\n")
+ .append("<value><string>83</string></value>\n<value><string>84</string></value>\n<value><string>85</string></value>\n<value><string>86</string></value>\n<value><string>87</string></value>\n")
+ .append("<value><string>88</string></value>\n<value><string>89</string></value>\n<value><string>90</string></value>\n<value><string>91</string></value>\n<value><string>92</string></value>\n")
+ .append("<value><string>93</string></value>\n<value><string>94</string></value>\n<value><string>95</string></value>\n<value><string>96</string></value>\n<value><string>97</string></value>\n")
+ .append("<value><string>98</string></value>\n<value><string>99</string></value>\n<value><string>100</string></value>\n<value><string>101</string></value>\n<value><string>102</string></value>\n")
+ .append("<value><string>103</string></value>\n<value><string>104</string></value>\n<value><string>105</string></value>\n<value><string>106</string></value>\n<value><string>107</string></value>\n")
+ .append("<value><string>108</string></value>\n<value><string>109</string></value>\n<value><string>110</string></value>\n<value><string>111</string></value>\n<value><string>112</string></value>\n")
+ .append("<value><string>113</string></value>\n<value><string>114</string></value>\n<value><string>115</string></value>\n<value><string>116</string></value>\n<value><string>117</string></value>\n")
+ .append("<value><string>118</string></value>\n<value><string>119</string></value>\n<value><string>120</string></value>\n<value><string>121</string></value>\n<value><string>122</string></value>\n")
+ .append("<value><string>123</string></value>\n<value><string>124</string></value>\n<value><string>125</string></value>\n<value><string>126</string></value>\n<value><string>127</string></value>\n")
+ .append("<value><string>128</string></value>\n<value><string>129</string></value>\n<value><string>130</string></value>\n<value><string>131</string></value>\n<value><string>132</string></value>\n")
+ .append("<value><string>133</string></value>\n<value><string>134</string></value>\n<value><string>135</string></value>\n<value><string>136</string></value>\n<value><string>137</string></value>\n")
+ .append("<value><string>138</string></value>\n<value><string>139</string></value>\n<value><string>140</string></value>\n<value><string>141</string></value>\n<value><string>142</string></value>\n")
+ .append("<value><string>143</string></value>\n<value><string>144</string></value>\n<value><string>145</string></value>\n<value><string>146</string></value>\n<value><string>147</string></value>\n")
+ .append("<value><string>148</string></value>\n<value><string>149</string></value>\n<value><string>150</string></value>\n<value><string>151</string></value>\n<value><string>152</string></value>\n")
+ .append("<value><string>153</string></value>\n<value><string>154</string></value>\n<value><string>155</string></value>\n<value><string>156</string></value>\n<value><string>157</string></value>\n")
+ .append("<value><string>158</string></value>\n<value><string>159</string></value>\n</data></array></value>\n</data></array></value>\n</member>\n<member>\n<name>uuid</name>\n<value><string>00000000-0000-0000-0000-000000000000</string></value>\n")
+ .append("</member>\n<member>\n<name>on_reboot</name>\n<value><string>restart</string></value>\n</member>\n<member>\n<name>state</name>\n<value><string>r-----</string></value>\n</member>\n")
+ .append("<member>\n<name>cpu_weight</name>\n<value><string>65535</string></value>\n</member>\n<member>\n<name>online_vcpus</name>\n<value><string>\n</string></value>\n</member>\n")
+ .append("<member>\n<name>memory</name>\n<value><string>672</string></value>\n</member>\n<member>\n<name>cpu_cap</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>status</name>\n")
+ .append("<value><string>\n</string></value>\n</member>\n<member>\n<name>pool_name</name>\n<value><string>Pool-0</string></value>\n</member>\n<member>\n<name>on_poweroff</name>\n<value><string>destroy</string></value>\n")
+ .append("</member>\n<member>\n<name>on_xend_start</name>\n<value><string>ignore</string></value>\n</member>\n<member>\n<name>on_crash</name>\n<value><string>restart</string></value>\n</member>\n")
+ .append("<member>\n<name>device</name>\n<value><struct>\n</struct></value>\n</member>\n<member>\n<name>bootloader</name>\n<value><string></string></value>\n</member>\n<member>\n<name>maxmem</name>\n")
+ .append("<value><string>672</string></value>\n</member>\n<member>\n<name>cpu_time</name>\n<value><string>6608.51291287</string></value>\n</member>\n<member>\n<name>shadow_memory</name>\n<value><string>\n")
+ .append("</string></value>\n</member>\n<member>\n<name>name</name>\n<value><string>Domain-0</string></value>\n</member>\n<member>\n<name>builder</name>\n<value><string>linux</string></value>\n</member>\n")
+ .append("<member>\n<name>bootloader_args</name>\n<value><string></string></value>\n</member>\n<member>\n<name>domid</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>vcpus</name>\n")
+ .append("<value><string>\n</string></value>\n</member>\n</struct></value>\n<value><struct>\n<member>\n<name>on_xend_stop</name>\n<value><string>ignore</string></value>\n</member>\n<member>\n")
+ .append("<name>console_mfn</name>\n<value><string>873706</string></value>\n</member>\n<member>\n<name>features</name>\n<value><string></string></value>\n</member>\n<member>\n<name>image</name>\n")
+ .append("<value><struct>\n<member>\n<name>tsc_mode</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>kernel</name>\n<value><string></string></value>\n</member>\n")
+ .append("<member>\n<name>videoram</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>device_model</name>\n<value><string>/usr/lib/xen/bin/qemu-dm</string></value>\n</member>\n")
+ .append("<member>\n<name>notes</name><value><array><data><value><array><data><value><string>HV_START_LOW</string></value><value><string>4118806528</string></value></data></array></value>")
+ .append("<value><array><data><value><string>FEATURES</string></value><value><string>!writable_page_tables|pae_pgdir_above_4gb</string></value></data></array></value><value><array><data>")
+ .append("<value><string>VIRT_BASE</string></value><value><string>3221225472</string></value></data></array></value><value><array><data><value><string>GUEST_VERSION</string></value><value><string>2.6</string></value>")
+ .append("</data></array></value><value><array><data><value><string>PADDR_OFFSET</string></value><value><string></string></value></data></array></value><value><array><data><value><string>GUEST_OS</string></value>")
+ .append("<value><string>linux</string></value></data></array></value><value><array><data><value><string>HYPERCALL_PAGE</string></value><value><string>3238010880</string></value></data></array></value><value><array><data>")
+ .append("<value><string>LOADER</string></value><value><string>generic</string></value></data></array></value><value><array><data><value><string>SUSPEND_CANCEL</string></value><value><string></string></value>")
+ .append("</data></array></value><value><array><data><value><string>PAE_MODE</string></value><value><string>yes</string></value></data></array></value><value><array><data><value><string>ENTRY</string></value>")
+ .append("<value><string>3242303488</string></value></data></array></value><value><array><data><value><string>XEN_VERSION</string></value><value><string>xen-3.0</string></value></data></array></value>")
+ .append("</data></array></value></member><member><name>expose_host_uuid</name><value><string></string></value></member><member><name>pci</name><value><array><data></data></array></value></member>")
+ .append("<member><name>superpages</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>nomigrate</name>\n<value><string>\n</string></value>\n</member>\n</struct></value>\n</member>\n")
+ .append("<member>\n<name>cpus</name>\n<value><array><data>\n<value><array><data>\n</data></array></value>\n</data></array></value>\n</member>\n<member>\n<name>store_mfn</name>\n<value><string>873707</string></value>\n")
+ .append("</member>\n<member>\n<name>uuid</name>\n<value><string>").append(VMID).append("</string></value>\n</member>\n<member>\n<name>on_reboot</name>\n<value><string>restart</string></value>\n</member>\n")
+ .append("<member>\n<name>state</name>\n<value><string>-b----</string></value>\n</member>\n<member>\n<name>cpu_weight</name>\n<value><string>27500</string></value>\n</member>\n<member>\n<name>online_vcpus</name>\n")
+ .append("<value><string>\n</string></value>\n</member>\n<member>\n<name>memory</name>\n<value><string>512</string></value>\n</member>\n<member>\n<name>cpu_cap</name>\n<value><string>\n</string></value>\n")
+ .append("</member>\n<member>\n<name>status</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>pool_name</name>\n<value><string>Pool-0</string></value>\n</member>\n<member>\n<name>description</name>\n")
+ .append("<value><string></string></value>\n</member>\n<member>\n<name>start_time</name>\n<value><string>1408105444.17</string></value>\n</member>\n<member>\n<name>on_poweroff</name>\n<value><string>destroy</string></value>\n")
+ .append("</member>\n<member>\n<name>on_xend_start</name>\n<value><string>ignore</string></value>\n</member>\n<member>\n<name>on_crash</name>\n<value><string>restart</string></value>\n</member>\n")
+ .append("<member>\n<name>device</name>\n<value><struct>\n<member>\n<name>vif</name>\n<value><array><data>\n<value><struct>\n<member>\n<name>bridge</name>\n<value><string>").append(VMNICBR)
+ .append("</string></value>\n</member>\n<member>\n<name>mac</name>\n<value><string>").append(VMNICMAC).append("</string></value>\n</member>\n<member>\n<name>script</name>\n<value><string>/etc/xen/scripts/vif-bridge</string></value>\n")
+ .append("</member>\n<member>\n<name>uuid</name>\n<value><string>").append(VMNICUUID).append("</string></value>\n</member>\n<member>\n<name>backend</name>\n<value><string>\n</string></value>\n</member>\n")
+ .append("</struct></value>\n</data></array></value>\n</member>\n<member>\n<name>vkbd</name>\n<value><array><data>\n<value><struct>\n<member>\n<name>backend</name>\n<value><string>\n</string></value>\n")
+ .append("</member>\n</struct></value>\n</data></array></value>\n</member>\n<member>\n<name>console</name>\n<value><array><data>\n<value><struct>\n<member>\n<name>protocol</name>\n<value><string>vt100</string></value>\n")
+ .append("</member>\n<member>\n<name>location</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>uuid</name>\n<value><string>9beb5016-dde7-8526-491f-e972f262a634</string></value>\n")
+ .append("</member>\n</struct></value>\n</data></array></value>\n</member>\n<member>\n<name>vfb</name>\n<value><array><data>\n<value><struct>\n<member>\n<name>vncunused</name>\n<value><string>\n")
+ .append("</string></value>\n</member>\n<member>\n<name>vnc</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>xauthority</name>\n<value><string>/root/.Xauthority</string></value>\n")
+ .append("</member>\n<member>\n<name>vnclisten</name>\n<value><string>0.0.0.0</string></value>\n</member>\n<member>\n<name>vncpasswd</name>\n<value><string>7693f834ca67912e</string></value>\n")
+ .append("</member>\n<member>\n<name>keymap</name>\n<value><string>en-us</string></value>\n</member>\n<member>\n<name>location</name>\n<value><string>0.0.0.0:5900</string></value>\n</member>\n")
+ .append("<member>\n<name>uuid</name>\n<value><string>78edf954-e375-b142-9c76-791ce805b6ef</string></value>\n</member>\n</struct></value>\n</data></array></value>\n</member>\n<member>\n<name>vbd</name>\n")
+ .append("<value><array><data>\n<value><struct>\n<member>\n<name>protocol</name>\n<value><string>x86_32-abi</string></value>\n</member>\n<member>\n<name>uuid</name>\n<value><string>bda35954-2596-025e-168c-b82e1cf92369</string></value>\n")
+ .append("</member>\n<member>\n<name>bootable</name>\n<value><string>\n</string></value>\n</member>\n<member>\n<name>dev</name>\n<value><string>xvda:disk</string></value>\n</member>\n<member>\n<name>uname</name>\n")
+ .append("<value><string>file:/OVS/Repositories/").append(REPOID).append("/VirtualDisks/").append(VMROOTDISK).append("</string></value>\n</member>\n<member>\n<name>mode</name>\n<value><string>\n")
+ .append("</string></value>\n</member>\n<member>\n<name>VDI</name>\n<value><string></string></value>\n</member>\n<member>\n<name>backend</name>\n<value><string>\n</string></value>\n</member>\n</struct></value>\n")
+ .append("</data></array></value>\n</member>\n</struct></value>\n</member>\n<member>\n<name>bootloader</name>\n<value><string>/usr/bin/pygrub</string></value>\n</member>\n<member>\n<name>maxmem</name>\n")
+ .append("<value><string>512</string></value>\n</member>\n<member>\n<name>cpu_time</name>\n<value><string>0.152510481</string></value>\n</member>\n<member>\n<name>shadow_memory</name>\n<value><string>\n")
+ .append("</string></value>\n</member>\n<member>\n<name>name</name>\n<value><string>").append(VMNAME).append("</string></value>\n</member>\n<member>\n<name>builder</name>\n<value><string>linux</string></value>\n")
+ .append("</member>\n<member>\n<name>bootloader_args</name>\n<value><string>-q</string></value>\n</member>\n<member>\n<name>domid</name>\n<value><string>\n</string></value>\n</member>\n<member>\n")
+ .append("<name>vcpus</name>\n<value><string>\n</string></value>\n</member>\n</struct></value>\n</data></array>").toString());
public String getSingleVmListXML() {
return SINGLEVMLISTXML;
[2/7] git commit: updated refs/heads/master to fe4f0b1
Posted by da...@apache.org.
Resolve unsafe cast warnings reported by lint checker Add some debug config to compiler plugin
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/540b163c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/540b163c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/540b163c
Branch: refs/heads/master
Commit: 540b163cfc41bc3838cedfe01c4ae34e82e780f7
Parents: 53e42fb
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 21 14:03:53 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 22 13:01:18 2015 +0200
----------------------------------------------------------------------
plugins/hypervisors/ovm3/pom.xml | 15 +++++++++++++++
.../resources/helpers/Ovm3ConfigurationTest.java | 10 +++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/540b163c/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index 546e7e7..24ef6a4 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -49,6 +49,21 @@
<directory>${basedir}/src/test/resources</directory>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <useIncrementalCompilation>true</useIncrementalCompilation>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <compilerArgs>
+ <arg>-verbose</arg>
+ <arg>-Xlint:all,-options,-path</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/540b163c/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java
index 5faff8f..5cbb2b7 100644
--- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java
+++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3ConfigurationTest.java
@@ -29,7 +29,7 @@ import com.cloud.hypervisor.ovm3.objects.XmlTestResultTest;
public class Ovm3ConfigurationTest {
XmlTestResultTest results = new XmlTestResultTest();
private Ovm3Configuration ovm3config;
- private static Map<String, Object> params;
+ private static HashMap<String, Object> params;
static {
params = new HashMap<String, Object>();
params.put("agentusername", "oracle");
@@ -55,7 +55,7 @@ public class Ovm3ConfigurationTest {
params.put("max.template.iso.size", "50");
params.put("host", "ovm-1");
params.put("com.cloud.network.Networks.RouterPrivateIpStrategy",
- "DcGlobal");
+ "DcGlobal");
params.put("agentport", "8899");
params.put("Host.OS.Kernel.Version", "2.6.39-300.22.2.el5uek");
params.put("migratewait", "3600");
@@ -83,13 +83,13 @@ public class Ovm3ConfigurationTest {
@Test(expected = ConfigurationException.class)
public void testFailedParams() throws ConfigurationException {
- Map<String, Object> par = new HashMap(params);
+ HashMap<String, Object> par = new HashMap<String,Object>(params);
par.put("pod", null);
ovm3config = new Ovm3Configuration(par);
}
@Test
public void testValidatePool() throws ConfigurationException {
- Map<String, Object> par = new HashMap(params);
+ HashMap<String, Object> par = new HashMap<String,Object>(params);
par.put("cluster", "1");
par.put("ovm3vip", "this is not an IP!");
ovm3config = new Ovm3Configuration(par);
@@ -99,7 +99,7 @@ public class Ovm3ConfigurationTest {
}
@Test
public void testAgentPort() throws ConfigurationException {
- Map<String, Object> par = new HashMap(params);
+ HashMap<String, Object> par = new HashMap<String,Object>(params);
String altPort="6333";
par.put("agentport", altPort);
ovm3config = new Ovm3Configuration(par);
[4/7] git commit: updated refs/heads/master to fe4f0b1
Posted by da...@apache.org.
Root cause of failure is memory abuse in XenTest.java class ;) This should fix it
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d19191b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d19191b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d19191b
Branch: refs/heads/master
Commit: 9d19191bc61f09f93412d6d2b66e3f5fb9b004b5
Parents: 301a7b9
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 21 19:14:16 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 22 13:01:19 2015 +0200
----------------------------------------------------------------------
plugins/hypervisors/ovm3/pom.xml | 18 -
.../resources/helpers/Ovm3Configuration.java | 2 +-
.../cloud/hypervisor/ovm3/objects/XenTest.java | 2538 +++++++++---------
3 files changed, 1270 insertions(+), 1288 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d19191b/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index a0c8a9b..646ac16 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -85,25 +85,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <optimize>true</optimize>
- <proc>none</proc>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <debug>true</debug>
- <debuglevel>lines,vars,source</debuglevel>
- <verbose>true</verbose>
- <useIncrementalCompilation>false</useIncrementalCompilation>
<failOnError>false</failOnError>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
- <compilerReuseStrategy>alwaysNew</compilerReuseStrategy>
- <compilerArgs>
- <arg>-verbose</arg>
- <arg>-Xlint:all</arg>
- <arg>-version</arg>
- <arg>-deprecation</arg>
- <arg>-Xprefer:source</arg>
- <arg>-XprintProcessorInfo</arg>
- </compilerArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d19191b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
index 2154225..91c0762 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
@@ -34,7 +34,7 @@ import com.cloud.utils.net.NetUtils;
/* holds config data for the Ovm3 Hypervisor */
public class Ovm3Configuration {
private static final Logger LOGGER = Logger
- .getLogger(Ovm3Configuration.class);
+ .getLogger(Ovm3Configuration.class);
private String agentIp;
private Long agentZoneId;
private Long agentPodId;
[7/7] git commit: updated refs/heads/master to fe4f0b1
Posted by da...@apache.org.
Specify all external dependencies in pom Upgrade to lang3 and change usage of deprecated xmlparse method
Add another missing dependency
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/301a7b9a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/301a7b9a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/301a7b9a
Branch: refs/heads/master
Commit: 301a7b9a7e26a803d9d7b02d7bb537c8393dca26
Parents: 1603f72
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 21 16:52:37 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 22 13:01:19 2015 +0200
----------------------------------------------------------------------
plugins/hypervisors/ovm3/pom.xml | 52 +++++++++++++++++---
.../com/cloud/hypervisor/ovm3/objects/Pool.java | 2 +-
.../com/cloud/hypervisor/ovm3/objects/Xen.java | 2 +-
.../resources/helpers/Ovm3Configuration.java | 4 +-
.../ovm3/objects/XmlTestResultTest.java | 4 +-
5 files changed, 51 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index d7b1138..a0c8a9b 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -27,11 +27,41 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
-<dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
- <version>3.1.3</version>
-</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+ <artifactId>xmlrpc-client</artifactId>
+ <version>3.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+ <artifactId>xmlrpc-common</artifactId>
+ <version>3.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
@@ -55,16 +85,24 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
+ <optimize>true</optimize>
+ <proc>none</proc>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<debug>true</debug>
<debuglevel>lines,vars,source</debuglevel>
<verbose>true</verbose>
- <useIncrementalCompilation>true</useIncrementalCompilation>
+ <useIncrementalCompilation>false</useIncrementalCompilation>
+ <failOnError>false</failOnError>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <compilerReuseStrategy>alwaysNew</compilerReuseStrategy>
<compilerArgs>
<arg>-verbose</arg>
- <arg>-Xlint:all,-options,-path</arg>
+ <arg>-Xlint:all</arg>
+ <arg>-version</arg>
+ <arg>-deprecation</arg>
+ <arg>-Xprefer:source</arg>
+ <arg>-XprintProcessorInfo</arg>
</compilerArgs>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
index 48778d9..cf62993 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.w3c.dom.Document;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
index 6387566..ddf6a56 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
public class Xen extends OvmObject {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
index 6775a146..2154225 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.naming.ConfigurationException;
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
import org.apache.log4j.Logger;
import com.cloud.hypervisor.ovm3.objects.Network;
@@ -34,7 +34,7 @@ import com.cloud.utils.net.NetUtils;
/* holds config data for the Ovm3 Hypervisor */
public class Ovm3Configuration {
private static final Logger LOGGER = Logger
- .getLogger(Ovm3Configuration.class);
+ .getLogger(Ovm3Configuration.class);
private String agentIp;
private Long agentZoneId;
private Long agentPodId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
index 6e44a2b..b175a16 100644
--- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
+++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull;
import java.util.List;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
public class XmlTestResultTest {
private static final String NULL = "<nil/>";
@@ -33,7 +33,7 @@ public class XmlTestResultTest {
public String escapeOrNot(String s) {
if (s.startsWith("<")) {
- return StringEscapeUtils.escapeXml(s);
+ return StringEscapeUtils.escapeXml10(s);
}
return s;
}
[3/7] git commit: updated refs/heads/master to fe4f0b1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d19191b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java
index d8e8021..90e9e14 100644
--- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java
+++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XenTest.java
@@ -66,1285 +66,1285 @@ public class XenTest {
String VMROOTDISKPATH = REPOPATH + "/" + REPOID + "/Disks/" + VMROOTDISK;
String VMISOPATH = REPOPATH + "/" + REPOID + "/ISOs/" + VMISO;
String MULTIPLEVMSLISTXML = results
- .simpleResponseWrapWrapper("<array><data>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>on_xend_stop</name>\n"
- + "<value><string>ignore</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>features</name>\n"
- + "<value><string></string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>image</name>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>tsc_mode</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>kernel</name>\n"
- + "<value><string></string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>superpages</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>nomigrate</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>expose_host_uuid</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "</struct></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>cpus</name>\n"
- + "<value><array><data>\n"
- + "<value><array><data>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>10</string></value>\n"
- + "<value><string>11</string></value>\n"
- + "<value><string>12</string></value>\n"
- + "<value><string>13</string></value>\n"
- + "<value><string>14</string></value>\n"
- + "<value><string>15</string></value>\n"
- + "<value><string>16</string></value>\n"
- + "<value><string>17</string></value>\n"
- + "<value><string>18</string></value>\n"
- + "<value><string>19</string></value>\n"
- + "<value><string>20</string></value>\n"
- + "<value><string>21</string></value>\n"
- + "<value><string>22</string></value>\n"
- + "<value><string>23</string></value>\n"
- + "<value><string>24</string></value>\n"
- + "<value><string>25</string></value>\n"
- + "<value><string>26</string></value>\n"
- + "<value><string>27</string></value>\n"
- + "<value><string>28</string></value>\n"
- + "<value><string>29</string></value>\n"
- + "<value><string>30</string></value>\n"
- + "<value><string>31</string></value>\n"
- + "<value><string>32</string></value>\n"
- + "<value><string>33</string></value>\n"
- + "<value><string>34</string></value>\n"
- + "<value><string>35</string></value>\n"
- + "<value><string>36</string></value>\n"
- + "<value><string>37</string></value>\n"
- + "<value><string>38</string></value>\n"
- + "<value><string>39</string></value>\n"
- + "<value><string>40</string></value>\n"
- + "<value><string>41</string></value>\n"
- + "<value><string>42</string></value>\n"
- + "<value><string>43</string></value>\n"
- + "<value><string>44</string></value>\n"
- + "<value><string>45</string></value>\n"
- + "<value><string>46</string></value>\n"
- + "<value><string>47</string></value>\n"
- + "<value><string>48</string></value>\n"
- + "<value><string>49</string></value>\n"
- + "<value><string>50</string></value>\n"
- + "<value><string>51</string></value>\n"
- + "<value><string>52</string></value>\n"
- + "<value><string>53</string></value>\n"
- + "<value><string>54</string></value>\n"
- + "<value><string>55</string></value>\n"
- + "<value><string>56</string></value>\n"
- + "<value><string>57</string></value>\n"
- + "<value><string>58</string></value>\n"
- + "<value><string>59</string></value>\n"
- + "<value><string>60</string></value>\n"
- + "<value><string>61</string></value>\n"
- + "<value><string>62</string></value>\n"
- + "<value><string>63</string></value>\n"
- + "<value><string>64</string></value>\n"
- + "<value><string>65</string></value>\n"
- + "<value><string>66</string></value>\n"
- + "<value><string>67</string></value>\n"
- + "<value><string>68</string></value>\n"
- + "<value><string>69</string></value>\n"
- + "<value><string>70</string></value>\n"
- + "<value><string>71</string></value>\n"
- + "<value><string>72</string></value>\n"
- + "<value><string>73</string></value>\n"
- + "<value><string>74</string></value>\n"
- + "<value><string>75</string></value>\n"
- + "<value><string>76</string></value>\n"
- + "<value><string>77</string></value>\n"
- + "<value><string>78</string></value>\n"
- + "<value><string>79</string></value>\n"
- + "<value><string>80</string></value>\n"
- + "<value><string>81</string></value>\n"
- + "<value><string>82</string></value>\n"
- + "<value><string>83</string></value>\n"
- + "<value><string>84</string></value>\n"
- + "<value><string>85</string></value>\n"
- + "<value><string>86</string></value>\n"
- + "<value><string>87</string></value>\n"
- + "<value><string>88</string></value>\n"
- + "<value><string>89</string></value>\n"
- + "<value><string>90</string></value>\n"
- + "<value><string>91</string></value>\n"
- + "<value><string>92</string></value>\n"
- + "<value><string>93</string></value>\n"
- + "<value><string>94</string></value>\n"
- + "<value><string>95</string></value>\n"
- + "<value><string>96</string></value>\n"
- + "<value><string>97</string></value>\n"
- + "<value><string>98</string></value>\n"
- + "<value><string>99</string></value>\n"
- + "<value><string>100</string></value>\n"
- + "<value><string>101</string></value>\n"
- + "<value><string>102</string></value>\n"
- + "<value><string>103</string></value>\n"
- + "<value><string>104</string></value>\n"
- + "<value><string>105</string></value>\n"
- + "<value><string>106</string></value>\n"
- + "<value><string>107</string></value>\n"
- + "<value><string>108</string></value>\n"
- + "<value><string>109</string></value>\n"
- + "<value><string>110</string></value>\n"
- + "<value><string>111</string></value>\n"
- + "<value><string>112</string></value>\n"
- + "<value><string>113</string></value>\n"
- + "<value><string>114</string></value>\n"
- + "<value><string>115</string></value>\n"
- + "<value><string>116</string></value>\n"
- + "<value><string>117</string></value>\n"
- + "<value><string>118</string></value>\n"
- + "<value><string>119</string></value>\n"
- + "<value><string>120</string></value>\n"
- + "<value><string>121</string></value>\n"
- + "<value><string>122</string></value>\n"
- + "<value><string>123</string></value>\n"
- + "<value><string>124</string></value>\n"
- + "<value><string>125</string></value>\n"
- + "<value><string>126</string></value>\n"
- + "<value><string>127</string></value>\n"
- + "<value><string>128</string></value>\n"
- + "<value><string>129</string></value>\n"
- + "<value><string>130</string></value>\n"
- + "<value><string>131</string></value>\n"
- + "<value><string>132</string></value>\n"
- + "<value><string>133</string></value>\n"
- + "<value><string>134</string></value>\n"
- + "<value><string>135</string></value>\n"
- + "<value><string>136</string></value>\n"
- + "<value><string>137</string></value>\n"
- + "<value><string>138</string></value>\n"
- + "<value><string>139</string></value>\n"
- + "<value><string>140</string></value>\n"
- + "<value><string>141</string></value>\n"
- + "<value><string>142</string></value>\n"
- + "<value><string>143</string></value>\n"
- + "<value><string>144</string></value>\n"
- + "<value><string>145</string></value>\n"
- + "<value><string>146</string></value>\n"
- + "<value><string>147</string></value>\n"
- + "<value><string>148</string></value>\n"
- + "<value><string>149</string></value>\n"
- + "<value><string>150</string></value>\n"
- + "<value><string>151</string></value>\n"
- + "<value><string>152</string></value>\n"
- + "<value><string>153</string></value>\n"
- + "<value><string>154</string></value>\n"
- + "<value><string>155</string></value>\n"
- + "<value><string>156</string></value>\n"
- + "<value><string>157</string></value>\n"
- + "<value><string>158</string></value>\n"
- + "<value><string>159</string></value>\n"
- + "</data></array></value>\n"
- + "<value><array><data>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "<value><string>10</string></value>\n"
- + "<value><string>11</string></value>\n"
- + "<value><string>12</string></value>\n"
- + "<value><string>13</string></value>\n"
- + "<value><string>14</string></value>\n"
- + "<value><string>15</string></value>\n"
- + "<value><string>16</string></value>\n"
- + "<value><string>17</string></value>\n"
- + "<value><string>18</string></value>\n"
- + "<value><string>19</string></value>\n"
- + "<value><string>20</string></value>\n"
- + "<value><string>21</string></value>\n"
- + "<value><string>22</string></value>\n"
- + "<value><string>23</string></value>\n"
- + "<value><string>24</string></value>\n"
- + "<value><string>25</string></value>\n"
- + "<value><string>26</string></value>\n"
- + "<value><string>27</string></value>\n"
- + "<value><string>28</string></value>\n"
- + "<value><string>29</string></value>\n"
- + "<value><string>30</string></value>\n"
- + "<value><string>31</string></value>\n"
- + "<value><string>32</string></value>\n"
- + "<value><string>33</string></value>\n"
- + "<value><string>34</string></value>\n"
- + "<value><string>35</string></value>\n"
- + "<value><string>36</string></value>\n"
- + "<value><string>37</string></value>\n"
- + "<value><string>38</string></value>\n"
- + "<value><string>39</string></value>\n"
- + "<value><string>40</string></value>\n"
- + "<value><string>41</string></value>\n"
- + "<value><string>42</string></value>\n"
- + "<value><string>43</string></value>\n"
- + "<value><string>44</string></value>\n"
- + "<value><string>45</string></value>\n"
- + "<value><string>46</string></value>\n"
- + "<value><string>47</string></value>\n"
- + "<value><string>48</string></value>\n"
- + "<value><string>49</string></value>\n"
- + "<value><string>50</string></value>\n"
- + "<value><string>51</string></value>\n"
- + "<value><string>52</string></value>\n"
- + "<value><string>53</string></value>\n"
- + "<value><string>54</string></value>\n"
- + "<value><string>55</string></value>\n"
- + "<value><string>56</string></value>\n"
- + "<value><string>57</string></value>\n"
- + "<value><string>58</string></value>\n"
- + "<value><string>59</string></value>\n"
- + "<value><string>60</string></value>\n"
- + "<value><string>61</string></value>\n"
- + "<value><string>62</string></value>\n"
- + "<value><string>63</string></value>\n"
- + "<value><string>64</string></value>\n"
- + "<value><string>65</string></value>\n"
- + "<value><string>66</string></value>\n"
- + "<value><string>67</string></value>\n"
- + "<value><string>68</string></value>\n"
- + "<value><string>69</string></value>\n"
- + "<value><string>70</string></value>\n"
- + "<value><string>71</string></value>\n"
- + "<value><string>72</string></value>\n"
- + "<value><string>73</string></value>\n"
- + "<value><string>74</string></value>\n"
- + "<value><string>75</string></value>\n"
- + "<value><string>76</string></value>\n"
- + "<value><string>77</string></value>\n"
- + "<value><string>78</string></value>\n"
- + "<value><string>79</string></value>\n"
- + "<value><string>80</string></value>\n"
- + "<value><string>81</string></value>\n"
- + "<value><string>82</string></value>\n"
- + "<value><string>83</string></value>\n"
- + "<value><string>84</string></value>\n"
- + "<value><string>85</string></value>\n"
- + "<value><string>86</string></value>\n"
- + "<value><string>87</string></value>\n"
- + "<value><string>88</string></value>\n"
- + "<value><string>89</string></value>\n"
- + "<value><string>90</string></value>\n"
- + "<value><string>91</string></value>\n"
- + "<value><string>92</string></value>\n"
- + "<value><string>93</string></value>\n"
- + "<value><string>94</string></value>\n"
- + "<value><string>95</string></value>\n"
- + "<value><string>96</string></value>\n"
- + "<value><string>97</string></value>\n"
- + "<value><string>98</string></value>\n"
- + "<value><string>99</string></value>\n"
- + "<value><string>100</string></value>\n"
- + "<value><string>101</string></value>\n"
- + "<value><string>102</string></value>\n"
- + "<value><string>103</string></value>\n"
- + "<value><string>104</string></value>\n"
- + "<value><string>105</string></value>\n"
- + "<value><string>106</string></value>\n"
- + "<value><string>107</string></value>\n"
- + "<value><string>108</string></value>\n"
- + "<value><string>109</string></value>\n"
- + "<value><string>110</string></value>\n"
- + "<value><string>111</string></value>\n"
- + "<value><string>112</string></value>\n"
- + "<value><string>113</string></value>\n"
- + "<value><string>114</string></value>\n"
- + "<value><string>115</string></value>\n"
- + "<value><string>116</string></value>\n"
- + "<value><string>117</string></value>\n"
- + "<value><string>118</string></value>\n"
- + "<value><string>119</string></value>\n"
- + "<value><string>120</string></value>\n"
- + "<value><string>121</string></value>\n"
- + "<value><string>122</string></value>\n"
- + "<value><string>123</string></value>\n"
- + "<value><string>124</string></value>\n"
- + "<value><string>125</string></value>\n"
- + "<value><string>126</string></value>\n"
- + "<value><string>127</string></value>\n"
- + "<value><string>128</string></value>\n"
- + "<value><string>129</string></value>\n"
- + "<value><string>130</string></value>\n"
- + "<value><string>131</string></value>\n"
- + "<value><string>132</string></value>\n"
- + "<value><string>133</string></value>\n"
- + "<value><string>134</string></value>\n"
- + "<value><string>135</string></value>\n"
- + "<value><string>136</string></value>\n"
- + "<value><string>137</string></value>\n"
- + "<value><string>138</string></value>\n"
- + "<value><string>139</string></value>\n"
- + "<value><string>140</string></value>\n"
- + "<value><string>141</string></value>\n"
- + "<value><string>142</string></value>\n"
- + "<value><string>143</string></value>\n"
- + "<value><string>144</string></value>\n"
- + "<value><string>145</string></value>\n"
- + "<value><string>146</string></value>\n"
- + "<value><string>147</string></value>\n"
- + "<value><string>148</string></value>\n"
- + "<value><string>149</string></value>\n"
- + "<value><string>150</string></value>\n"
- + "<value><string>151</string></value>\n"
- + "<value><string>152</string></value>\n"
- + "<value><string>153</string></value>\n"
- + "<value><string>154</string></value>\n"
- + "<value><string>155</string></value>\n"
- + "<value><string>156</string></value>\n"
- + "<value><string>157</string></value>\n"
- + "<value><string>158</string></value>\n"
- + "<value><string>159</string></value>\n"
- + "</data></array></value>\n"
- + "</data></array></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>uuid</name>\n"
- + "<value><string>00000000-0000-0000-0000-000000000000</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>on_reboot</name>\n"
- + "<value><string>restart</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>state</name>\n"
- + "<value><string>r-----</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>cpu_weight</name>\n"
- + "<value><string>65535</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>online_vcpus</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>memory</name>\n"
- + "<value><string>672</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>cpu_cap</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>status</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>pool_name</name>\n"
- + "<value><string>Pool-0</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>on_poweroff</name>\n"
- + "<value><string>destroy</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>on_xend_start</name>\n"
- + "<value><string>ignore</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>on_crash</name>\n"
- + "<value><string>restart</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>device</name>\n"
- + "<value><struct>\n"
- + "</struct></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>bootloader</name>\n"
- + "<value><string></string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>maxmem</name>\n"
- + "<value><string>672</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>cpu_time</name>\n"
- + "<value><string>6608.51291287</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>shadow_memory</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>name</name>\n"
- + "<value><string>Domain-0</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>builder</name>\n"
- + "<value><string>linux</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>bootloader_args</name>\n"
- + "<value><string></string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>domid</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>vcpus</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "</struct></value>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>on_xend_stop</name>\n"
- + "<value><string>ignore</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>console_mfn</name>\n"
- + "<value><string>873706</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>features</name>\n"
- + "<value><string></string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>image</name>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>tsc_mode</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>kernel</name>\n"
- + "<value><string></string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>videoram</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>device_model</name>\n"
- + "<value><string>/usr/lib/xen/bin/qemu-dm</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>notes</name>"
- + "<value><array><data>"
- + "<value><array><data>"
- + "<value><string>HV_START_LOW</string></value>"
- + "<value><string>4118806528</string></value>"
- + "</data></array></value>"
- + "<value><array><data>"
- + "<value><string>FEATURES</string></value>"
- + "<value><string>!writable_page_tables|pae_pgdir_above_4gb</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>VIRT_BASE</string></value>"
- + "<value><string>3221225472</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>GUEST_VERSION</string></value>"
- + "<value><string>2.6</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>PADDR_OFFSET</string></value>"
- + "<value><string>" + "</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>GUEST_OS</string></value>"
- + "<value><string>linux</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>HYPERCALL_PAGE</string></value>"
- + "<value><string>3238010880</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>LOADER</string></value>"
- + "<value><string>generic</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>SUSPEND_CANCEL</string></value>"
- + "<value><string>" + "</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>PAE_MODE</string></value>"
- + "<value><string>yes</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>ENTRY</string></value>"
- + "<value><string>3242303488</string></value>"
- + "</data></array></value>" + "<value><array><data>"
- + "<value><string>XEN_VERSION</string></value>"
- + "<value><string>xen-3.0</string></value>"
- + "</data></array></value>" + "</data></array></value>"
- + "</member>" + "<member>"
- + "<name>expose_host_uuid</name>" + "<value><string>"
- + "</string></value>" + "</member>" + "<member>"
- + "<name>pci</name>" + "<value><array><data>"
- + "</data></array></value>" + "</member>" + "<member>"
- + "<name>superpages</name>\n" + "<value><string>\n"
- + "</string></value>\n" + "</member>\n" + "<member>\n"
- + "<name>nomigrate</name>\n" + "<value><string>\n"
- + "</string></value>\n" + "</member>\n"
- + "</struct></value>\n" + "</member>\n" + "<member>\n"
- + "<name>cpus</name>\n" + "<value><array><data>\n"
- + "<value><array><data>\n" + "</data></array></value>\n"
- + "</data></array></value>\n" + "</member>\n"
- + "<member>\n" + "<name>store_mfn</name>\n"
- + "<value><string>873707</string></value>\n"
- + "</member>\n" + "<member>\n" + "<name>uuid</name>\n"
- + "<value><string>"
- + VMID
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>on_reboot</name>\n"
- + "<value><string>restart</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>state</name>\n"
- + "<value><string>-b----</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>cpu_weight</name>\n"
- + "<value><string>27500</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>online_vcpus</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>memory</name>\n"
- + "<value><string>512</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>cpu_cap</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>status</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>pool_name</name>\n"
- + "<value><string>Pool-0</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>description</name>\n"
- + "<value><string></string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>start_time</name>\n"
- + "<value><string>1408105444.17</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>on_poweroff</name>\n"
- + "<value><string>destroy</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>on_xend_start</name>\n"
- + "<value><string>ignore</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>on_crash</name>\n"
- + "<value><string>restart</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>device</name>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>vif</name>\n"
- + "<value><array><data>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>bridge</name>\n"
- + "<value><string>"+VMNICBR+"</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>mac</name>\n"
- + "<value><string>" + VMNICMAC + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>script</name>\n"
- + "<value><string>/etc/xen/scripts/vif-bridge</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>uuid</name>\n"
- + "<value><string>"+VMNICUUID+"</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>backend</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "</struct></value>\n"
- + "</data></array></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>vkbd</name>\n"
- + "<value><array><data>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>backend</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "</struct></value>\n"
- + "</data></array></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>console</name>\n"
- + "<value><array><data>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>protocol</name>\n"
- + "<value><string>vt100</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>location</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>uuid</name>\n"
- + "<value><string>9beb5016-dde7-8526-491f-e972f262a634</string></value>\n"
- + "</member>\n"
- + "</struct></value>\n"
- + "</data></array></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>vfb</name>\n"
- + "<value><array><data>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>vncunused</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>vnc</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>xauthority</name>\n"
- + "<value><string>/root/.Xauthority</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>vnclisten</name>\n"
- + "<value><string>0.0.0.0</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>vncpasswd</name>\n"
- + "<value><string>7693f834ca67912e</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>keymap</name>\n"
- + "<value><string>en-us</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>location</name>\n"
- + "<value><string>0.0.0.0:5900</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>uuid</name>\n"
- + "<value><string>78edf954-e375-b142-9c76-791ce805b6ef</string></value>\n"
- + "</member>\n"
- + "</struct></value>\n"
- + "</data></array></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>vbd</name>\n"
- + "<value><array><data>\n"
- + "<value><struct>\n"
- + "<member>\n"
- + "<name>protocol</name>\n"
- + "<value><string>x86_32-abi</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>uuid</name>\n"
- + "<value><string>bda35954-2596-025e-168c-b82e1cf92369</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>bootable</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>dev</name>\n"
- + "<value><string>xvda:disk</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>uname</name>\n"
- + "<value><string>file:/OVS/Repositories/"
- + REPOID
- + "/VirtualDisks/"
- + VMROOTDISK
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>mode</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>VDI</name>\n"
- + "<value><string></string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>backend</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "</struct></value>\n"
- + "</data></array></value>\n"
- + "</member>\n"
- + "</struct></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>bootloader</name>\n"
- + "<value><string>/usr/bin/pygrub</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>maxmem</name>\n"
- + "<value><string>512</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>cpu_time</name>\n"
- + "<value><string>0.152510481</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>shadow_memory</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>name</name>\n"
- + "<value><string>"
- + VMNAME
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>builder</name>\n"
- + "<value><string>linux</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>bootloader_args</name>\n"
- + "<value><string>-q</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>domid</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n"
- + "<member>\n"
- + "<name>vcpus</name>\n"
- + "<value><string>\n"
- + "</string></value>\n"
- + "</member>\n" + "</struct></value>\n" + "</data></array>");
+ .simpleResponseWrapWrapper(new StringBuilder("<array><data>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>on_xend_stop</name>\n")
+ .append("<value><string>ignore</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>features</name>\n")
+ .append("<value><string></string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>image</name>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>tsc_mode</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>kernel</name>\n")
+ .append("<value><string></string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>superpages</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>nomigrate</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>expose_host_uuid</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("</struct></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>cpus</name>\n")
+ .append("<value><array><data>\n")
+ .append("<value><array><data>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>10</string></value>\n")
+ .append("<value><string>11</string></value>\n")
+ .append("<value><string>12</string></value>\n")
+ .append("<value><string>13</string></value>\n")
+ .append("<value><string>14</string></value>\n")
+ .append("<value><string>15</string></value>\n")
+ .append("<value><string>16</string></value>\n")
+ .append("<value><string>17</string></value>\n")
+ .append("<value><string>18</string></value>\n")
+ .append("<value><string>19</string></value>\n")
+ .append("<value><string>20</string></value>\n")
+ .append("<value><string>21</string></value>\n")
+ .append("<value><string>22</string></value>\n")
+ .append("<value><string>23</string></value>\n")
+ .append("<value><string>24</string></value>\n")
+ .append("<value><string>25</string></value>\n")
+ .append("<value><string>26</string></value>\n")
+ .append("<value><string>27</string></value>\n")
+ .append("<value><string>28</string></value>\n")
+ .append("<value><string>29</string></value>\n")
+ .append("<value><string>30</string></value>\n")
+ .append("<value><string>31</string></value>\n")
+ .append("<value><string>32</string></value>\n")
+ .append("<value><string>33</string></value>\n")
+ .append("<value><string>34</string></value>\n")
+ .append("<value><string>35</string></value>\n")
+ .append("<value><string>36</string></value>\n")
+ .append("<value><string>37</string></value>\n")
+ .append("<value><string>38</string></value>\n")
+ .append("<value><string>39</string></value>\n")
+ .append("<value><string>40</string></value>\n")
+ .append("<value><string>41</string></value>\n")
+ .append("<value><string>42</string></value>\n")
+ .append("<value><string>43</string></value>\n")
+ .append("<value><string>44</string></value>\n")
+ .append("<value><string>45</string></value>\n")
+ .append("<value><string>46</string></value>\n")
+ .append("<value><string>47</string></value>\n")
+ .append("<value><string>48</string></value>\n")
+ .append("<value><string>49</string></value>\n")
+ .append("<value><string>50</string></value>\n")
+ .append("<value><string>51</string></value>\n")
+ .append("<value><string>52</string></value>\n")
+ .append("<value><string>53</string></value>\n")
+ .append("<value><string>54</string></value>\n")
+ .append("<value><string>55</string></value>\n")
+ .append("<value><string>56</string></value>\n")
+ .append("<value><string>57</string></value>\n")
+ .append("<value><string>58</string></value>\n")
+ .append("<value><string>59</string></value>\n")
+ .append("<value><string>60</string></value>\n")
+ .append("<value><string>61</string></value>\n")
+ .append("<value><string>62</string></value>\n")
+ .append("<value><string>63</string></value>\n")
+ .append("<value><string>64</string></value>\n")
+ .append("<value><string>65</string></value>\n")
+ .append("<value><string>66</string></value>\n")
+ .append("<value><string>67</string></value>\n")
+ .append("<value><string>68</string></value>\n")
+ .append("<value><string>69</string></value>\n")
+ .append("<value><string>70</string></value>\n")
+ .append("<value><string>71</string></value>\n")
+ .append("<value><string>72</string></value>\n")
+ .append("<value><string>73</string></value>\n")
+ .append("<value><string>74</string></value>\n")
+ .append("<value><string>75</string></value>\n")
+ .append("<value><string>76</string></value>\n")
+ .append("<value><string>77</string></value>\n")
+ .append("<value><string>78</string></value>\n")
+ .append("<value><string>79</string></value>\n")
+ .append("<value><string>80</string></value>\n")
+ .append("<value><string>81</string></value>\n")
+ .append("<value><string>82</string></value>\n")
+ .append("<value><string>83</string></value>\n")
+ .append("<value><string>84</string></value>\n")
+ .append("<value><string>85</string></value>\n")
+ .append("<value><string>86</string></value>\n")
+ .append("<value><string>87</string></value>\n")
+ .append("<value><string>88</string></value>\n")
+ .append("<value><string>89</string></value>\n")
+ .append("<value><string>90</string></value>\n")
+ .append("<value><string>91</string></value>\n")
+ .append("<value><string>92</string></value>\n")
+ .append("<value><string>93</string></value>\n")
+ .append("<value><string>94</string></value>\n")
+ .append("<value><string>95</string></value>\n")
+ .append("<value><string>96</string></value>\n")
+ .append("<value><string>97</string></value>\n")
+ .append("<value><string>98</string></value>\n")
+ .append("<value><string>99</string></value>\n")
+ .append("<value><string>100</string></value>\n")
+ .append("<value><string>101</string></value>\n")
+ .append("<value><string>102</string></value>\n")
+ .append("<value><string>103</string></value>\n")
+ .append("<value><string>104</string></value>\n")
+ .append("<value><string>105</string></value>\n")
+ .append("<value><string>106</string></value>\n")
+ .append("<value><string>107</string></value>\n")
+ .append("<value><string>108</string></value>\n")
+ .append("<value><string>109</string></value>\n")
+ .append("<value><string>110</string></value>\n")
+ .append("<value><string>111</string></value>\n")
+ .append("<value><string>112</string></value>\n")
+ .append("<value><string>113</string></value>\n")
+ .append("<value><string>114</string></value>\n")
+ .append("<value><string>115</string></value>\n")
+ .append("<value><string>116</string></value>\n")
+ .append("<value><string>117</string></value>\n")
+ .append("<value><string>118</string></value>\n")
+ .append("<value><string>119</string></value>\n")
+ .append("<value><string>120</string></value>\n")
+ .append("<value><string>121</string></value>\n")
+ .append("<value><string>122</string></value>\n")
+ .append("<value><string>123</string></value>\n")
+ .append("<value><string>124</string></value>\n")
+ .append("<value><string>125</string></value>\n")
+ .append("<value><string>126</string></value>\n")
+ .append("<value><string>127</string></value>\n")
+ .append("<value><string>128</string></value>\n")
+ .append("<value><string>129</string></value>\n")
+ .append("<value><string>130</string></value>\n")
+ .append("<value><string>131</string></value>\n")
+ .append("<value><string>132</string></value>\n")
+ .append("<value><string>133</string></value>\n")
+ .append("<value><string>134</string></value>\n")
+ .append("<value><string>135</string></value>\n")
+ .append("<value><string>136</string></value>\n")
+ .append("<value><string>137</string></value>\n")
+ .append("<value><string>138</string></value>\n")
+ .append("<value><string>139</string></value>\n")
+ .append("<value><string>140</string></value>\n")
+ .append("<value><string>141</string></value>\n")
+ .append("<value><string>142</string></value>\n")
+ .append("<value><string>143</string></value>\n")
+ .append("<value><string>144</string></value>\n")
+ .append("<value><string>145</string></value>\n")
+ .append("<value><string>146</string></value>\n")
+ .append("<value><string>147</string></value>\n")
+ .append("<value><string>148</string></value>\n")
+ .append("<value><string>149</string></value>\n")
+ .append("<value><string>150</string></value>\n")
+ .append("<value><string>151</string></value>\n")
+ .append("<value><string>152</string></value>\n")
+ .append("<value><string>153</string></value>\n")
+ .append("<value><string>154</string></value>\n")
+ .append("<value><string>155</string></value>\n")
+ .append("<value><string>156</string></value>\n")
+ .append("<value><string>157</string></value>\n")
+ .append("<value><string>158</string></value>\n")
+ .append("<value><string>159</string></value>\n")
+ .append("</data></array></value>\n")
+ .append("<value><array><data>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("<value><string>10</string></value>\n")
+ .append("<value><string>11</string></value>\n")
+ .append("<value><string>12</string></value>\n")
+ .append("<value><string>13</string></value>\n")
+ .append("<value><string>14</string></value>\n")
+ .append("<value><string>15</string></value>\n")
+ .append("<value><string>16</string></value>\n")
+ .append("<value><string>17</string></value>\n")
+ .append("<value><string>18</string></value>\n")
+ .append("<value><string>19</string></value>\n")
+ .append("<value><string>20</string></value>\n")
+ .append("<value><string>21</string></value>\n")
+ .append("<value><string>22</string></value>\n")
+ .append("<value><string>23</string></value>\n")
+ .append("<value><string>24</string></value>\n")
+ .append("<value><string>25</string></value>\n")
+ .append("<value><string>26</string></value>\n")
+ .append("<value><string>27</string></value>\n")
+ .append("<value><string>28</string></value>\n")
+ .append("<value><string>29</string></value>\n")
+ .append("<value><string>30</string></value>\n")
+ .append("<value><string>31</string></value>\n")
+ .append("<value><string>32</string></value>\n")
+ .append("<value><string>33</string></value>\n")
+ .append("<value><string>34</string></value>\n")
+ .append("<value><string>35</string></value>\n")
+ .append("<value><string>36</string></value>\n")
+ .append("<value><string>37</string></value>\n")
+ .append("<value><string>38</string></value>\n")
+ .append("<value><string>39</string></value>\n")
+ .append("<value><string>40</string></value>\n")
+ .append("<value><string>41</string></value>\n")
+ .append("<value><string>42</string></value>\n")
+ .append("<value><string>43</string></value>\n")
+ .append("<value><string>44</string></value>\n")
+ .append("<value><string>45</string></value>\n")
+ .append("<value><string>46</string></value>\n")
+ .append("<value><string>47</string></value>\n")
+ .append("<value><string>48</string></value>\n")
+ .append("<value><string>49</string></value>\n")
+ .append("<value><string>50</string></value>\n")
+ .append("<value><string>51</string></value>\n")
+ .append("<value><string>52</string></value>\n")
+ .append("<value><string>53</string></value>\n")
+ .append("<value><string>54</string></value>\n")
+ .append("<value><string>55</string></value>\n")
+ .append("<value><string>56</string></value>\n")
+ .append("<value><string>57</string></value>\n")
+ .append("<value><string>58</string></value>\n")
+ .append("<value><string>59</string></value>\n")
+ .append("<value><string>60</string></value>\n")
+ .append("<value><string>61</string></value>\n")
+ .append("<value><string>62</string></value>\n")
+ .append("<value><string>63</string></value>\n")
+ .append("<value><string>64</string></value>\n")
+ .append("<value><string>65</string></value>\n")
+ .append("<value><string>66</string></value>\n")
+ .append("<value><string>67</string></value>\n")
+ .append("<value><string>68</string></value>\n")
+ .append("<value><string>69</string></value>\n")
+ .append("<value><string>70</string></value>\n")
+ .append("<value><string>71</string></value>\n")
+ .append("<value><string>72</string></value>\n")
+ .append("<value><string>73</string></value>\n")
+ .append("<value><string>74</string></value>\n")
+ .append("<value><string>75</string></value>\n")
+ .append("<value><string>76</string></value>\n")
+ .append("<value><string>77</string></value>\n")
+ .append("<value><string>78</string></value>\n")
+ .append("<value><string>79</string></value>\n")
+ .append("<value><string>80</string></value>\n")
+ .append("<value><string>81</string></value>\n")
+ .append("<value><string>82</string></value>\n")
+ .append("<value><string>83</string></value>\n")
+ .append("<value><string>84</string></value>\n")
+ .append("<value><string>85</string></value>\n")
+ .append("<value><string>86</string></value>\n")
+ .append("<value><string>87</string></value>\n")
+ .append("<value><string>88</string></value>\n")
+ .append("<value><string>89</string></value>\n")
+ .append("<value><string>90</string></value>\n")
+ .append("<value><string>91</string></value>\n")
+ .append("<value><string>92</string></value>\n")
+ .append("<value><string>93</string></value>\n")
+ .append("<value><string>94</string></value>\n")
+ .append("<value><string>95</string></value>\n")
+ .append("<value><string>96</string></value>\n")
+ .append("<value><string>97</string></value>\n")
+ .append("<value><string>98</string></value>\n")
+ .append("<value><string>99</string></value>\n")
+ .append("<value><string>100</string></value>\n")
+ .append("<value><string>101</string></value>\n")
+ .append("<value><string>102</string></value>\n")
+ .append("<value><string>103</string></value>\n")
+ .append("<value><string>104</string></value>\n")
+ .append("<value><string>105</string></value>\n")
+ .append("<value><string>106</string></value>\n")
+ .append("<value><string>107</string></value>\n")
+ .append("<value><string>108</string></value>\n")
+ .append("<value><string>109</string></value>\n")
+ .append("<value><string>110</string></value>\n")
+ .append("<value><string>111</string></value>\n")
+ .append("<value><string>112</string></value>\n")
+ .append("<value><string>113</string></value>\n")
+ .append("<value><string>114</string></value>\n")
+ .append("<value><string>115</string></value>\n")
+ .append("<value><string>116</string></value>\n")
+ .append("<value><string>117</string></value>\n")
+ .append("<value><string>118</string></value>\n")
+ .append("<value><string>119</string></value>\n")
+ .append("<value><string>120</string></value>\n")
+ .append("<value><string>121</string></value>\n")
+ .append("<value><string>122</string></value>\n")
+ .append("<value><string>123</string></value>\n")
+ .append("<value><string>124</string></value>\n")
+ .append("<value><string>125</string></value>\n")
+ .append("<value><string>126</string></value>\n")
+ .append("<value><string>127</string></value>\n")
+ .append("<value><string>128</string></value>\n")
+ .append("<value><string>129</string></value>\n")
+ .append("<value><string>130</string></value>\n")
+ .append("<value><string>131</string></value>\n")
+ .append("<value><string>132</string></value>\n")
+ .append("<value><string>133</string></value>\n")
+ .append("<value><string>134</string></value>\n")
+ .append("<value><string>135</string></value>\n")
+ .append("<value><string>136</string></value>\n")
+ .append("<value><string>137</string></value>\n")
+ .append("<value><string>138</string></value>\n")
+ .append("<value><string>139</string></value>\n")
+ .append("<value><string>140</string></value>\n")
+ .append("<value><string>141</string></value>\n")
+ .append("<value><string>142</string></value>\n")
+ .append("<value><string>143</string></value>\n")
+ .append("<value><string>144</string></value>\n")
+ .append("<value><string>145</string></value>\n")
+ .append("<value><string>146</string></value>\n")
+ .append("<value><string>147</string></value>\n")
+ .append("<value><string>148</string></value>\n")
+ .append("<value><string>149</string></value>\n")
+ .append("<value><string>150</string></value>\n")
+ .append("<value><string>151</string></value>\n")
+ .append("<value><string>152</string></value>\n")
+ .append("<value><string>153</string></value>\n")
+ .append("<value><string>154</string></value>\n")
+ .append("<value><string>155</string></value>\n")
+ .append("<value><string>156</string></value>\n")
+ .append("<value><string>157</string></value>\n")
+ .append("<value><string>158</string></value>\n")
+ .append("<value><string>159</string></value>\n")
+ .append("</data></array></value>\n")
+ .append("</data></array></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>uuid</name>\n")
+ .append("<value><string>00000000-0000-0000-0000-000000000000</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>on_reboot</name>\n")
+ .append("<value><string>restart</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>state</name>\n")
+ .append("<value><string>r-----</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>cpu_weight</name>\n")
+ .append("<value><string>65535</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>online_vcpus</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>memory</name>\n")
+ .append("<value><string>672</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>cpu_cap</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>status</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>pool_name</name>\n")
+ .append("<value><string>Pool-0</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>on_poweroff</name>\n")
+ .append("<value><string>destroy</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>on_xend_start</name>\n")
+ .append("<value><string>ignore</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>on_crash</name>\n")
+ .append("<value><string>restart</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>device</name>\n")
+ .append("<value><struct>\n")
+ .append("</struct></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>bootloader</name>\n")
+ .append("<value><string></string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>maxmem</name>\n")
+ .append("<value><string>672</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>cpu_time</name>\n")
+ .append("<value><string>6608.51291287</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>shadow_memory</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>name</name>\n")
+ .append("<value><string>Domain-0</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>builder</name>\n")
+ .append("<value><string>linux</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>bootloader_args</name>\n")
+ .append("<value><string></string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>domid</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>vcpus</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("</struct></value>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>on_xend_stop</name>\n")
+ .append("<value><string>ignore</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>console_mfn</name>\n")
+ .append("<value><string>873706</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>features</name>\n")
+ .append("<value><string></string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>image</name>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>tsc_mode</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>kernel</name>\n")
+ .append("<value><string></string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>videoram</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>device_model</name>\n")
+ .append("<value><string>/usr/lib/xen/bin/qemu-dm</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>notes</name>")
+ .append("<value><array><data>")
+ .append("<value><array><data>")
+ .append("<value><string>HV_START_LOW</string></value>")
+ .append("<value><string>4118806528</string></value>")
+ .append("</data></array></value>")
+ .append("<value><array><data>")
+ .append("<value><string>FEATURES</string></value>")
+ .append("<value><string>!writable_page_tables|pae_pgdir_above_4gb</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>VIRT_BASE</string></value>")
+ .append("<value><string>3221225472</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>GUEST_VERSION</string></value>")
+ .append("<value><string>2.6</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>PADDR_OFFSET</string></value>")
+ .append("<value><string>") .append("</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>GUEST_OS</string></value>")
+ .append("<value><string>linux</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>HYPERCALL_PAGE</string></value>")
+ .append("<value><string>3238010880</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>LOADER</string></value>")
+ .append("<value><string>generic</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>SUSPEND_CANCEL</string></value>")
+ .append("<value><string>") .append("</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>PAE_MODE</string></value>")
+ .append("<value><string>yes</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>ENTRY</string></value>")
+ .append("<value><string>3242303488</string></value>")
+ .append("</data></array></value>") .append("<value><array><data>")
+ .append("<value><string>XEN_VERSION</string></value>")
+ .append("<value><string>xen-3.0</string></value>")
+ .append("</data></array></value>") .append("</data></array></value>")
+ .append("</member>") .append("<member>")
+ .append("<name>expose_host_uuid</name>") .append("<value><string>")
+ .append("</string></value>") .append("</member>") .append("<member>")
+ .append("<name>pci</name>") .append("<value><array><data>")
+ .append("</data></array></value>") .append("</member>") .append("<member>")
+ .append("<name>superpages</name>\n") .append("<value><string>\n")
+ .append("</string></value>\n") .append("</member>\n") .append("<member>\n")
+ .append("<name>nomigrate</name>\n") .append("<value><string>\n")
+ .append("</string></value>\n") .append("</member>\n")
+ .append("</struct></value>\n") .append("</member>\n") .append("<member>\n")
+ .append("<name>cpus</name>\n") .append("<value><array><data>\n")
+ .append("<value><array><data>\n") .append("</data></array></value>\n")
+ .append("</data></array></value>\n") .append("</member>\n")
+ .append("<member>\n") .append("<name>store_mfn</name>\n")
+ .append("<value><string>873707</string></value>\n")
+ .append("</member>\n") .append("<member>\n") .append("<name>uuid</name>\n")
+ .append("<value><string>")
+ .append(VMID)
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>on_reboot</name>\n")
+ .append("<value><string>restart</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>state</name>\n")
+ .append("<value><string>-b----</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>cpu_weight</name>\n")
+ .append("<value><string>27500</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>online_vcpus</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>memory</name>\n")
+ .append("<value><string>512</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>cpu_cap</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>status</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>pool_name</name>\n")
+ .append("<value><string>Pool-0</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>description</name>\n")
+ .append("<value><string></string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>start_time</name>\n")
+ .append("<value><string>1408105444.17</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>on_poweroff</name>\n")
+ .append("<value><string>destroy</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>on_xend_start</name>\n")
+ .append("<value><string>ignore</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>on_crash</name>\n")
+ .append("<value><string>restart</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>device</name>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>vif</name>\n")
+ .append("<value><array><data>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>bridge</name>\n")
+ .append("<value><string>").append(VMNICBR).append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>mac</name>\n")
+ .append("<value><string>").append(VMNICMAC).append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>script</name>\n")
+ .append("<value><string>/etc/xen/scripts/vif-bridge</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>uuid</name>\n")
+ .append("<value><string>").append(VMNICUUID).append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>backend</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("</struct></value>\n")
+ .append("</data></array></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>vkbd</name>\n")
+ .append("<value><array><data>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>backend</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("</struct></value>\n")
+ .append("</data></array></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>console</name>\n")
+ .append("<value><array><data>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>protocol</name>\n")
+ .append("<value><string>vt100</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>location</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>uuid</name>\n")
+ .append("<value><string>9beb5016-dde7-8526-491f-e972f262a634</string></value>\n")
+ .append("</member>\n")
+ .append("</struct></value>\n")
+ .append("</data></array></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>vfb</name>\n")
+ .append("<value><array><data>\n")
+ .append("<value><struct>\n")
+ .append("<member>\n")
+ .append("<name>vncunused</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>vnc</name>\n")
+ .append("<value><string>\n")
+ .append("</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>xauthority</name>\n")
+ .append("<value><string>/root/.Xauthority</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>vnclisten</name>\n")
+ .append("<value><string>0.0.0.0</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>vncpasswd</name>\n")
+ .append("<value><string>7693f834ca67912e</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>keymap</name>\n")
+ .append("<value><string>en-us</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+ .append("<name>location</name>\n")
+ .append("<value><string>0.0.0.0:5900</string></value>\n")
+ .append("</member>\n")
+ .append("<member>\n")
+
<TRUNCATED>